[MERGE] merged with trunk development branch.

bzr revid: hmo@tinyerp.com-20111213074129-0frej7vvaefubybe
author: Harry (OpenERP) <hmo@tinyerp.com> 2011-12-13 13:11:29 +0530
committer: Harry (OpenERP) <hmo@tinyerp.com> 2011-12-13 13:11:29 +0530
commit: 359f0b42e22e69e9965462c8e8d5b8c57239d2f8 (patch)
tree: 64412070716c5949d6c8703e5f2bd83235177ce1
parent: eb4c08585db4868fbf03dc0a019a383e9e653e7e (diff)
parent: 78f56f29f2469f2e4a398d7d6cbdcafaa622341c (diff)
484 files changed, 17220 insertions, 16816 deletions
diff --git a/addons/account/account.py b/addons/account/account.py
index e2ce5ff8063..fd8a0506d01 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -771,7 +771,9 @@ class account_journal(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         if not 'sequence_id' in vals or not vals['sequence_id']:
-            vals.update({'sequence_id': self.create_sequence(cr, uid, vals, context)})
+            # if we have the right to create a journal, we should be able to
+            # create it's sequence.
+            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 85d9805eb32..ab36586fe2f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -34,8 +34,6 @@ class account_bank_statement(osv.osv):
             for line in vals['line_ids']:
                 seq += 1
                 line[2]['sequence'] = seq
-                new_line_ids += tuple(line)
-            vals['line_ids'] = new_line_ids
         return super(account_bank_statement, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4cc1a63db61..d14106bab5f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -362,13 +362,13 @@
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
-                        <field name="number"/>
+                        <field name="number"
+                            string="Reference"
+                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
+                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
                         </field>
-                        <field name="origin"/>
-                        <field name="amount_total"/>
                     </group>
                     <newline/>
                     <group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 59a2a8eaa19..36a87cc6459 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -326,6 +326,7 @@
         <menuitem
             name="Unrealized Gain or Loss"
             action="action_account_gain_loss"
+            groups="account.group_account_user"
             id="menu_unrealized_gains_losses"
             parent="account.menu_multi_currency"/>
 
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 5108a62cf3e..ffd2811cba7 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -41,12 +41,11 @@
                 <form string="Account Board">
                     <board style="2-1">
                         <column>
-                            <action name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
+                            <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
                         <column>
                             <action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
-                            <action name="%(action_aged_receivable)d" string="Aged Receivables"/> <!--groups="account.group_account_manager,account.group_account_user"-->
                         </column>
                     </board>
                 </form>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 598f6c40278..cd43f416fce 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -70,7 +70,7 @@
                     <filter icon="terp-go-month" string="Month-1"
                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="last month"/>
-                    <separator orientation="vertical"/>              	
+                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -121,7 +121,7 @@
                     <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
-                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
@@ -138,7 +138,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 79e4dbb0c03..d1cb87bd434 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -1,134 +1,105 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_product_account_user","product.product.account.user","product.model_product_product","group_account_user",1,0,0,0
-"access_account_payment_term","account.payment.term","model_account_payment_term","account.group_account_user",1,0,0,0
-"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
-"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
-"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
-"access_account_tax_internal_user","account.tax internal user","model_account_tax","base.group_user",1,0,0,0
-"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
-"access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
-"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
-"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
-"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
-"access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
-"access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
-"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,0,0,0
-"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
-"access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
-"access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
-"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
-"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_invoice",1,0,0,0
-"access_account_tax","account.tax","model_account_tax","account.group_account_invoice",1,0,0,0
-"access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
-"access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
-"access_account_model_manager","account.model","model_account_model","account.group_account_manager",1,1,1,1
-"access_account_model_line_manager","account.model.line","model_account_model_line","account.group_account_manager",1,1,1,1
-"access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
-"access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
-"access_account_subscription_manager","account.subscription manager","model_account_subscription","account.group_account_manager",1,0,0,0
-"access_account_subscription_line_manager","account.subscription.line manager","model_account_subscription_line","account.group_account_manager",1,0,0,0
-"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
-"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
-"access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
-"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
-"access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
-"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
-"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
-"access_account_analytic_journal_user","account.analytic.journal","model_account_analytic_journal","base.group_user",1,1,1,0
-"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
-"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
-"access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
-"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
-"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
-"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
-"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
-"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
-"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
-"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
-"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
-"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
-"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
-"access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
-"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
-"access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
-"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
-"access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,1,1,1
-"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
-"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
-"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
-"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
-"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
-"access_account_fiscalyear_employee","account.fiscalyear employee","model_account_fiscalyear","base.group_user",1,0,0,0
-"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
-"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
-"access_res_currency_rate_type_account_manager","res.currency.rate.type account manager","base.model_res_currency_rate_type","group_account_manager",1,1,1,1
-"access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
-"access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
-"access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
-"access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
-"access_account_account_sale_manager","account.account sale manager","model_account_account","base.group_sale_manager",1,0,0,0
-"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_manager",1,0,0,0
-"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
-"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
-"access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
-"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
-"access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
-"access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1
-"access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
-"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,1,1,1
-"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,1,1,1
-"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,1,1,1
-"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,1,1,1
-"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,1,1,1
-"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,0,0,0
-"access_account_invoice_accountant","account.invoice accountant","model_account_invoice","account.group_account_user",1,0,0,0
-"access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1
-"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
-"access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
-"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
-"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
-"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
-"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
-"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0
-"access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
-"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
-"access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
-"access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
-"access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
-"access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
-"access_account_move_reconcile_manager","account.move.reconcile manager","model_account_move_reconcile","account.group_account_manager",1,0,0,0
-"access_account_analytic_line_invoice","account.analytic.line invoice","model_account_analytic_line","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_accountant","account.invoice.line accountant","model_account_invoice_line","account.group_account_user",1,0,0,0
-"access_res_partner_address_accountant","res.partner.address accountant","base.model_res_partner_address","account.group_account_user",1,0,0,0
-"access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
-"access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
-"access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
-"access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
-"access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
-"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
-"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
-"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
-"access_account_tax_sale_manager","account.tax sale manager","model_account_tax","base.group_sale_salesman",1,0,0,0
-"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_salesman",1,0,0,0
-"access_account_invoice_tax_sale_manager","account.invoice.tax  sale manager","model_account_invoice_tax","base.group_sale_salesman",1,0,0,0
-"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
-"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
-"access_account_treasury_report_manager","account.treasury.report.manager","model_account_treasury_report","account.group_account_manager",1,0,0,0
-"access_account_financial_report","account.financial.report","model_account_financial_report","account.group_account_user",1,1,1,1
-"access_account_financial_report_invoice","account.financial.report invoice","model_account_financial_report","account.group_account_invoice",1,0,0,0
-"access_account_financial_report_manager","account.financial.report","model_account_financial_report","account.group_account_manager",1,1,1,1
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_product_account_user,product.product.account.user,product.model_product_product,group_account_user,1,0,0,0
+access_account_payment_term,account.payment.term,model_account_payment_term,account.group_account_user,1,0,0,0
+access_account_payment_term_line,account.payment.term.line,model_account_payment_term_line,account.group_account_user,1,0,0,0
+access_account_account_type,account.account.type,model_account_account_type,account.group_account_user,1,0,0,0
+access_account_tax_internal_user,account.tax internal user,model_account_tax,base.group_user,1,0,0,0
+access_account_account,account.account,model_account_account,account.group_account_user,1,0,0,0
+access_account_account_user,account.account user,model_account_account,base.group_user,1,0,0,0
+access_account_account_partner_manager,account.account partner manager,model_account_account,base.group_partner_manager,1,0,0,0
+access_account_journal_view,account.journal.view,model_account_journal_view,account.group_account_user,1,0,0,0
+access_account_journal_column,account.journal.column,model_account_journal_column,account.group_account_user,1,0,0,0
+access_account_journal_period_manager,account.journal.period manager,model_account_journal_period,account.group_account_manager,1,0,0,0
+access_account_tax_code,account.tax.code,model_account_tax_code,account.group_account_invoice,1,0,0,0
+access_account_tax,account.tax,model_account_tax,account.group_account_invoice,1,0,0,0
+access_account_model,account.model,model_account_model,account.group_account_user,1,1,1,1
+access_account_model_line,account.model.line,model_account_model_line,account.group_account_user,1,1,1,1
+access_account_subscription,account.subscription,model_account_subscription,account.group_account_user,1,1,1,1
+access_account_subscription_line,account.subscription.line,model_account_subscription_line,account.group_account_user,1,1,1,1
+access_account_subscription_manager,account.subscription manager,model_account_subscription,account.group_account_manager,1,0,0,0
+access_account_subscription_line_manager,account.subscription.line manager,model_account_subscription_line,account.group_account_manager,1,0,0,0
+access_account_account_template,account.account.template,model_account_account_template,account.group_account_manager,1,1,1,1
+access_account_tax_code_template,account.tax.code.template,model_account_tax_code_template,account.group_account_manager,1,1,1,1
+access_account_chart_template,account.chart.template,model_account_chart_template,account.group_account_manager,1,1,1,1
+access_account_tax_template,account.tax.template,model_account_tax_template,account.group_account_manager,1,1,1,1
+access_account_bank_statement,account.bank.statement,model_account_bank_statement,account.group_account_user,1,1,1,1
+access_account_bank_statement_line,account.bank.statement.line,model_account_bank_statement_line,account.group_account_user,1,1,1,1
+access_account_analytic_line_manager,account.analytic.line manager,model_account_analytic_line,account.group_account_manager,1,0,0,0
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,base.group_user,1,0,0,0
+access_account_analytic_journal,account.analytic.journal,model_account_analytic_journal,account.group_account_user,1,0,0,0
+access_account_analytic_journal_user,account.analytic.journal,model_account_analytic_journal,base.group_user,1,1,1,0
+access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
+access_account_invoice_line_uinvoice,account.invoice.line,model_account_invoice_line,account.group_account_invoice,1,1,1,1
+access_account_invoice_tax_uinvoice,account.invoice.tax,model_account_invoice_tax,account.group_account_invoice,1,1,1,1
+access_account_move_uinvoice,account.move,model_account_move,account.group_account_invoice,1,1,1,1
+access_account_move_line_uinvoice,account.move.line invoice,model_account_move_line,account.group_account_invoice,1,1,1,1
+access_account_move_reconcile_uinvoice,account.move.reconcile,model_account_move_reconcile,account.group_account_invoice,1,1,1,1
+access_account_journal_period_uinvoice,account.journal.period,model_account_journal_period,account.group_account_invoice,1,1,1,1
+access_account_payment_term_manager,account.payment.term,model_account_payment_term,account.group_account_manager,1,1,1,1
+access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
+access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
+access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
+access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0
+access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
+access_account_period_invoice,account.period invoice,model_account_period,account.group_account_invoice,1,0,0,0
+access_account_invoice_group_invoice,account.invoice group invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
+access_account_analytic_journal_manager,account.analytic.journal,model_account_analytic_journal,account.group_account_manager,1,1,1,1
+access_account_fiscalyear,account.fiscalyear,model_account_fiscalyear,account.group_account_manager,1,1,1,1
+access_account_fiscalyear_invoice,account.fiscalyear.invoice,model_account_fiscalyear,account.group_account_invoice,1,0,0,0
+access_account_fiscalyear_partner_manager,account.fiscalyear.partnermanager,model_account_fiscalyear,base.group_partner_manager,1,0,0,0
+access_account_fiscalyear_employee,account.fiscalyear employee,model_account_fiscalyear,base.group_user,1,0,0,0
+access_res_currency_account_manager,res.currency account manager,base.model_res_currency,group_account_manager,1,1,1,1
+access_res_currency_rate_account_manager,res.currency.rate account manager,base.model_res_currency_rate,group_account_manager,1,1,1,1
+access_res_currency_rate_type_account_manager,res.currency.rate.type account manager,base.model_res_currency_rate_type,group_account_manager,1,1,1,1
+access_account_invoice_user,account.invoice user,model_account_invoice,base.group_user,1,0,0,0
+access_account_invoice_user,account.invoice.line user,model_account_invoice_line,base.group_user,1,0,0,0
+access_account_payment_term_partner_manager,account.payment.term partner manager,model_account_payment_term,base.group_user,1,0,0,0
+access_account_payment_term_line_partner_manager,account.payment.term.line partner manager,model_account_payment_term_line,base.group_user,1,0,0,0
+access_account_account_sale_manager,account.account sale manager,model_account_account,base.group_sale_manager,1,0,0,0
+access_account_fiscal_position_product_manager,account.fiscal.position account.manager,model_account_fiscal_position,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_tax_product_manager,account.fiscal.position.tax account.manager,model_account_fiscal_position_tax,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_account_product_manager,account.fiscal.position account.manager,model_account_fiscal_position_account,account.group_account_manager,1,1,1,1
+access_account_fiscal_position,account.fiscal.position all,model_account_fiscal_position,base.group_user,1,0,0,0
+access_account_fiscal_position_tax,account.fiscal.position.tax all,model_account_fiscal_position_tax,base.group_user,1,0,0,0
+access_account_fiscal_position_account,account.fiscal.position all,model_account_fiscal_position_account,base.group_user,1,0,0,0
+access_account_fiscal_position_template,account.fiscal.position.template,model_account_fiscal_position_template,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_tax_template,account.fiscal.position.tax.template,model_account_fiscal_position_tax_template,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_account_template,account.fiscal.position.account.template,model_account_fiscal_position_account_template,account.group_account_manager,1,1,1,1
+access_account_sequence_fiscal_year_user,account.sequence.fiscalyear user,model_account_sequence_fiscalyear,base.group_user,1,0,0,0
+access_temp_range,temp.range,model_temp_range,account.group_account_manager,1,0,0,0
+access_report_aged_receivable,report.aged.receivable,model_report_aged_receivable,account.group_account_manager,1,1,1,1
+access_report_invoice_created,report.invoice.created,model_report_invoice_created,account.group_account_manager,1,1,1,1
+access_report_account_type_sales,report.account_type.sales,model_report_account_type_sales,account.group_account_manager,1,1,1,1
+access_report_account_sales,report.account.sales,model_report_account_sales,account.group_account_manager,1,1,1,1
+access_account_invoice_report,account.invoice.report,model_account_invoice_report,account.group_account_manager,1,1,1,1
+access_res_partner_group_account_manager,res_partner group_account_manager,model_res_partner,account.group_account_manager,1,0,0,0
+access_account_invoice_accountant,account.invoice accountant,model_account_invoice,account.group_account_user,1,0,0,0
+access_account_tax_code_accountant,account.tax.code accountant,model_account_tax_code,account.group_account_user,1,1,1,1
+access_account_move_line_manager,account.move.line manager,model_account_move_line,account.group_account_manager,1,0,0,0
+access_account_move_manager,account.move manager,model_account_move,account.group_account_manager,1,0,0,0
+access_account_entries_report_manager,account.entries.report,model_account_entries_report,account.group_account_manager,1,1,1,1
+access_account_entries_report_invoice,account.entries.report,model_account_entries_report,account.group_account_invoice,1,0,0,0
+access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0
+access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0
+access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1
+access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1
+access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1
+access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0
+access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0
+access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1
+access_account_invoice_line_accountant,account.invoice.line accountant,model_account_invoice_line,account.group_account_user,1,0,0,0
+access_res_partner_address_accountant,res.partner.address accountant,base.model_res_partner_address,account.group_account_user,1,0,0,0
+access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,1,1,1
+access_res_partner_address_invoice,res.partner.address invoice,base.model_res_partner_address,account.group_account_invoice,1,1,1,1
+access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1
+access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,1,1,1
+access_report_account_receivable_invoice,report.account.receivable.invoice,model_report_account_receivable,account.group_account_invoice,1,1,1,1
+access_account_sequence_fiscal_year_invoice,account.sequence.fiscalyear invoice,model_account_sequence_fiscalyear,account.group_account_invoice,1,1,1,1
+access_account_tax_sale_manager,account.tax sale manager,model_account_tax,base.group_sale_salesman,1,0,0,0
+access_account_journal_sale_manager,account.journal sale manager,model_account_journal,base.group_sale_salesman,1,0,0,0
+access_account_invoice_tax_sale_manager,account.invoice.tax  sale manager,model_account_invoice_tax,base.group_sale_salesman,1,0,0,0
+access_account_sequence_fiscal_year_sale_user,account.sequence.fiscalyear.sale.user,model_account_sequence_fiscalyear,base.group_sale_salesman,1,1,1,0
+access_account_sequence_fiscal_year_sale_manager,account.sequence.fiscalyear.sale.manager,model_account_sequence_fiscalyear,base.group_sale_manager,1,1,1,1
+access_account_treasury_report_manager,account.treasury.report.manager,model_account_treasury_report,account.group_account_manager,1,0,0,0
+access_account_financial_report,account.financial.report,model_account_financial_report,account.group_account_user,1,1,1,1
+access_account_financial_report_invoice,account.financial.report invoice,model_account_financial_report,account.group_account_invoice,1,0,0,0
diff --git a/addons/account_accountant/static/src/img/icon.png b/addons/account_accountant/static/src/img/icon.png
new file mode 100644
index 00000000000..611053684cc
--- /dev/null
+++ b/addons/account_accountant/static/src/img/icon.png
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index ee887e1ff6a..01ef6a3cb81 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -46,7 +46,6 @@ user-wise as well as month wise.
                     ],
     'demo_xml'  : [],
     'installable': True,
-    'application': True,
     'active'    : False,
     'certificate': '0042927202589',
 }
diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 80b9f37db1f..4bdabaf6a87 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
-access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
+access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
index f92a9fd4dfa..cdfebbbb156 100644
--- a/addons/account_analytic_default/security/ir.model.access.csv
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
-access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1
-access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
-access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
+access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
+access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index f7f141ac15a..9ba40d5c1c3 100644
--- a/addons/account_analytic_plans/security/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
@@ -1,8 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_analytic_plan","account.analytic.plan","model_account_analytic_plan","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_line","account.analytic.plan.line","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_instance","account.analytic.plan.instance","model_account_analytic_plan_instance","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_instance_line","account.analytic.plan.instance.line","model_account_analytic_plan_instance_line","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
-"access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_plan,account.analytic.plan,model_account_analytic_plan,account.group_account_user,1,1,1,1
+access_account_analytic_plan_line,account.analytic.plan.line,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
+access_account_analytic_plan_instance,account.analytic.plan.instance,model_account_analytic_plan_instance,account.group_account_user,1,1,1,1
+access_account_analytic_plan_instance_line,account.analytic.plan.instance.line,model_account_analytic_plan_instance_line,account.group_account_user,1,1,1,1
+access_account_analytic_plan_line_invoice,account.analytic.plan.line.invoice,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 52ec0588e88..432021a78c9 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -36,7 +36,7 @@ when the invoice is created to transfer this amount to the debtor or creditor ac
 Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""",
     "images"   : ["images/account_anglo_saxon.jpeg"],
     "depends"   : ["product", "purchase"],
-    "category"  : "Accounting & Finance",
+    "category"  : "Hidden/Dependency",
     "init_xml"  : [],
     "demo_xml"  : [],
     "update_xml" : ["product_view.xml",],
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index e986ef4bf0d..6fa8184554b 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -51,9 +51,7 @@
             <tree string="Asset category">
                 <field name="name"/>
                 <field name="journal_id"/>
-                <field name="method_time"/>
                 <field name="method"/>
-                <field name="open_asset"/>
                 <field name="company_id" groups="base.group_multi_company"/>
             </tree>
         </field>
@@ -94,9 +92,9 @@
               <notebook colspan="4">
                  <page string="General">
                     <separator string="Other Information" colspan="4"/>
-                    <field name="parent_id"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
+                    <field name="parent_id" groups="base.group_extended"/>
                     <newline/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2"/>
@@ -121,7 +119,7 @@
                        <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
                     </group>
                  </page>
-                 <page string="Depreciation board">
+                 <page string="Depreciation Board">
                     <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
                        <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
                           <field name="depreciation_date"/>
@@ -290,8 +288,12 @@
     </record>
 
     <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>
-    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree" action="action_account_asset_asset_tree"/>
-      <record model="ir.actions.act_window" id="action_account_asset_asset_form">
+    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
+        groups="base.group_extended"
+        sequence="100"
+        action="action_account_asset_asset_tree"/>
+
+    <record model="ir.actions.act_window" id="action_account_asset_asset_form">
         <field name="name">Assets</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">form</field>
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 126515e07a9..6683b7227db 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-10 11:58+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -27,12 +27,12 @@ msgstr "Activos em Aberto"
 #: field:account.asset.property,method_end:0
 #: field:account.asset.property.history,method_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Data final"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation board"
-msgstr ""
+msgstr "Painel de amortização"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -60,7 +60,7 @@ msgstr "Linear"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change duration"
-msgstr ""
+msgstr "Alterar a duração"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
@@ -70,12 +70,12 @@ msgstr "Activos filho"
 #. module: account_asset
 #: field:account.asset.board,value_asset:0
 msgid "Asset Value"
-msgstr "Valor do Imobilizado"
+msgstr "Valor do Ativo"
 
 #. module: account_asset
 #: wizard_field:account.asset.modify,init,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -94,7 +94,7 @@ msgstr "Movimentos gerados"
 #: field:account.asset.property,method_delay:0
 #: field:account.asset.property.history,method_delay:0
 msgid "Number of interval"
-msgstr ""
+msgstr "Número de intervalo"
 
 #. module: account_asset
 #: wizard_button:account.asset.compute,asset_compute,asset_open:0
@@ -136,7 +136,7 @@ msgstr "Histórico de alterações"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation entries"
-msgstr ""
+msgstr "Lançamentos de amortização"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -158,12 +158,12 @@ msgstr "Terceiro"
 #: field:account.asset.property,method_period:0
 #: field:account.asset.property.history,method_period:0
 msgid "Period per interval"
-msgstr ""
+msgstr "Período por intervalo"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation duration"
-msgstr ""
+msgstr "Duração da amortização"
 
 #. module: account_asset
 #: field:account.asset.property,account_analytic_id:0
@@ -178,7 +178,7 @@ msgstr "Estado"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation methods"
-msgstr ""
+msgstr "Métodos de amortização"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -188,12 +188,12 @@ msgstr "Outra informação"
 #. module: account_asset
 #: field:account.asset.board,value_asset_cumul:0
 msgid "Cumul. value"
-msgstr ""
+msgstr "Valor acumulado"
 
 #. module: account_asset
 #: view:account.asset.property:0
 msgid "Assets methods"
-msgstr ""
+msgstr "Métodos de imobilizado"
 
 #. module: account_asset
 #: constraint:ir.ui.view:0
@@ -203,7 +203,7 @@ msgstr "XML Inválido para a Arquitectura de Vista!"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_property
 msgid "Asset property"
-msgstr ""
+msgstr "Propriedade do ativo"
 
 #. module: account_asset
 #: wizard_view:account.asset.compute,asset_compute:0
@@ -273,7 +273,7 @@ msgstr "Nome do activo"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Accounts information"
-msgstr ""
+msgstr "Informação das contas"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -291,7 +291,7 @@ msgstr "Rascunho"
 #. module: account_asset
 #: field:account.asset.property,type:0
 msgid "Depr. method type"
-msgstr ""
+msgstr "Tipo de método de amotiz."
 
 #. module: account_asset
 #: field:account.asset.property,account_asset_id:0
@@ -311,7 +311,7 @@ msgstr "Normal"
 #. module: account_asset
 #: field:account.asset.property,method_progress_factor:0
 msgid "Progressif factor"
-msgstr ""
+msgstr "Fator de progressividade"
 
 #. module: account_asset
 #: field:account.asset.asset,localisation:0
@@ -326,7 +326,7 @@ msgstr "Método de cálculo"
 #. module: account_asset
 #: field:account.asset.property,method_time:0
 msgid "Time method"
-msgstr ""
+msgstr "Método temporal"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -341,7 +341,7 @@ msgstr "Utilizador"
 #. module: account_asset
 #: field:account.asset.asset,property_ids:0
 msgid "Asset method name"
-msgstr ""
+msgstr "Nome do método de ativo"
 
 #. module: account_asset
 #: field:account.asset.asset,date:0
@@ -368,7 +368,7 @@ msgstr "Histórico"
 #. module: account_asset
 #: field:account.asset.property,account_actif_id:0
 msgid "Depreciation account"
-msgstr ""
+msgstr "Conta de amortização"
 
 #. module: account_asset
 #: field:account.asset.asset,period_id:0
@@ -412,24 +412,24 @@ msgstr ""
 #. module: account_asset
 #: model:ir.module.module,shortdesc:account_asset.module_meta_information
 msgid "Asset management"
-msgstr "Gestão de Activo"
+msgstr "Gestão do Imobilizado"
 
 #. module: account_asset
 #: view:account.asset.board:0
 #: field:account.asset.property,board_ids:0
 #: model:ir.model,name:account_asset.model_account_asset_board
 msgid "Asset board"
-msgstr ""
+msgstr "Painel do imobilizado"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 msgid "Global state"
-msgstr ""
+msgstr "Estado global"
 
 #. module: account_asset
 #: selection:account.asset.property,method_time:0
 msgid "Delay"
-msgstr ""
+msgstr "Demora"
 
 #. module: account_asset
 #: wizard_view:account.asset.close,init:0
@@ -439,7 +439,7 @@ msgstr "Informação geral"
 #. module: account_asset
 #: field:account.asset.property,journal_analytic_id:0
 msgid "Analytic journal"
-msgstr ""
+msgstr "Diário analítico"
 
 #. module: account_asset
 #: field:account.asset.property,name:0
@@ -454,7 +454,7 @@ msgstr "Diário"
 #. module: account_asset
 #: field:account.asset.property.history,name:0
 msgid "History name"
-msgstr "Nome de História"
+msgstr "Nome de histórico"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -477,13 +477,13 @@ msgstr "Categoria de activos"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation"
-msgstr ""
+msgstr "Amortização"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
 #: field:account.asset.category,code:0
 msgid "Asset code"
-msgstr "Código de imobilizado"
+msgstr "Código do ativo"
 
 #. module: account_asset
 #: field:account.asset.asset,value_total:0
diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv
index 928cad25ebd..d6eda4016c9 100755
--- a/addons/account_asset/security/ir.model.access.csv
+++ b/addons/account_asset/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_asset_category","account.asset.category","model_account_asset_category","account.group_account_user",1,0,0,0
-"access_account_asset_asset","account.asset.asset","model_account_asset_asset","account.group_account_user",1,0,0,0
-"access_account_asset_history","account.asset.history","model_account_asset_history","account.group_account_user",1,0,0,0
-"access_account_asset_category_manager","account.asset.category","model_account_asset_category","account.group_account_manager",1,1,1,1
-"access_account_asset_asset_manager","account.asset.asset","model_account_asset_asset","account.group_account_manager",1,1,1,1
-"access_account_asset_history_manager","account.asset.history","model_account_asset_history","account.group_account_manager",1,1,1,1
-"access_account_asset_depreciation_line","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_user",1,0,0,0
-"access_account_asset_depreciation_line_manager","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_manager",1,1,1,1
-"access_asset_asset_report","asset.asset.report","model_asset_asset_report","account.group_account_user",1,0,0,0
-"access_asset_asset_report_manager","asset.asset.report","model_asset_asset_report","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_asset_category,account.asset.category,model_account_asset_category,account.group_account_user,1,0,0,0
+access_account_asset_asset,account.asset.asset,model_account_asset_asset,account.group_account_user,1,0,0,0
+access_account_asset_history,account.asset.history,model_account_asset_history,account.group_account_user,1,0,0,0
+access_account_asset_category_manager,account.asset.category,model_account_asset_category,account.group_account_manager,1,1,1,1
+access_account_asset_asset_manager,account.asset.asset,model_account_asset_asset,account.group_account_manager,1,1,1,1
+access_account_asset_history_manager,account.asset.history,model_account_asset_history,account.group_account_manager,1,1,1,1
+access_account_asset_depreciation_line,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_user,1,0,0,0
+access_account_asset_depreciation_line_manager,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_manager,1,1,1,1
+access_asset_asset_report,asset.asset.report,model_asset_asset_report,account.group_account_user,1,0,0,0
+access_asset_asset_report_manager,asset.asset.report,model_asset_asset_report,account.group_account_manager,1,1,1,1
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index e4782ee0d2a..15076588ed5 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Budgets',
+    'name': 'Budgets Management',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Accounting & Finance',
     'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index b2eb33f3d04..1298884a856 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -1,7 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,0,0,0
-"access_crossovered_budget_lines","crossovered.budget.lines","model_crossovered_budget_lines","account.group_account_manager",1,1,1,1
-"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0
-"access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1
-"access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1
-"access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crossovered_budget,crossovered.budget,model_crossovered_budget,account.group_account_manager,1,0,0,0
+access_account_budget_post,account.budget.post,model_account_budget_post,account.group_account_manager,1,0,0,0
+access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
+access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
+access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 647146f98fb..252e8ffd3d0 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Cancel Entries",
+    "name" : "Cancel Journal Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index d476eb1f443..c0c9245a477 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Template of Charts of Accounts',
     'version': '1.1',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'description': """
 Remove minimal account chart.
 =============================
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 9eb831185d5..74fe7b0e8ce 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
-"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
-"access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_coda,account.coda,model_account_coda,account.group_account_user,1,0,0,0
+access_account_coda_manager,account.coda,model_account_coda,account.group_account_manager,1,1,1,1
+access_account_coda_import_user,account.coda,model_account_coda,account.group_account_user,1,0,0,0
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index 7b7e2af7ba8..75af9bf44f2 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,7 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
-"access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
-"access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1
-"access_account_followup_stat_by_partner_manager","account_followup.stat.by.partner","model_account_followup_stat_by_partner","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_user,1,0,0,0
+access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1
+access_account_followup_followup_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_user,1,0,0,0
+access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,1,1
+access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_manager,1,1,1,1
diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
index c838392e6eb..98878fc91bf 100644
--- a/addons/account_invoice_layout/security/ir.model.access.csv
+++ b/addons/account_invoice_layout/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index a4b6fe0af5e..864b7656964 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -1,11 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_payment_mode","payment.mode","model_payment_mode","group_account_payment",1,1,1,1
-"access_payment_order","payment.order","model_payment_order","group_account_payment",1,1,1,1
-"access_payment_line","payment.line","model_payment_line","group_account_payment",1,1,1,1
-"access_account_journal_payement","account.journal payment","account.model_account_journal","group_account_payment",1,0,0,0
-"access_account_invoice_payment","account.invoice payment","account.model_account_invoice","group_account_payment",1,0,0,0
-"access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
-"access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1
-"access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
-"access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
-"access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_payment_mode,payment.mode,model_payment_mode,group_account_payment,1,1,1,1
+access_payment_order,payment.order,model_payment_order,group_account_payment,1,1,1,1
+access_payment_line,payment.line,model_payment_line,group_account_payment,1,1,1,1
+access_account_journal_payement,account.journal payment,account.model_account_journal,group_account_payment,1,0,0,0
+access_account_invoice_payment,account.invoice payment,account.model_account_invoice,group_account_payment,1,0,0,0
+access_account_move_line_payment,account.move.line payment,account.model_account_move_line,group_account_payment,1,0,0,0
+access_payment_order_manager,payment.order manager,model_payment_order,account.group_account_manager,1,0,0,0
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
index 84c22715b25..e2e827d4e57 100644
--- a/addons/account_sequence/i18n/pt.po
+++ b/addons/account_sequence/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-24 03:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-09 10:09+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -28,12 +28,13 @@ msgstr ""
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Não pode criar registos em períodos ou diários diferentes no mesmo movimento"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
 #: help:account.move.line,internal_sequence_number:0
 msgid "Internal Sequence Number"
-msgstr ""
+msgstr "Número interno de sequência"
 
 #. module: account_sequence
 #: help:account.sequence.installer,number_next:0
@@ -43,12 +44,12 @@ msgstr ""
 #. module: account_sequence
 #: field:account.sequence.installer,number_next:0
 msgid "Next Number"
-msgstr ""
+msgstr "Próximo número"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Incremento"
 
 #. module: account_sequence
 #: model:ir.module.module,description:account_sequence.module_meta_information
@@ -57,6 +58,10 @@ msgid ""
 "    This module maintains internal sequence number for accounting entries.\n"
 "    "
 msgstr ""
+"\n"
+"    Esse módulo gere os números de sequência internos dos lançamentos "
+"contabilísticos.\n"
+"    "
 
 #. module: account_sequence
 #: model:ir.module.module,shortdesc:account_sequence.module_meta_information
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index a8d9c7f580b..eac7fc13818 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -1,9 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,1,1,1
-"access_account_voucher_line_accountant","account.voucher.line.accountant","model_account_voucher_line","account.group_account_user",1,1,1,1
-"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
-"access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
-"access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
-"access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
-"access_sale_receipt_report_manager","account.sale.receipt.report","model_sale_receipt_report","account.group_account_manager",1,1,1,1
-"access_sale_receipt_report_user","account.sale.receipt.report","model_sale_receipt_report","account.group_account_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_voucher_manager,account.voucher,model_account_voucher,account.group_account_manager,1,0,0,0
+access_account_voucher_line_manager,account.voucher.line,model_account_voucher_line,account.group_account_manager,1,0,0,0
+access_account_voucher_invoice,account.voucher invoice,model_account_voucher,account.group_account_invoice,1,1,1,1
+access_account_voucher_line_invoice,account.voucher.line invoice,model_account_voucher_line,account.group_account_invoice,1,1,1,1
+access_sale_receipt_report_manager,account.sale.receipt.report,model_sale_receipt_report,account.group_account_manager,1,1,1,1
+access_sale_receipt_report_user,account.sale.receipt.report,model_sale_receipt_report,account.group_account_user,1,0,0,0
diff --git a/addons/account_voucher/static/src/img/icon.png b/addons/account_voucher/static/src/img/icon.png
new file mode 100644
index 00000000000..afad1331e2e
--- /dev/null
+++ b/addons/account_voucher/static/src/img/icon.png
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 4e10e243d61..33f1f281851 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Analytic Account",
+    "name" : "Analytic Accounting",
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     "depends" : ["base", "decimal_precision"],
     "description": """
 Module for defining analytic accounting object.
diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv
index 0a6c192eb56..4a08a4aa60d 100644
--- a/addons/analytic/security/ir.model.access.csv
+++ b/addons/analytic/security/ir.model.access.csv
@@ -1,2 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/analytic_journal_billing_rate/security/ir.model.access.csv b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
index 0b03709a81b..b4a604b2362 100644
--- a/addons/analytic_journal_billing_rate/security/ir.model.access.csv
+++ b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_analytic_journal_rate_user","analytic journal rate user","model_analytic_journal_rate_grid","account.group_account_manager",1,0,0,0
-"access_analytic_journal_rate_manager","analytic journal rate manager","model_analytic_journal_rate_grid","account.group_account_manager",1,1,1,1
-"access_analytic_journal_rate_account_manager","analytic journal rateaccount manager","model_analytic_journal_rate_grid","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_analytic_journal_rate_user,analytic journal rate user,model_analytic_journal_rate_grid,account.group_account_manager,1,0,0,0
+access_analytic_journal_rate_manager,analytic journal rate manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
+access_analytic_journal_rate_account_manager,analytic journal rateaccount manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index d8f2f0d2116..fe48e329aea 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","account.group_account_manager",1,0,0,0
-"access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","base.group_hr_user",1,0,0,0
-"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_analytic_user_funct_user,analytic user funct user,model_analytic_user_funct_grid,account.group_account_manager,1,0,0,0
+access_analytic_user_funct_manager,analytic user funct manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
+access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
+access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0
+access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1
diff --git a/addons/anonymization/security/ir.model.access.csv b/addons/anonymization/security/ir.model.access.csv
index 5531738338b..745913eaa65 100644
--- a/addons/anonymization/security/ir.model.access.csv
+++ b/addons/anonymization/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_model_fields_anonymization_group_system","ir_model_fields_anonymization group_user","model_ir_model_fields_anonymization","base.group_system",1,1,1,1
-"access_ir_model_fields_anonymization_user","ir_model_fields_anonymization user","model_ir_model_fields_anonymization",,1,0,0,0
-"access_ir_model_fields_anonymization_history_group_system","ir_model_fields_anonymization_history group_user","model_ir_model_fields_anonymization_history","base.group_system",1,1,1,1
-"access_ir_model_fields_anonymization_history_user","ir_model_fields_anonymization_history user","model_ir_model_fields_anonymization_history",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_model_fields_anonymization_group_system,ir_model_fields_anonymization group_user,model_ir_model_fields_anonymization,base.group_system,1,1,1,1
+access_ir_model_fields_anonymization_user,ir_model_fields_anonymization user,model_ir_model_fields_anonymization,,1,0,0,0
+access_ir_model_fields_anonymization_history_group_system,ir_model_fields_anonymization_history group_user,model_ir_model_fields_anonymization_history,base.group_system,1,1,1,1
+access_ir_model_fields_anonymization_history_user,ir_model_fields_anonymization_history user,model_ir_model_fields_anonymization_history,,1,0,0,0
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 8aad18575ff..36622a5750d 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -37,7 +37,6 @@ It installs the profile for associations to manage events, registrations, member
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'application': True,
     'certificate': '0078696047261',
     'images': ['images/association1.jpeg'],
 }
diff --git a/addons/association/security/ir.model.access.csv b/addons/association/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/association/security/ir.model.access.csv
+++ b/addons/association/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 0475890e1e9..c3cba1d7255 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Auction Management',
+    'name': 'Auction Houses',
     'version': '1.0',
     'category': 'Specific Industry Applications',
     'complexity': "normal",
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 94c9c1f83aa..351ca866f6d 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -1,35 +1,35 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
-"access_auction_dates_user","auction.dates user","model_auction_dates","group_auction_user",1,0,0,0
-"access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
-"access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
-"access_auction_deposit_user","auction.deposit user","model_auction_deposit","group_auction_user",1,0,0,0
-"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
-"access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
-"access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
-"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,0
-"access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
-"access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
-"access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
-"access_auction_bid_line","auction.bid.line","model_auction_bid_line","group_auction_user",1,1,1,1
-"access_auction_bid_line_manager","auction.bid.line manager","model_auction_bid_line","group_auction_manager",1,0,0,0
-"access_auction_lot_history","auction.lot.history","model_auction_lot_history","group_auction_user",1,1,1,1
-"access_auction_lot_history_manager","auction.lot.history manager","model_auction_lot_history","group_auction_manager",1,0,0,0
-"access_report_auction","report.auction","model_report_auction","group_auction_manager",1,1,1,1
-"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","group_auction_manager",1,1,1,1
-"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
-"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
-"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
-"access_auction_account_tax_user","account.tax user","account.model_account_tax","group_auction_user",1,0,0,0
-"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
-"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
-"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
-"access_auction_account_invoice","account.invoice manager","account.model_account_invoice","group_auction_manager",1,1,1,0
-"access_auction_account_invoice_line","account.invoice.line manager","account.model_account_invoice_line","group_auction_manager",1,1,1,0
-"access_auction_account_invoice_tax","account.invoice.tax manager","account.model_account_invoice_tax","group_auction_manager",1,1,1,0
-"access_auction_account_analytic_journal","account.analytic.journal manager","account.model_account_analytic_journal","group_auction_manager",1,1,1,0
-"access_auction_account_period","account.period manager","account.model_account_period","group_auction_manager",1,1,1,0
-"access_auction_account_move","account.move manager","account.model_account_move","group_auction_manager",1,1,1,0
-"access_auction_account_move_line","account.move.line manager","account.model_account_move_line","group_auction_manager",1,1,1,0
-"access_auction_account_journal_period","account.journal.period manager","account.model_account_journal_period","group_auction_manager",1,1,1,0
-"access_auction_account_analytic_line","account.analytic.line manager","account.model_account_analytic_line","group_auction_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_auction_artists,auction.artists,model_auction_artists,group_auction_manager,1,1,1,1
+access_auction_dates_user,auction.dates user,model_auction_dates,group_auction_user,1,0,0,0
+access_auction_dates_manager,auction.dates manager,model_auction_dates,group_auction_manager,1,1,1,1
+access_auction_deposit_manager,auction.deposit manager,model_auction_deposit,group_auction_manager,1,1,1,1
+access_auction_deposit_user,auction.deposit user,model_auction_deposit,group_auction_user,1,0,0,0
+access_auction_deposit_cost,auction.deposit.cost,model_auction_deposit_cost,group_auction_manager,1,1,1,1
+access_auction_lot_category,auction.lot.category,model_auction_lot_category,group_auction_user,1,0,0,0
+access_auction_lot_category_manager,auction.lot.category manager,model_auction_lot_category,group_auction_manager,1,1,1,1
+access_auction_lots,auction.lots,model_auction_lots,group_auction_user,1,1,1,0
+access_auction_lots_manager,auction.lots manager,model_auction_lots,group_auction_manager,1,0,0,0
+access_auction_bid,auction.bid,model_auction_bid,group_auction_user,1,1,1,1
+access_auction_bid_manager,auction.bid manager,model_auction_bid,group_auction_manager,1,0,0,0
+access_auction_bid_line,auction.bid.line,model_auction_bid_line,group_auction_user,1,1,1,1
+access_auction_bid_line_manager,auction.bid.line manager,model_auction_bid_line,group_auction_manager,1,0,0,0
+access_auction_lot_history,auction.lot.history,model_auction_lot_history,group_auction_user,1,1,1,1
+access_auction_lot_history_manager,auction.lot.history manager,model_auction_lot_history,group_auction_manager,1,0,0,0
+access_report_auction,report.auction,model_report_auction,group_auction_manager,1,1,1,1
+access_report_auction_object_date,report.auction.object.date,model_report_auction_object_date,group_auction_manager,1,1,1,1
+access_report_auction_adjudication,report.auction.adjudication,model_report_auction_adjudication,group_auction_manager,1,1,1,1
+access_report_object_encoded,report.object.encoded,model_report_object_encoded,group_auction_manager,1,1,1,1
+access_aie_category,aie.category,model_aie_category,group_auction_manager,1,1,1,1
+access_auction_account_tax_user,account.tax user,account.model_account_tax,group_auction_user,1,0,0,0
+access_auction_account_tax,account.tax manager,account.model_account_tax,group_auction_manager,1,1,1,0
+access_auction_account_fiscalyear,account.fiscalyear manager,account.model_account_fiscalyear,group_auction_manager,1,1,1,0
+access_auction_account_journal,account.journal manager,account.model_account_journal,group_auction_manager,1,1,1,0
+access_auction_account_invoice,account.invoice manager,account.model_account_invoice,group_auction_manager,1,1,1,0
+access_auction_account_invoice_line,account.invoice.line manager,account.model_account_invoice_line,group_auction_manager,1,1,1,0
+access_auction_account_invoice_tax,account.invoice.tax manager,account.model_account_invoice_tax,group_auction_manager,1,1,1,0
+access_auction_account_analytic_journal,account.analytic.journal manager,account.model_account_analytic_journal,group_auction_manager,1,1,1,0
+access_auction_account_period,account.period manager,account.model_account_period,group_auction_manager,1,1,1,0
+access_auction_account_move,account.move manager,account.model_account_move,group_auction_manager,1,1,1,0
+access_auction_account_move_line,account.move.line manager,account.model_account_move_line,group_auction_manager,1,1,1,0
+access_auction_account_journal_period,account.journal.period manager,account.model_account_journal_period,group_auction_manager,1,1,1,0
+access_auction_account_analytic_line,account.analytic.line manager,account.model_account_analytic_line,group_auction_manager,1,1,1,1
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index 877cf622ad4..25bba6a00b1 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
-"access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
-"access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_audittrail_rule_all_users,audittrail rule all,model_audittrail_rule,base.group_user,1,0,0,0
+access_audittrail_log_all_users,audittrail log all,model_audittrail_log,base.group_user,1,0,1,0
+access_audittrail_log_line_all_users,audittrail log line all,model_audittrail_log_line,base.group_user,1,0,1,0
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index a8788bdddcb..56da3350347 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Action Rule',
+    'name': 'Automated Action Rules',
     'version': '1.0',
     'category': 'Sales Management',
     'description': """
diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv
index 4d2e612b384..92d3d55649f 100644
--- a/addons/base_action_rule/security/ir.model.access.csv
+++ b/addons/base_action_rule/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0
-"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_action_rule,base.action.rule,model_base_action_rule,,1,0,0,0
+access_base_action_rule_config,base.action.rule config,model_base_action_rule,base.group_system,1,1,1,1
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 6edb978301f..c6ab9c4628e 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Basic Calendar Functionality",
+    "name" : "Calendar Layer",
     "version" : "1.0",
     "depends" : ["base", "mail"],
     'complexity': "easy",
@@ -32,9 +32,12 @@ It supports:
     - Calendar of events
     - Alerts (create requests)
     - Recurring events
-    - Invitations to people""",
+    - Invitations to people
+
+If you need to manage your meetings, you should install the CRM module.
+    """,
     "author" : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 45624a280f1..9ce32429e5b 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1009,10 +1009,19 @@ class calendar_event(osv.osv):
             else:
                 result[event] = ""
         return result
-    
-      
-    
-    
+
+    def _rrule_write(self, obj, cr, uid, ids, field_name, field_value, args, context=None):
+        data = self._get_empty_rrule_data()
+        if field_value:
+            data['recurrency'] = True
+            for event in self.browse(cr, uid, ids, context=context):
+                rdate = rule_date or event.date
+                update_data = self._parse_rrule(field_value, dict(data), rdate)
+                data.update(update_data)
+                super(calendar_event, obj).write(cr, uid, ids, data, context=context)
+        return True
+
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'sequence': fields.integer('Sequence'),
@@ -1023,7 +1032,7 @@ class calendar_event(osv.osv):
         'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-             ('confidential', 'Confidential')], 'Mark as', states={'done': [('readonly', True)]}),
+             ('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
                                                 'Show as', states={'done': [('readonly', True)]}),
@@ -1036,7 +1045,7 @@ defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
 rule or repeating pattern of time to exclude from the recurring rule."),
         'rrule': fields.function(_get_rulestring, type='char', size=124, \
-                                    store=True, string='Recurrent Rule'),
+                    fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
                             ('yearly', 'Yearly'),],
@@ -1079,7 +1088,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'active': fields.boolean('Active', help="If the active field is set to \
          true, it will allow you to hide the event alarm information without removing it."),
         'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
-        'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Meeting."),
     }
     
     def default_organizer(self, cr, uid, context=None):
@@ -1102,83 +1110,68 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'active': 1,
             'user_id': lambda self, cr, uid, ctx: uid,
             'organizer': default_organizer,
-            'edit_all' : False,
     }
 
-    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100, context=None):
+    def get_recurrent_ids(self, cr, uid, select, domain, limit=100, context=None):
         """Gives virtual event ids for recurring events based on value of Recurrence Rule
         This method gives ids of dates that comes between start date and end date of calendar views
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param base_start_date: Get Start Date
-        @param base_until_date: Get End Date
         @param limit: The Number of Results to Return """
         if not context:
             context = {}
 
-        virtual_id = context and context.get('virtual_id', False) or False
-
-        if isinstance(select, (str, int, long)):
-            ids = [select]
-        else:
-            ids = select
         result = []
-        if ids and virtual_id:
-            for data in super(calendar_event, self).read(cr, uid, ids, context=context):
-                start_date = base_start_date and datetime.strptime(base_start_date[:10]+ ' 00:00:00' , "%Y-%m-%d %H:%M:%S") or False
-                until_date = base_until_date and datetime.strptime(base_until_date[:10]+ ' 23:59:59', "%Y-%m-%d %H:%M:%S") or False
-                event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
+        for data in super(calendar_event, self).read(cr, uid, select, context=context):
+            if not data['rrule']:
+                result.append(data['id'])
+                continue
+            event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
 #                To check: If the start date is replace by event date .. the event date will be changed by that of calendar code
-                
-                if not data['rrule']:
-                    if start_date and (event_date < start_date):
-                        continue
-                    if until_date and (event_date > until_date):
-                        continue
-                    idval = data['id']
-                    result.append(idval)                        
-                else:
-                    start_date = event_date
-                    exdate = data['exdate'] and data['exdate'].split(',') or []
-                    rrule_str = data['rrule']
-                    new_rrule_str = []
-                    rrule_until_date = False
-                    is_until = False
-                    for rule in rrule_str.split(';'):
-                        name, value = rule.split('=')
-                        if name == "UNTIL":
-                            is_until = True
-                            value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
-                            if until_date and until_date >= rrule_until_date:
-                                until_date = rrule_until_date
-                            if until_date:
-                                value = until_date.strftime("%Y%m%d%H%M%S")
-                            else:
-                                value = value.strftime("%Y%m%d%H%M%S")
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    if not is_until and until_date:
-                        value = until_date.strftime("%Y%m%d%H%M%S")
-                        name = "UNTIL"
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    new_rrule_str = ';'.join(new_rrule_str)
-                    rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule'])
-                    
-                    for r_date in rdates:
-                        if start_date and r_date < start_date:
-                            continue
-                        if until_date and r_date > until_date:
-                            continue
-                        idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
-                        result.append(idval)
-
-        if result:
-            ids = list(set(result))
+
+            if not data['rrule']:
+                continue
+
+            exdate = data['exdate'] and data['exdate'].split(',') or []
+            rrule_str = data['rrule']
+            new_rrule_str = []
+            rrule_until_date = False
+            is_until = False
+            for rule in rrule_str.split(';'):
+                name, value = rule.split('=')
+                if name == "UNTIL":
+                    is_until = True
+                    value = parser.parse(value)
+                    rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
+                    value = value.strftime("%Y%m%d%H%M%S")
+                new_rule = '%s=%s' % (name, value)
+                new_rrule_str.append(new_rule)
+            new_rrule_str = ';'.join(new_rrule_str)
+            rdates = get_recurrent_dates(str(new_rrule_str), exdate, event_date, data['exrule'])
+            for r_date in rdates:
+                ok = True
+                for arg in domain:
+                    if arg[0] in ('date', 'date_deadline'):
+                        if (arg[1]=='='):
+                            ok = ok and r_date.strftime('%Y-%m-%d')==arg[2]
+                        if (arg[1]=='>'):
+                            ok = ok and r_date.strftime('%Y-%m-%d')>arg[2]
+                        if (arg[1]=='<'):
+                            ok = ok and r_date.strftime('%Y-%m-%d')<arg[2]
+                        if (arg[1]=='>='):
+                            ok = ok and r_date.strftime('%Y-%m-%d')>=arg[2]
+                        if (arg[1]=='<='):
+                            ok = ok and r_date.strftime('%Y-%m-%d')<=arg[2]
+                if not ok:
+                    continue
+                idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
+                result.append(idval)
+
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False
+        else:
+            ids = list(set(result))
         return ids
 
     def compute_rule_string(self, datas):
@@ -1243,17 +1236,17 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'week_list' : False
         }
 
-    def _write_rrule(self, cr, uid, ids, field_value, rule_date=False, context=None):
-        data = self._get_empty_rrule_data()
-        
-        if field_value:
-            data['recurrency'] = True
-            for event in self.browse(cr, uid, ids, context=context):
-                rdate = rule_date or event.date
-                update_data = self._parse_rrule(field_value, dict(data), rdate)
-                data.update(update_data)
-                #parse_rrule
-                self.write(cr, uid, event.id, data, context=context)
+    #def _write_rrule(self, cr, uid, ids, field_value, rule_date=False, context=None):
+    #    data = self._get_empty_rrule_data()
+    #    
+    #    if field_value:
+    #        data['recurrency'] = True
+    #        for event in self.browse(cr, uid, ids, context=context):
+    #            rdate = rule_date or event.date
+    #            update_data = self._parse_rrule(field_value, dict(data), rdate)
+    #            data.update(update_data)
+    #            #parse_rrule
+    #            self.write(cr, uid, event.id, data, context=context)
         
 
     def _parse_rrule(self, rule, data, date_start):
@@ -1311,9 +1304,9 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             return res
 
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
+        context = context or {}
         args_without_date = []
-        start_date = False
-        until_date = False
+        filter_date = []
 
         for arg in args:
             if arg[0] == "id":
@@ -1323,17 +1316,18 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             elif arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')):
                 args_without_date.append(arg)
             else:
-                if arg[1] in ('>', '>='):
-                    if start_date:
-                        continue
-                    start_date = arg[2]
-                elif arg[1] in ('<', '<='):
-                    if until_date:
-                        continue
-                    until_date = arg[2]
+                if context.get('virtual_id', True):
+                    args_without_date.append('|')
+                args_without_date.append(arg)
+                if context.get('virtual_id', True):
+                    args_without_date.append(('recurrency','=',1))
+                filter_date.append(arg)
+
         res = super(calendar_event, self).search(cr, uid, args_without_date, \
                                  0, 0, order, context, count=False)
-        res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit, context=context)
+        if context.get('virtual_id', True):
+            res = self.get_recurrent_ids(cr, uid, res, args, limit, context=context)
+
         if count:
             return len(res)
         elif limit:
@@ -1341,17 +1335,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         else:
             return res
 
-    def get_edit_all(self, cr, uid, id, vals=None):
-        """
-            return true if we have to edit all meeting from the same recurrent
-            or only on occurency
-        """
-        meeting = self.read(cr,uid, id, ['edit_all', 'recurrency'] )
-        if(vals and 'edit_all' in vals): #we jsut check edit_all
-            return vals['edit_all']
-        else: #it's a recurrent event and edit_all is already check
-            return meeting['recurrency'] and meeting['edit_all']
-
     def _get_data(self, cr, uid, id, context=None):
         res = self.read(cr, uid, [id],['date', 'date_deadline'])
         return res[0]
@@ -1370,101 +1353,63 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if context is None:
-            context = {}
+        context = context or {}
         if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-            
-       
-            
-        new_ids = []
+            ids = [ids]
         res = False
-        for event_id in select:
+
+        # Special write of complex IDS
+        for event_id in ids[:]:
+            if len(str(event_id).split('-')) == 1:
+                continue
+            ids.remove(event_id)
             real_event_id = base_calendar_id2real_id(event_id)
-            edit_all = self.get_edit_all(cr, uid, event_id, vals=vals)
-            if edit_all:
-                if self.need_to_update(event_id, vals):
-                    res = self._get_data(cr, uid, real_event_id, context=context)
-                    vals.update(res)
-                event_id = real_event_id
+            if not vals.get('recurrency', True):
+                ids.append(real_event_id)
+                continue
 
             #if edit one instance of a reccurrent id
-            if len(str(event_id).split('-')) > 1 and not edit_all:
-                data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
-                                                    'rrule', 'duration', 'exdate'])
-                if data.get('rrule'):
-                    data.update(vals)
-                    data.update({
-                        'recurrent_uid': real_event_id,
-                        'recurrent_id': data.get('date'),
-                        'rrule_type': 'none',
-                        'rrule': '',
-                        'edit_all': False,
-                        'recurrency' : False,
-                        })
-
-                    new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
-
-                    date_new = event_id.split('-')[1]
-                    date_new = time.strftime("%Y%m%dT%H%M%S", \
-                                 time.strptime(date_new, "%Y%m%d%H%M%S"))
-                    exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
-                    res = self.write(cr, uid, [real_event_id], {'exdate': exdate})
-
-                    context.update({'active_id': new_id, 'active_ids': [new_id]})
-                    continue
-            if not real_event_id in new_ids:
-                new_ids.append(real_event_id)
+            data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
+                                                'rrule', 'duration', 'exdate'])
+            if data.get('rrule'):
+                data.update(vals)
+                data.update({
+                    'recurrent_uid': real_event_id,
+                    'recurrent_id': data.get('date'),
+                    'rrule_type': 'none',
+                    'rrule': '',
+                    'recurrency' : False,
+                    })
+
+                new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
+
+                date_new = event_id.split('-')[1]
+                date_new = time.strftime("%Y%m%dT%H%M%S", \
+                             time.strptime(date_new, "%Y%m%d%H%M%S"))
+                exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
+                res = self.write(cr, uid, [real_event_id], {'exdate': exdate})
+
+                context.update({'active_id': new_id, 'active_ids': [new_id]})
+                continue
 
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
-        updated_vals = self.onchange_dates(cr, uid, new_ids,
-            vals.get('date', False),
-            vals.get('duration', False),
-            vals.get('date_deadline', False),
-            vals.get('allday', False),
-            context=context)
-        vals.update(updated_vals.get('value', {}))
-        if new_ids:
-            if 'rrule' in vals.keys():
-                if 'date' in vals.keys():
-                    date_to_write = vals['date']
-                else:
-                    date_to_write = False
-                self._write_rrule(cr, uid, new_ids, vals['rrule'], date_to_write, context)
-                
-            res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
+        res = super(calendar_event, self).write(cr, uid, ids, vals, context=context)
 
         if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
                 or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
-            # change alarm details
             alarm_obj = self.pool.get('res.alarm')
-            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
+            alarm_obj.do_alarm_create(cr, uid, ids, self._name, 'date', context=context)
         return res or True and False
 
-    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        select = map(lambda x: base_calendar_id2real_id(x), select)
-        res = super(calendar_event, self).browse(cr, uid, select, context, \
-                                                    list_class, fields_process)
-        if isinstance(ids, (str, int, long)):
-            return res and res[0] or False
-
-        return res
-
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
         if not context:
             context = {}
             
         if 'date' in groupby:
             raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead'))
-        virtual_id = context.get('virtual_id', False)
+        virtual_id = context.get('virtual_id', True)
         context.update({'virtual_id': False})
         res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
         for re in res:
@@ -1479,8 +1424,12 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         # FIXME This whole id mangling has to go!
         if context is None:
             context = {}
-        
+        fields2 = fields and fields[:] or None
 
+        EXTRAFIELDS = ('class','user_id','date','duration')
+        for f in EXTRAFIELDS:
+            if fields and (f not in fields):
+                fields2.append(f)
 
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -1488,17 +1437,13 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             select = ids
         select = map(lambda x: (x, base_calendar_id2real_id(x)), select)
         result = []
-        if fields and 'date' not in fields:
-            fields.append('date')
-        if fields and 'duration' not in fields:
-            fields.append('duration')
 
         real_data = super(calendar_event, self).read(cr, uid,
                     [real_id for base_calendar_id, real_id in select],
-                    fields=fields, context=context, load=load)
+                    fields=fields2, context=context, load=load)
         real_data = dict(zip([x['id'] for x in real_data], real_data))
 
-        for base_calendar_id, real_id in select:                
+        for base_calendar_id, real_id in select:
             res = real_data[real_id].copy()
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
@@ -1507,9 +1452,25 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             res['id'] = base_calendar_id
 
             result.append(res)
+
+        for r in result:
+            if r['user_id']:
+                user_id = type(r['user_id']) in (tuple,list) and r['user_id'][0] or r['user_id']
+                if user_id==uid:
+                    continue
+            if r['class']=='private':
+                for f in r.keys():
+                    if f not in ('id','date','date_deadline','duration','user_id','state'):
+                        r[f] = False
+                    if f=='name':
+                        r[f] = _('Busy')
+
+        for r in result:
+            for k in EXTRAFIELDS:
+                if (k in r) and ((not fields) or (k not in fields)):
+                    del r[k]
         if isinstance(ids, (str, int, long)):
             return result and result[0] or False
-        
         return result
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -1520,68 +1481,49 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
         return res
-    
-    
+
     def unlink(self, cr, uid, ids, context=None):
         if not isinstance(ids, list):
             ids = [ids]
-            
         res = False
-        for id in ids:
-            data_list = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context)
-            if len(data_list) < 1:
+        for event_id in ids[:]:
+            if len(str(event_id).split('-')) == 1:
                 continue
-            event_data = data_list[0]
-            event_id = event_data['id']
 
-            if self.get_edit_all(cr, uid, event_id, vals=None):
-                event_id = base_calendar_id2real_id(event_id)
-
-            if isinstance(event_id, (int, long)):
-                res = super(calendar_event, self).unlink(cr, uid, event_id, context=context)
-                self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
-                self.unlink_events(cr, uid, [event_id], context=context)
-            else:
-                str_event, date_new = event_id.split('-')
-                event_id = int(str_event)
-                if event_data['rrule']:
-                    # Remove one of the recurrent event
-                    date_new = time.strftime("%Y%m%dT%H%M%S", \
-                                 time.strptime(date_new, "%Y%m%d%H%M%S"))
-                    exdate = (event_data['exdate'] and (event_data['exdate'] + ',')  or '') + date_new
-                    res = self.write(cr, uid, [event_id], {'exdate': exdate})
-                else:
-                    res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context)
-                    self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
-                    self.unlink_events(cr, uid, [event_id], context=context)
+            real_event_id = base_calendar_id2real_id(event_id)
+            data = self.read(cr, uid, real_event_id, ['exdate'], context=context)
+            date_new = event_id.split('-')[1]
+            date_new = time.strftime("%Y%m%dT%H%M%S", \
+                         time.strptime(date_new, "%Y%m%d%H%M%S"))
+            exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
+            self.write(cr, uid, [real_event_id], {'exdate': exdate})
+            ids.remove(event_id)
+
+        res = super(calendar_event, self).unlink(cr, uid, ids, context=context)
+        self.pool.get('res.alarm').do_alarm_unlink(cr, uid, ids, self._name)
+        self.unlink_events(cr, uid, ids, context=context)
         return res
 
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
 
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
-        
-        if 'date' in vals and 'rrule' in vals and vals['rrule']:
-            update_datas = self._parse_rrule(vals['rrule'], self._get_empty_rrule_data(), vals['date'])
-            update_datas['recurrency'] = True
-            vals.update(update_datas)
-
-        updated_vals = self.onchange_dates(cr, uid, [],
-            vals.get('date', False),
-            vals.get('duration', False),
-            vals.get('date_deadline', False),
-            vals.get('allday', False),
-            context=context)
-        vals.update(updated_vals.get('value', {}))
+
+        #updated_vals = self.onchange_dates(cr, uid, [],
+        #    vals.get('date', False),
+        #    vals.get('duration', False),
+        #    vals.get('date_deadline', False),
+        #    vals.get('allday', False),
+        #    context=context)
+        #vals.update(updated_vals.get('value', {}))
+
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
-       
         return res
-    
-    
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
         """ Makes event invitation as Tentative
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 3ce934b4ded..16064762f9b 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -242,8 +242,7 @@
                         <field name="alarm_id" string="Reminder"
                             widget="selection" />
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
-                           <field name="recurrency"/>      
-                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />                                    
+                           <field name="recurrency"/>
                         </group>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 9977f96141b..3dac47653f2 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
-"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
-"access_calendar_event","calendar.event","model_calendar_event","base.group_user",1,1,1,1
-"access_calendar_attendee_survey_user","calendar.attendee","model_calendar_attendee","base.group_survey_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_calendar_attendee,calendar.attendee,model_calendar_attendee,base.group_user,1,1,1,1
+access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1
+access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
+access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
+access_calendar_event,calendar.event,model_calendar_event,base.group_user,1,1,1,1
+access_calendar_attendee_survey_user,calendar.attendee,model_calendar_attendee,base.group_survey_user,1,0,0,0
diff --git a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
index b6afeb6906e..693f0d81c6b 100644
--- a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
+++ b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
@@ -72,7 +72,7 @@
   !python {model: crm.meeting}: |
      from base_calendar import base_calendar
      base_cal_id = base_calendar.real_id2base_calendar_id(ref('crm_meeting_sprintreview0'), '2011-09-01 13:01:00')
-     self.write(cr, uid, [base_cal_id], {'name': 'Sprint Review for google modules', 'edit_all': True})
+     self.write(cr, uid, [base_cal_id], {'name': 'Sprint Review for google modules'})
 -
   I check whether all the records are edited or not.
 -
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index f5969b6e309..0f78103a187 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Base Contact',
+    'name': 'Contacts Management',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Customer Relationship Management',
     'complexity': "expert",
     'description': """
 This module allows you to manage your contacts entirely.
diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv
index 16cfad100a3..a44b5450a54 100644
--- a/addons/base_contact/security/ir.model.access.csv
+++ b/addons/base_contact/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1
-"access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1
-"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0
-"access_res_partner_job_all","res.partner.job all","model_res_partner_job","base.group_user",1,0,0,0
-"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0
-"access_res_partner_job_salesman","res.partner.job.salesman","model_res_partner_job","base.group_sale_salesman",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_partner_contact,res.partner.contact,model_res_partner_contact,base.group_partner_manager,1,1,1,1
+access_res_partner_job,res.partner.job,model_res_partner_job,base.group_partner_manager,1,1,1,1
+access_res_partner_contact_all,res.partner.contact all,model_res_partner_contact,base.group_user,1,0,0,0
+access_res_partner_job_all,res.partner.job all,model_res_partner_job,base.group_user,1,0,0,0
+access_group_sale_salesman,res.partner.contact.sale.salesman,model_res_partner_contact,base.group_sale_salesman,1,1,1,0
+access_res_partner_job_salesman,res.partner.job.salesman,model_res_partner_job,base.group_sale_salesman,1,1,1,0
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 2692e63e55d..bf9162601b1 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index 67eebfb18bb..cd1f263dc5d 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-15 10:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:08+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -152,7 +152,7 @@ msgstr "Objecto de Teste"
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr "Gravar Relatório"
+msgstr "Guardar relatório"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/module_quality_check.py:46
diff --git a/addons/base_module_quality/security/ir.model.access.csv b/addons/base_module_quality/security/ir.model.access.csv
index 74b88054c40..b5e5d53addb 100644
--- a/addons/base_module_quality/security/ir.model.access.csv
+++ b/addons/base_module_quality/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_module_quality_check","module.quality.check","model_module_quality_check",1,1,1,1
-"access_module_quality_detail","module.quality.detail","model_module_quality_detail",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_module_quality_check,module.quality.check,model_module_quality_check,,1,1,1,1
+access_module_quality_detail,module.quality.detail,model_module_quality_detail,,1,1,1,1
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index fdb576e0ddd..b2a93258d5d 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Module Record',
+    'name': 'Record and Create Modules',
     'version': '1.0',
     'category': 'Tools',
     'description': """
diff --git a/addons/base_module_record/security/ir.model.access.csv b/addons/base_module_record/security/ir.model.access.csv
index fa68571a916..894312eae88 100644
--- a/addons/base_module_record/security/ir.model.access.csv
+++ b/addons/base_module_record/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_ir_module_record,ir.module.record,model_ir_module_record,base.group_system,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_module_record,ir.module.record,model_ir_module_record,base.group_system,1,1,1,1
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 5e8bed72d03..632d1d306f6 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Query Builder',
     'version': '1.0',
-    'category': 'Advanced Reporting',
+    'category': 'Reporting',
     'complexity': "expert",
     'description': """
 This module allows you to create any statistic report on several objects.
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index c9e78315b67..a096efd3b18 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
-"access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
-"access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
-"access_base_report_creator_report_result","base_report_creator.report.result","model_base_report_creator_report_result","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_report_creator_report,base_report_creator.report,model_base_report_creator_report,base.group_system,1,1,1,1
+access_base_report_creator_report_fields,base_report_creator.report.fields,model_base_report_creator_report_fields,base.group_system,1,1,1,1
+access_base_report_creator_report_filter,base_report_creator.report.filter,model_base_report_creator_report_filter,base.group_system,1,1,1,1
+access_base_report_creator_report_result,base_report_creator.report.result,model_base_report_creator_report_result,base.group_system,1,1,1,1
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index a95235d8017..0f3d5f72263 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'OpenOffice Report Designer',
     'version': '0.1',
-    'category': 'Advanced Reporting',
+    'category': 'Reporting',
     'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index bd62a097934..24d665a2cf6 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Initial Setup Tools',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
diff --git a/addons/base_setup/security/ir.model.access.csv b/addons/base_setup/security/ir.model.access.csv
index 97dd8b917b8..4a08a4aa60d 100644
--- a/addons/base_setup/security/ir.model.access.csv
+++ b/addons/base_setup/security/ir.model.access.csv
@@ -1 +1 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/base_synchro/security/ir.model.access.csv b/addons/base_synchro/security/ir.model.access.csv
index fa0f00e8ccd..bf69c931523 100644
--- a/addons/base_synchro/security/ir.model.access.csv
+++ b/addons/base_synchro/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"base_synchro_server","base.synchro.server","model_base_synchro_server","base.group_system",1,1,1,1
-" base_synchro_obj"," base.synchro.obj","model_base_synchro_obj","base.group_system",1,1,1,1
-"base_synchro_obj_avoid","base.synchro.obj.avoid","model_base_synchro_obj_avoid","base.group_system",1,1,1,1
-"base_synchro_obj_line","base.synchro.obj.line","model_base_synchro_obj_line","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+base_synchro_server,base.synchro.server,model_base_synchro_server,base.group_system,1,1,1,1
+ base_synchro_obj, base.synchro.obj,model_base_synchro_obj,base.group_system,1,1,1,1
+base_synchro_obj_avoid,base.synchro.obj.avoid,model_base_synchro_obj_avoid,base.group_system,1,1,1,1
+base_synchro_obj_line,base.synchro.obj.line,model_base_synchro_obj_line,base.group_system,1,1,1,1
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index d3c8a4716e0..d2cd2aad742 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -4,7 +4,7 @@
     "author": "OpenERP SA",
     "version": "1.0",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     'complexity': "easy",
     'description': """
 Common base for tools modules.
diff --git a/addons/base_tools/i18n/pt.po b/addons/base_tools/i18n/pt.po
index 69b6b9c4459..badfa6acc16 100644
--- a/addons/base_tools/i18n/pt.po
+++ b/addons/base_tools/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-17 12:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-10 12:08+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 858b5c2c070..f7d9c572447 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 VAT validation for Partners' VAT numbers
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index afb8cc42a95..e0f554bb1ec 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Dashboards',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "normal",
     'description': """
 Lets the user create a custom dashboard.
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index c43b2cd9602..c5a51795425 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -139,7 +139,6 @@
                     <board style="2-1">
                         <column>
                             <action name="%(board_config_overview)d" string="Configuration Overview"/>
-                            <action name="%(action_latest_activities_tree)d" string="Latest Activities" />
                         </column>
                         <column>
                             <action name="%(action_user_connection_tree)d" string="Users" />
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 34bc2169016..2275cc7d47d 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_board_board all","board.board","model_board_board",,1,0,0,0
-"access_board_board_line all","board.board.line","model_board_board_line",,1,0,0,0
-"access_board_board system","board.board system","model_board_board",base.group_system,1,1,1,1
-"access_board_board_line system","board.board.line system","model_board_board_line",base.group_system,1,1,1,1
-"access_res_log_report all","res.log.report","model_res_log_report",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_board_board all,board.board,model_board_board,,1,0,0,0
+access_board_board_line all,board.board.line,model_board_board_line,,1,0,0,0
+access_board_board system,board.board system,model_board_board,base.group_system,1,1,1,1
+access_board_board_line system,board.board.line system,model_board_board_line,base.group_system,1,1,1,1
+access_res_log_report all,res.log.report,model_res_log_report,,1,0,0,0
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index edf852e4d5e..ef691e39564 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -49,7 +49,7 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    'category': 'Tools', 
+    'category': 'Hidden/Dependency', 
     "author" : "OpenERP SA",
     'website': 'http://www.openerp.com',
     "init_xml" : ["caldav_data.xml"],
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index ce3f3c90e32..34fbdcc0b02 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_basic_calendar_lines","basic.calendar.lines","model_basic_calendar_lines","base.group_user",1,1,1,1
-"access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
-"access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
-"access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
-"access_basic_calendar_alias","basic.calendar.alias","model_basic_calendar_alias","base.group_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_basic_calendar_lines,basic.calendar.lines,model_basic_calendar_lines,base.group_user,1,1,1,1
+access_basic_calendar_attributes,basic.calendar.attributes,model_basic_calendar_attributes,base.group_user,1,1,1,1
+access_basic_calendar_fields,basic.calendar.fields,model_basic_calendar_fields,base.group_user,1,1,1,1
+access_basic_calendar,basic.calendar,model_basic_calendar,base.group_user,1,1,1,1
+access_basic_calendar_alias,basic.calendar.alias,model_basic_calendar_alias,base.group_user,1,1,1,1
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 178da7d1913..023b5fd5700 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -18,10 +18,10 @@
 #
 ##############################################################################
 {
-    "name" : "Claim from Delivery",
+    "name" : "Claim on Deliveries",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    'category': 'Sales Management',
+    "category" : "Warehouse Management",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 29a1f6107b3..83b0354912a 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Customer Relationship Management',
+    'name': 'CRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 3418dc99423..5d64bf20093 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -83,54 +83,30 @@
             <field name="act_window_id" ref="act_my_oppor"/>
         </record>
 
-          <record model="ir.actions.act_window" id="act_my_meetings">
-               <field name="name">My Meetings</field>
-               <field name="res_model">crm.meeting</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-               <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
-               <field name="context">{'default_user_id': uid}</field>
-          </record>
-
           <record model="ir.actions.act_window" id="act_my_oppor_stage">
                <field name="name">Planned Revenue By Stage</field>
                <field name="res_model">crm.lead.report</field>
                <field name="view_type">form</field>
                <field name="view_mode">graph,tree,form</field>
                <field name="view_id" ref="view_report_crm_oppor_graph"/>
-               <field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'),  ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+               <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
                <field name="context">{'search_default_Stage':1}</field>
           </record>
 
-          <record model="ir.actions.act_window" id="act_sales_pipeline">
-               <field name="name">My Win/Lost Ratio for The Last Year</field>
-               <field name="res_model">crm.lead.report</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">graph,tree,form</field>
-               <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-               <field name="domain">['&amp;', ('user_id', '=', uid),'&amp;', ('state', '=', 'done') , '&amp;', ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')]</field>
-          </record>
-
           <record model="ir.ui.view" id="board_crm_form">
                <field name="name">Sales Dashboard Form</field>
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
                     <form string="Sales Dashboard">
-                         <board style="1-1">
+                         <board style="2-1">
                             <column>
-                                <action string="My Open Opportunities"
+                                <action string="My Opportunities"
                                     name="%(act_my_oppor)d" creatable="true"/>
-                                <action
-                                    string="My Meetings"
-                                    name="%(act_my_meetings)d" creatable="true"/>
                             </column>
                             <column>
                                 <action string="My Planned Revenues by Stage"
                                     name="%(act_my_oppor_stage)d"/>
-                                <action string="My Win/Lost Ratio"
-                                    name="%(act_sales_pipeline)d"/>
                             </column>
                     </board>
                 </form>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 49272c97576..216a898bc88 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -748,10 +748,11 @@ class crm_lead(crm_case, osv.osv):
         self.write(cr, uid, [res_id], vals, context)
         return res_id
 
-    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-
+        if vals == None:
+            vals = {}
         super(crm_lead, self).message_update(cr, uid, ids, msg, context=context)
 
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index d0197fd82cd..2ec2db18509 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -31,7 +31,6 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 19ca9266332..338579af88f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -51,7 +51,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id, 'virtual_id' : True}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
         <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.
         </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ad2c31f7b12..c04e00e5fcc 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -45,7 +45,6 @@
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                            <field name="recurrency"/>
-                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -67,7 +66,7 @@
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
+                            <field name="class" string="Privacy" groups="base.group_extended"/>
                             <field name="show_as" string="Show time as" groups="base.group_extended"/>
                             <field name="rrule" invisible="1" readonly="1"/>
                             <field name="recurrent_id" invisible="1"/>
@@ -231,24 +230,11 @@
             <tree string="Meetings"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
-                <field name="date" string="Start Date" />
+                <field name="user_id"/>
+                <field name="date"/>
                 <field name="duration" />
                 <field name="partner_id" string="Partner" />
                 <field name="location" />
-                <field name="categ_id" string="Meeting Type"/>
-                <field name="class" string="Privacy"/>
-                <field name="state" groups="base.group_extended"/>
-                <field name="user_id" invisible="1"/>
-                <field name="show_as" invisible="1" string="Show time as"/>
-                <button name="case_reset" string="Reset to Unconfirmed"
-                   states="open,done" type="object"
-                   icon="gtk-convert" />
-                <button name="case_open" string="Confirm"
-                   states="draft" type="object"
-                   icon="gtk-go-forward" />
-                <button name="case_close" string="Done"
-                            states="open" type="object"
-                            icon="gtk-jump-to" />
             </tree>
         </field>
     </record>
@@ -295,7 +281,7 @@
                 <search string="Search Meetings">
                        <group>
                            <field name="name" string="Meeting / Partner"
-                                domain="[('name','ilike',self), ('partner_id','ilike', self)]"/>
+                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
                            <field name="user_id" groups="base.group_extended">
                                <filter icon="terp-personal" groups="base.group_extended"
                                    domain="[('user_id','=',uid)]"
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8ac32086cfd..3ee9c9e242f 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -40,6 +40,13 @@
     <record model="ir.ui.menu" id="base.menu_base_config">
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
-    
+
+    <record id="crm_meeting_global" model="ir.rule">
+        <field name="name">Hide Private Meetings</field>
+        <field ref="model_crm_meeting" name="model_id"/>
+        <field eval="1" name="global"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 4ea07252276..c893ed6aad7 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,48 +1,45 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","base.group_sale_salesman",1,0,0,0
-"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
-"access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
-"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
-"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0
-"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1
-"access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
-"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
-"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,0
-"access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
-"access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
-"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
-"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
-"access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
-"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
-"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
-"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","base.group_sale_salesman",1,0,0,0
-"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","base.group_sale_manager",1,1,1,1
-"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
-"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
-"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
-"mail_mail_message_manager","mail.message.manager","mail.model_mail_message","base.group_sale_manager",1,0,0,0
-"mail_thread_manager","mail.thread.manager","mail.model_mail_thread","base.group_sale_manager",1,1,1,1
-"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
-"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
-"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
-"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
-"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
-"mail_mailgate_thread","mail.thread","mail.model_mail_thread","base.group_sale_salesman",1,1,1,1
-"mail_gateway_mail_message_user","mail.message.user","mail.model_mail_message","base.group_sale_salesman",1,1,1,1
-"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
-"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
-"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
-"access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
-"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,0,0,0
-"access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1
-"access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_segmentation_user,crm.segmentation user,model_crm_segmentation,base.group_sale_salesman,1,0,0,0
+access_crm_segmentation_line_user,crm.segmentation.line user,model_crm_segmentation_line,base.group_sale_salesman,1,0,0,0
+access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_manager,1,1,1,1
+access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1
+access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0
+access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
+access_crm_case_section,crm.case.section,model_crm_case_section,base.group_sale_salesman,1,1,1,0
+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
+access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
+access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
+access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
+access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
+access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
+access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
+access_crm_lead.all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
+access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
+access_crm_phonecall.all,crm.phonecall.all,model_crm_phonecall,base.group_user,1,0,0,0
+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
+access_crm_case_stage,crm.case.stage,model_crm_case_stage,base.group_user,1,0,0,0
+access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
+access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0
+access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_case_resource_type,base.group_sale_manager,1,1,1,1
+access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0
+access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1
+access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0
+access_res_partner_address_manager,res.partner.address.crm.user.manager,base.model_res_partner_address,base.group_sale_manager,1,0,0,0
+access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0
+mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0
+access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0
+access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1
+access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
+access_res_partner_address,res.partner.address.crm.user,base.model_res_partner_address,base.group_sale_salesman,1,1,1,0
+access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
+mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
+mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1
+access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
+access_base_action_rule_manager,base.action.rule manager,model_base_action_rule,base.group_sale_manager,1,1,1,1
+access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
+access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
+access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
+access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
+access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index a45c87b1a6f..630f9a7e889 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -21,8 +21,6 @@
 
 from osv import osv, fields
 from tools.translate import _
-import pprint
-pp = pprint.PrettyPrinter(indent=4)
 
 import time
 
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 8f1812862c5..0cbf6e172cd 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,7 +22,7 @@
 
 
 {
-    'name': 'Calendar Synchronizing',
+    'name': 'Meetings Synchronization',
     'version': '1.1',
     'category': 'Customer Relationship Management',
     'complexity': "normal",
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 8c21fee5de0..7949ea48376 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Claims',
+    'name': 'Claims Management',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
@@ -52,7 +52,6 @@ automatically new claims based on incoming emails.
              'test/ui/claim_demo.yml'
              ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00612027414703404749',
     'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index b23ef97b7fd..5a05fbd4d87 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,1,1,1
-"access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
-"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
-"access_crm_claim_partner_manager","crm.claim.partner.manager","model_crm_claim","base.group_partner_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_claim_manager,crm.claim.manager,model_crm_claim,base.group_sale_manager,1,1,1,1
+access_crm_claim_user,crm.claim.user,model_crm_claim,base.group_sale_salesman,1,1,1,0
+access_crm_claim_report_manager,crm.claim.report.manager,model_crm_claim_report,base.group_sale_manager,1,1,1,1
+access_crm_claim_partner_manager,crm.claim.partner.manager,model_crm_claim,base.group_partner_manager,1,0,0,0
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index d5f97c26647..993b3dc6434 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -53,7 +53,6 @@ fund status.
     ],
     'test': ['test/process/fund-rising.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00871545204231528989',
     'images': ['images/fundraising_analysis.jpeg','images/fundraising_categories.jpeg','images/funds.jpeg'],
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index 703c899c096..00913e326c4 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","base.group_sale_manager",1,1,1,1
-"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
-"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
-"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_fundraising_manager,crm.fundraising.manager,model_crm_fundraising,base.group_sale_manager,1,1,1,1
+access_crm_fundraising_user,crm.fundraising.user,model_crm_fundraising,base.group_sale_salesman,1,1,1,0
+access_crm_fundraising_report_user,crm.fundraising.report.user,model_crm_fundraising_report,base.group_sale_salesman,1,0,0,0
+access_crm_fundraising_report_manager,crm.fundraising.report.manager,model_crm_fundraising_report,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 01abdef2147..2adf7d26dcc 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -51,7 +51,6 @@ and categorize your interventions with a channel and a priority level.
     ],
     'test': ['test/process/help-desk.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00830691522781519309',
     'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'],
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index 2a0d8785122..1897f2a6ac9 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,1,1,1
-"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,0
-"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_helpdesk_manager,crm.helpdesk.manager,model_crm_helpdesk,base.group_sale_manager,1,1,1,1
+access_crm_helpdesk_user,crm.helpdesk.user,model_crm_helpdesk,base.group_sale_salesman,1,1,1,0
+access_report_crm_helpdesk_manager,report.crm.helpdesk.manager,model_crm_helpdesk_report,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 60a51c1a0b9..94f2f622a64 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Partner Geo-Localization',
+    'name': 'Partners Geo-Localization',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Customer Relationship Management',
     'complexity': "normal",
     'description': """
 This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index b5bb64ad3dd..e4067a69aed 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ crm_lead_report_assign","crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
-"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
-"access_crm_partner_report","crm.partner.report.assign.all","model_crm_partner_report_assign","base.group_sale_salesman",1,0,0,0
-"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
-"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ crm_lead_report_assign,crm.lead.report.assign,model_crm_lead_report_assign,base.group_sale_salesman,1,1,1,0
+access_ crm_lead_report_assign_all,crm.lead.report.assign.all,model_crm_lead_report_assign,base.group_user,1,0,0,0
+access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report_assign,base.group_sale_salesman,1,0,0,0
+access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0
+access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 1d8f9f7ee79..19f5615ee78 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Profiling Tools',
+    'name': 'Customer Profiling',
     'version': '1.3',
     'category': 'Marketing',
     'complexity': "easy",
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index 43e1528fddb..24fd7009c6a 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_answer_salesman","crm_profiling.answer.salesman","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_answer_manager","crm_profiling.answer.manager","model_crm_profiling_answer","base.group_sale_manager",1,1,1,1
-"access_crm_profiling_question_salesman","crm_profiling.question.salesman","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_question_manager","crm_profiling.question.manager","model_crm_profiling_question","base.group_sale_manager",1,1,1,1
-"access_crm_profiling_questionnarie_salesman","crm_profiling.questionnarie.salesman","model_crm_profiling_questionnaire","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie.manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_profiling_answer_salesman,crm_profiling.answer.salesman,model_crm_profiling_answer,base.group_sale_salesman,1,1,1,0
+access_crm_profiling_answer_manager,crm_profiling.answer.manager,model_crm_profiling_answer,base.group_sale_manager,1,1,1,1
+access_crm_profiling_question_salesman,crm_profiling.question.salesman,model_crm_profiling_question,base.group_sale_salesman,1,1,1,0
+access_crm_profiling_question_manager,crm_profiling.question.manager,model_crm_profiling_question,base.group_sale_manager,1,1,1,1
+access_crm_profiling_questionnarie_salesman,crm_profiling.questionnarie.salesman,model_crm_profiling_questionnaire,base.group_sale_salesman,1,1,1,0
+access_crm_profiling_questionnarie_manager,crm_profiling.questionnarie.manager,model_crm_profiling_questionnaire,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 01f66160b0b..d3d205ec9c0 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'CRM Todo Lists',
+    'name': 'Tasks on CRM',
     'version': '1.0',
-    "category": 'Hidden/Link',
+    "category": 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 Todo list for CRM leads and opportunities.
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 303d42558b3..0aafef9fe1f 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -30,7 +30,7 @@ The decimal precision is configured per company.
     "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     'complexity': "easy",
     "init_xml": [],
     "update_xml": [
diff --git a/addons/decimal_precision/security/ir.model.access.csv b/addons/decimal_precision/security/ir.model.access.csv
index d53a5fef141..aa203eae141 100644
--- a/addons/decimal_precision/security/ir.model.access.csv
+++ b/addons/decimal_precision/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_decimal_precision_config","decimal.precision configuration","model_decimal_precision",base.group_system,1,1,1,1
-"access_decimal_precision_all","decimal.precision","model_decimal_precision",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_decimal_precision_config,decimal.precision configuration,model_decimal_precision,base.group_system,1,1,1,1
+access_decimal_precision_all,decimal.precision,model_decimal_precision,,1,0,0,0
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 52e60995519..7403b55f618 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_delivery_carrier","delivery.carrier","model_delivery_carrier","base.group_sale_salesman",1,0,0,0
-"access_delivery_grid","delivery.grid","model_delivery_grid","base.group_sale_salesman",1,0,0,0
-"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","base.group_sale_salesman",1,0,0,0
-"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","base.group_sale_manager",1,1,1,1
-"access_delivery_grid_manager","delivery.grid","model_delivery_grid","base.group_sale_manager",1,1,1,1
-"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","base.group_sale_manager",1,1,1,1
-"access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_delivery_carrier,delivery.carrier,model_delivery_carrier,base.group_sale_salesman,1,0,0,0
+access_delivery_grid,delivery.grid,model_delivery_grid,base.group_sale_salesman,1,0,0,0
+access_delivery_grid_line,delivery.grid.line,model_delivery_grid_line,base.group_sale_salesman,1,0,0,0
+access_delivery_carrier_manager,delivery.carrier,model_delivery_carrier,base.group_sale_manager,1,1,1,1
+access_delivery_grid_manager,delivery.grid,model_delivery_grid,base.group_sale_manager,1,1,1,1
+access_delivery_grid_line_manager,delivery.grid.line,model_delivery_grid_line,base.group_sale_manager,1,1,1,1
+access_delivery_carrier_partner_manager,delivery.carrier partner_manager,model_delivery_carrier,base.group_partner_manager,1,0,0,0
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 6b9cbd21f48..0a403dcaa35 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Integrated Document Management System',
+    'name': 'Document Management System',
     'version': '2.1',
     'category': 'Knowledge Management',
     'complexity': "normal",
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 471b2966be5..e3b1b4c9c64 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -7,22 +7,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <board style="1-1" >
+                     <board style="2-1" >
                         <column>
                             <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
-                            <action string="File Size by Month"
-                                name="%(document.action_view_size_month)d"
-                                view_mode="graph,tree"/>
                         </column>
                         <column>
-                            <action string="Files by Resource Type"
-                                name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>
-
-                            <action string="Files by Partner"
-                                name="%(document.action_view_files_by_partner)d"
+                            <action string="File Size by Month"
+                                name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
                         </column>
                      </board>
@@ -65,7 +58,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <board style="1-1">
+                     <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
                                 name="%(document.action_view_wall)d"
diff --git a/addons/document/document.py b/addons/document/document.py
index 36b10b34e4b..9ea7f97a321 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -132,7 +132,7 @@ class document_file(osv.osv):
         # fields used for file storage
         'store_fname': fields.char('Stored Filename', size=200),
     }
-    _order = "create_date desc"
+    _order = "id desc"
 
     def __get_def_directory(self, cr, uid, context=None):
         dirobj = self.pool.get('document.directory')
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e7fa4efb5be..e6e1847cd56 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -120,14 +120,6 @@
         </record>
 
 
-        <record model="ir.actions.act_window" id="action_view_document_by_resourcetype_graph">
-            <field name="name">Files by Resource Type</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_document_by_resourcetype_graph"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-
 <!--***************************************************************************************-->
 
     <record model="ir.ui.view" id="view_size_month">
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index d840055e89a..36f0aa86dff 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -1,25 +1,25 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
-"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
-"access_document_directory_group_knowledge","document.directory modify","model_document_directory","base.group_document_user",1,1,1,1
-"access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
-"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
-"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
-"access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
-"access_document_storage_group_user","document.storage group user","model_document_storage","base.group_document_user",1,1,1,1
-"access_ir_attachment_group_user","ir.attachment user","base.model_ir_attachment","base.group_document_user",1,1,1,1
-"access_ir_attachment_group_system","ir.attachment system","base.model_ir_attachment","base.group_system",1,0,0,0
-"access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,0
-"access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
-"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_files_partner_group_document","report.files.partner document manager","model_report_files_partner","base.group_document_user",1,0,0,0
-"access_report_document_file_group_document","report.document.file document manager","model_report_document_file","base.group_document_user",1,0,0,0
-"access_report_document_wall_group_document","report.document.wall document manager","model_report_document_wall","base.group_document_user",1,0,0,0
-"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_document_directory_all,document.directory all,model_document_directory,,1,0,0,0
+access_document_directory_group_document_manager,document.directory document manager,model_document_directory,base.group_system,1,1,1,1
+access_document_directory_group_knowledge,document.directory modify,model_document_directory,base.group_document_user,1,1,1,1
+access_document_directory_content_all,document.directory.content all,model_document_directory_content,,1,0,0,0
+access_document_directory_content_group_document_manager,document.directory.content document manager,model_document_directory_content,base.group_system,1,1,1,1
+access_document_directory_content_type_group_document_manager,document.directory.content.type document manager,model_document_directory_content_type,base.group_system,1,1,1,1
+access_document_directory_content_type_group_system,document.directory.content.type group system,model_document_directory_content_type,base.group_user,1,0,0,0
+access_document_storage_group_document_manager,document.storage document manager,model_document_storage,base.group_system,1,1,1,1
+access_document_storage_group_system,document.storage group system,model_document_storage,base.group_user,1,0,0,0
+access_document_storage_group_user,document.storage group user,model_document_storage,base.group_document_user,1,1,1,1
+access_ir_attachment_group_user,ir.attachment user,base.model_ir_attachment,base.group_document_user,1,1,1,1
+access_ir_attachment_group_system,ir.attachment system,base.model_ir_attachment,base.group_system,1,0,0,0
+access_res_partner_group_user,res.partner user,base.model_res_partner,base.group_document_user,1,1,1,0
+access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0
+access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1
+access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0
+access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0
+access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0
+access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0
+access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0
+access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0
+access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0
+access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0
+access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index a7b5a65e227..499a928c077 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -49,7 +49,6 @@ FTP client.
     ],
     'installable': True,
     'active': False,
-    'application': True,
     'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
     'post_load': 'post_load',
diff --git a/addons/document_ftp/security/ir.model.access.csv b/addons/document_ftp/security/ir.model.access.csv
index 0a6c192eb56..4a08a4aa60d 100644
--- a/addons/document_ftp/security/ir.model.access.csv
+++ b/addons/document_ftp/security/ir.model.access.csv
@@ -1,2 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 679a6adabb6..115f5250cde 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'iCal Support',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 Allows to synchronise calendars with others applications.
diff --git a/addons/document_ics/security/ir.model.access.csv b/addons/document_ics/security/ir.model.access.csv
index a89c5b296a7..73da3a1aaac 100644
--- a/addons/document_ics/security/ir.model.access.csv
+++ b/addons/document_ics/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_document_directory_ics_fields_all","document.directory.ics.fields all","model_document_directory_ics_fields",,1,0,0,0
-"access_document_directory_ics_fields_manager","document.directory.ics.fields group system","model_document_directory_ics_fields","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_document_directory_ics_fields_all,document.directory.ics.fields all,model_document_directory_ics_fields,,1,0,0,0
+access_document_directory_ics_fields_manager,document.directory.ics.fields group system,model_document_directory_ics_fields,base.group_system,1,1,1,1
diff --git a/addons/document_webdav/security/ir.model.access.csv b/addons/document_webdav/security/ir.model.access.csv
index 987f7a4f90a..fa81bcee2e2 100644
--- a/addons/document_webdav/security/ir.model.access.csv
+++ b/addons/document_webdav/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_webdav_dir_property_all","webdav.dir.property all","model_document_webdav_dir_property",,1,0,0,0
-"access_webdav_dir_property_group_doc_manager","webdav.dir.property document manager","model_document_webdav_dir_property","base.group_system",1,1,1,1
-"access_webdav_dir_property_group_system","webdav.dir.property group system","model_document_webdav_dir_property","base.group_system",1,1,1,1
-"access_webdav_file_property_all","webdav.file.property all","model_document_webdav_file_property",,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_webdav_dir_property_all,webdav.dir.property all,model_document_webdav_dir_property,,1,0,0,0
+access_webdav_dir_property_group_doc_manager,webdav.dir.property document manager,model_document_webdav_dir_property,base.group_system,1,1,1,1
+access_webdav_dir_property_group_system,webdav.dir.property group system,model_document_webdav_dir_property,base.group_system,1,1,1,1
+access_webdav_file_property_all,webdav.file.property all,model_document_webdav_file_property,,1,1,1,1
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index 4d96780b10c..07b189e501d 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -37,6 +37,7 @@ technical OpenERP documentation at http://doc.openerp.com
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
+    'icon': '/edi/static/src/img/knowledge.png',
     'data': [
         'security/ir.model.access.csv',
     ],
diff --git a/addons/edi/security/ir.model.access.csv b/addons/edi/security/ir.model.access.csv
index f1942397ac5..b1f470d80ae 100644
--- a/addons/edi/security/ir.model.access.csv
+++ b/addons/edi/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_edi_all_read","access_ir_edi_all_read","model_edi_document",,1,0,0,0
-"access_ir_edi_employee_create","access_ir_edi_employee_create","model_edi_document","base.group_user",1,0,1,0
-\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_edi_all_read,access_ir_edi_all_read,model_edi_document,,1,0,0,0
+access_ir_edi_employee_create,access_ir_edi_employee_create,model_edi_document,base.group_user,1,0,1,0
diff --git a/addons/edi/static/src/img/knowledge.png b/addons/edi/static/src/img/knowledge.png
new file mode 100644
index 00000000000..35c8d5706fd
--- /dev/null
+++ b/addons/edi/static/src/img/knowledge.png
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 2ab7f194d18..9aca39f56e8 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,9 +21,9 @@
 ##############################################################################
 
 {
-    "name" : "Automated E-Mails",
+    "name" : "E-Mail Templates",
     "version" : "1.1",
-    "author" : "Openlabs",
+    "author" : "OpenERP,OpenLabs",
     "website" : "http://openerp.com",
     "category" : "Marketing",
     'complexity': "expert",
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index 3903a95f9ce..d2d6adf3bf3 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template","email.template","model_email_template",,1,0,0,0
-"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
-"access_email_template_manager","email.template","model_email_template",,1,1,1,1
-"access_email_template_preview_system","email.template.preview system","model_email_template_preview","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_email_template,email.template,model_email_template,,1,0,0,0
+access_email_template_system,email.template system,model_email_template,base.group_system,1,1,1,1
+access_email_template_manager,email.template,model_email_template,,1,1,1,1
+access_email_template_preview_system,email.template.preview system,model_email_template_preview,base.group_system,1,1,1,1
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index abd3f6393b5..465e01cdda3 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -56,7 +56,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/test_event.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate': '0083059161581',
     'images': ['images/1_event_type_list.jpeg','images/2_events.jpeg','images/3_registrations.jpeg'],
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 47c5e65f196..02d45f03dc1 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -40,7 +40,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Association Dashboard">
-                    <board style="1-1">
+                    <board style="2-1">
                         <column>
                             <action string="Next Events"
                                 name="%(act_event_view)d"
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 59651dfa007..f79d141f148 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,16 +1,15 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","marketing.group_marketing_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
-"access_event_event_manager","event.event manager","model_event_event","marketing.group_marketing_manager",1,0,0,0
-"access_event_registration_manager","event.registration manager","model_event_registration","marketing.group_marketing_manager",1,0,0,0
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","marketing.group_marketing_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","marketing.group_marketing_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_manager",1,1,1,1
-"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","marketing.group_marketing_manager",1,1,1,1
-"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
-"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","marketing.group_marketing_manager",1,0,0,0
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
-"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_type,event.type,model_event_type,marketing.group_marketing_user,1,0,0,0
+access_event_type_manager,event.type manager,model_event_type,marketing.group_marketing_manager,1,1,1,1
+access_event_event,event.event,model_event_event,marketing.group_marketing_user,1,1,1,0
+access_event_registration,event.registration,model_event_registration,marketing.group_marketing_user,1,1,1,0
+access_report_event_registration,report.event.registration,model_report_event_registration,marketing.group_marketing_user,1,1,1,1
+access_event_event_manager,event.event manager,model_event_event,marketing.group_marketing_manager,1,0,0,0
+access_event_registration_manager,event.registration manager,model_event_registration,marketing.group_marketing_manager,1,0,0,0
+access_crm_case_section_manager,crm.case.section manager,crm.model_crm_case_section,marketing.group_marketing_manager,1,1,1,1
+access_product_product,product.product.product manager,product.model_product_product,marketing.group_marketing_manager,1,1,1,1
+access_event_registration_badge_manager,event.registration.badge manager,model_event_registration_badge,marketing.group_marketing_manager,1,1,1,1
+access_event_event_sale_salesman,event.event.sale,model_event_event,base.group_sale_salesman,1,0,0,0
+access_account_account_invoice_manager,account.account.invoice,account.model_account_invoice,marketing.group_marketing_manager,1,0,0,0
+access_event_registration_badge,event.registration.badge,model_event_registration_badge,marketing.group_marketing_user,1,0,0,0
+access_event_registration_sale_user,event.registration.sale.user,model_event_registration,base.group_sale_salesman,1,0,0,0
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index b50c33b2394..99e3e02a909 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    "name" : "Fetch Emails",
+    "name" : "Email Gateway",
     "version" : "1.0",
     "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
-    "category": 'Customer Relationship Management',
+    "category": 'Tools',
     "description": """
 Retrieve incoming email on POP / IMAP servers
 =============================================
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index bc5572de82d..7deea6eb9f4 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_fetchmail_server","fetchmail.server","model_fetchmail_server",,1,0,0,0
-"access_fetchmail_server","fetchmail.server","model_fetchmail_server","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fetchmail_server,fetchmail.server,model_fetchmail_server,,1,0,0,0
+access_fetchmail_server,fetchmail.server,model_fetchmail_server,base.group_system,1,1,1,1
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
index 24eddf235ab..5b02f4194ab 100644
--- a/addons/fetchmail_crm/__openerp__.py
+++ b/addons/fetchmail_crm/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden/Links',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
index 4fdd1671a28..d6d56ecf331 100644
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ b/addons/fetchmail_crm_claim/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm_claim"],
     "author" : "OpenERP SA",
-    'category': 'Sales Management',
+    'category': 'Hidden/Links',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py
index 77d5cb93585..3ce76226888 100644
--- a/addons/fetchmail_hr_recruitment/__openerp__.py
+++ b/addons/fetchmail_hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "hr_recruitment"],
     "author" : "OpenERP SA",
-    "category": "Human Resources",
+    "category": "Hidden/Links",
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
index 043a68def62..d4c4b4bbe70 100644
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ b/addons/fetchmail_project_issue/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "project_issue"],
     "author" : "OpenERP SA",
-    "category": "Project Management",
+    "category": "Hidden/Links",
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index ed5700b3116..ec204f0f77c 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -36,6 +36,5 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index f8001c918c6..f2f9ff4e668 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Google Maps on Customers',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Customer Relationship Management',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 900c689dfbf..254bb2c28bf 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Human Resources",
+    "name": "Employee Address Book",
     "version": "1.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
@@ -54,7 +54,10 @@ You can manage:
         'hr_demo.xml',
         'hr_department_demo.xml',
     ],
-    'test': ['test/test_hr.yml'],
+    'test': [
+             'test/open2recruit2close_job.yml',
+             'test/hr_demo.yml',
+             ],
     'installable': True,
     'active': False,
     'certificate': '0086710558965',
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 975ed7d4071..2911a49bf53 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_emp","hr.employee.category.emp","model_hr_employee_category","base.group_user",1,0,0,0
-"access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
-"access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
-"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_ir_property_hr_user","ir_property hr_user","base.model_ir_property","base.group_hr_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_employee_category_user,hr.employee.category.user,model_hr_employee_category,base.group_hr_user,1,1,1,1
+access_hr_employee_category_emp,hr.employee.category.emp,model_hr_employee_category,base.group_user,1,0,0,0
+access_hr_employee_user,hr.employee user,model_hr_employee,base.group_hr_user,1,1,1,1
+access_hr_employee_system_user,hr.employee system user,model_hr_employee,base.group_user,1,0,0,0
+access_hr_employee_resource_user,resource.resource.user,resource.model_resource_resource,base.group_hr_user,1,1,1,1
+access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1
+access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0
+access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1
+access_hr_res_partner_address,res.partner.address,base.model_res_partner_address,base.group_hr_manager,1,1,1,1
+access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0
diff --git a/addons/hr/test/hr_demo.yml b/addons/hr/test/hr_demo.yml
new file mode 100644
index 00000000000..6dee06d5eb3
--- /dev/null
+++ b/addons/hr/test/hr_demo.yml
@@ -0,0 +1,10 @@
+-
+  !record {model: hr.job, id: job_jr_appli, view: False}:
+    no_of_employee: 0.0
+    no_of_recruitment: 5.0
+-
+  !record {model: hr.employee, id: employee1, view: False}:
+    address_id: base.main_address
+    company_id: base.main_company
+    department_id: dep_technical
+    user_id: base.user_demo
diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml
new file mode 100644
index 00000000000..0e618f87a3d
--- /dev/null
+++ b/addons/hr/test/open2recruit2close_job.yml
@@ -0,0 +1,38 @@
+-
+  In order to test the process of Human Resource Management, I open Job Postion for "Jr. Application Engineer".
+- 
+  !python {model: hr.job}: |
+    self.job_open(cr, uid, [ref('job_jr_appli')])
+-
+  I check state of Job Position after opening it.
+-
+  !assert {model: hr.job, id: job_jr_appli, string: Job position is in 'open' state and no_of_recruitment = 0}:
+    - state == 'open'
+    - no_of_recruitment == 0
+-
+  Now, Recruitement is started so I start recruitement of Job Postion of "Jr. Application Engineer" Profile.
+-    
+  !python {model: hr.job}: |
+    self.job_recruitement(cr, uid, [ref('job_jr_appli')])
+-
+  I check 'state' and number of 'Expected in Recruitment' after initiating the recruitment
+-
+  !assert {model: hr.job, id: job_jr_appli, string: Job position is in 'recruit' state and no_of_recruitment = 1.0}:
+    - state == 'recruit'
+    - no_of_recruitment == 1.0
+-
+  I assign the job position to a newly hired employee
+-
+  !python {model: hr.employee}: |
+    self.write(cr, uid, [ref('employee1')], {'job_id':ref('job_jr_appli')})
+-
+  Now I don't want to recruit new employee for this position. so I mark it as Old.
+-
+  !python {model: hr.job}: |
+    self.job_old(cr, uid, [ref('job_jr_appli')])
+-
+  I check 'state' and number of 'Expected in Recruitment' after closing the Job position.
+-
+  !assert {model: hr.job, id: job_jr_appli, string: Job position is in 'old' state and no_of_recruitment = 0}:
+    - state == 'old'
+    - no_of_recruitment == 0
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
deleted file mode 100644
index 0e5ae559416..00000000000
--- a/addons/hr/test/test_hr.yml
+++ /dev/null
@@ -1,140 +0,0 @@
--
-  In order to test hr module in OpenERP, I will create new Employee, Department and Job Position.
--
-  I create "RD Department" in Department form.
--
-  !record {model: hr.department, id: hr_department_rd0}:
-    manager_id: base.user_root
-    name: 'R & D'
--
-  Now, I create a new employee Mark Johnson, and select department as RD Department.
--
-  !record {model: hr.employee, id: hr_employee_mark}:
-    address_home_id: base.res_partner_address_1
-    company_id: base.main_company
-    gender: male
-    marital: 'single'
-    name: Mark Johnson
--
-  I change the company of the employee.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_company(cr, uid, [ref('hr_employee_mark')], ref('base.main_company'), None)
-    values = dict([('company_id', ref('base.main_company'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
--
-  I assign department for employee Mark Johnson.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_department_id(cr, uid, [ref('hr_employee_mark')], ref('hr_department_rd0'), None)
-    assert res['value']['parent_id']
-    values = dict([('department_id', ref('hr_department_rd0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
--
-  Now I create a user for employee Mark Johnson.
--
-  !record {model: res.users, id: hr_users_markjohnson0}:
-    context_lang: en_US
-    groups_id:
-      - base.group_user
-    login: markjohnson
-    name: Mark Johnson
-    password: markjohnson
--
-  I assign user to employee Mark Johnson.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_user(cr, uid, [ref('hr_employee_mark')], ref('hr_users_markjohnson0'), None)
-    values = dict([('user_id', ref('hr_users_markjohnson0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
--
-  In order to check the wizard Employee Hierarchy , I will create new employee Phil Graves and select Mark Johnson as
-  Manager.
--
-  !record {model: hr.employee, id: hr_employee_phil}:
-    address_home_id: base.res_partner_address_3000
-    company_id: base.main_company
-    gender: male
-    name: Phil Graves
-    user_id: base.user_demo
-    parent_id: 'hr_employee_mark'
--
-  I fill the Working address for Employee.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_address_id(cr, uid, ref('hr_employee_phil'), ref('base.res_partner_address_3000'), None)
-    assert res['value']
-    values = dict([('address_id', ref('base.res_partner_address_3000'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_phil')], values, None)
--
-  I will open up form view of  Mark Johnson and test the wizard Employee Hierarchy so it display the employee
-  hierarchy starting from Mark Johnson.
-
--
-  I will create new Job Position. I will check successful creation of new Job Position by adding the information.
--
-  !record {model: hr.job, id: hr_job_jea0}:
-    department_id: 'hr_department_rd0'
-    description: 'Position of Junior Application Engineer'
-    expected_employees: 5
-    name: 'JAE'
--
-  I check that Employee form is in "Open" state.
--
-  !assert {model: hr.job, id: hr_job_jea0}:
-    - state == 'open'
--
-  I create Employee for job position.
--
-  !record {model: hr.job, id: hr_job_jea0}:
-    employee_ids:
-      - address_home_id: base.res_partner_address_1
-        name: Manuel Lehba
-        department_id: 'hr_department_rd0'
-        gender: male
-        parent_id: 'hr_employee_mark'
--
-  I check that "Number of Employees" field have some value.
--
-  !assert {model: hr.job, id: hr_job_jea0}:
-    - no_of_employee != False
--
-  As more requirements on the said job position are come, I increase the number of expected employees.
--
-  !python {model: hr.job}: |
-    res = self.on_change_expected_employee(cr, uid, [ref('hr_job_jea0')], 6, 3, None)
-    assert res['value']['expected_employees']
-    values = dict([('expected_employees', ref('hr_job_jea0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_job_jea0')], values, None)
--
-  I open the job position for recruitment.
--
-  !python {model: hr.job}: |
-    self.job_recruitement(cr, uid, [ref('hr_job_jea0')])
--
-  I assign the job position to employee and mark the position.
--
-  !python {model: hr.job}: |
-    self.job_open(cr, uid, [ref('hr_job_jea0')])
--
-  Now the process is over so I don't want to use this position. I mark it as Old.
--
-  !python {model: hr.job}: |
-    self.job_old(cr, uid, [ref('hr_job_jea0')])
--
-  I create a parent category for the new recruited employees who are Freshers.
--
-  !record {model: hr.employee.category, id: hr_employee_category_fresher0}:
-    name: Fresher
--
-  I create another category for Junior Level freshers.
--
-  !record {model: hr.employee.category, id: hr_employee_category_juniorlevel0}:
-    name: Junior Level
-    parent_id: hr_employee_category_fresher0
--
-  I open the tree view of Categories and see the categories in a hierarchical manner.
--
-  !python {model: hr.employee.category}: |
-    res = self.name_get(cr, uid, [ref('hr_employee_category_juniorlevel0')], None)
-    assert res
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 5f0054c3634..3d945910144 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Attendance',
+    'name': 'Attendances',
     'version': '1.1',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 51d5e87145c..ceb8acfe49e 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
-"access_hr_action_reason_employee","hr.action.reason.employee","model_hr_action_reason","base.group_user",1,1,1,1
-"access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_action_reason_user,hr.action.reason.user,model_hr_action_reason,base.group_hr_user,1,1,1,1
+access_hr_action_reason_employee,hr.action.reason.employee,model_hr_action_reason,base.group_user,1,1,1,1
+access_hr_attendance_user,hr.attendance.user,model_hr_attendance,base.group_hr_user,1,1,1,1
+access_hr_attendance_system_user,hr.attendance.system.user,model_hr_attendance,base.group_user,1,1,1,1
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 41ffa72f937..5e35e147230 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
-"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
-"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_resource_manager,hr.employee.resource.manager,resource.model_resource_resource,base.group_hr_manager,1,1,1,1
+access_hr_resource_calendar_user,hr.employee.resource.calendar.user,resource.model_resource_calendar,base.group_hr_user,1,1,1,1
+access_hr_contract_type_manager,hr.contract.type.manager,model_hr_contract_type,base.group_hr_manager,1,1,1,1
+access_hr_contract_manager,hr.contract.manager,model_hr_contract,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 4c1b32e1395..d2264568378 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "HR Periodic Appraisals",
+    "name" : "Employee Appraisals",
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 3e437833c2d..f25c669a973 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="act_hr_evaluation_tree" model="ir.actions.act_window">
-            <field name="name">My Appraisal Remaining</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr_evaluation.evaluation</field>
+        <record model="ir.actions.act_window" id="action_hr_evaluation_interview_board">
+            <field name="name">Interview Requests</field>
+            <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="domain">[('state','in',('wait', 'progress')),('create_uid','=',uid)]</field>
-            <field name="search_view_id" ref="hr_evaluation.view_hr_evaluation_tree"/>
+            <field name="domain">[('is_evaluation' ,'=', True), ('user_id', '=', uid),('state','=','waiting_answer')]</field>
+            <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
         <record id="board_hr_evaluation_form" model="ir.ui.view">
@@ -18,7 +17,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <xpath expr="/form/board/column[1]" position="inside">
-                <action name="%(act_hr_evaluation_tree)d" string="My Appraisal Remaining"/>
+                <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
             </xpath>
             </field>
         </record>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d8dfa7e40ca..18f5bc1a023 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -365,7 +365,7 @@
         </record>
 
         <record id="view_evaluation_calendar" model="ir.ui.view">
-            <field name="name">Interview Request</field>
+            <field name="name">Interview Requests</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
@@ -379,7 +379,7 @@
             <field name="name">Interview Requests</field>
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_hr_evaluation_interview_form"/>
+            <field name="view_id" eval="False"/>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{'default_is_evaluation': True, "search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 377098a6fe6..4304f78708a 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,34 +1,33 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
-"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,1,1,0
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
-"access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
-"access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
-"access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
-"access_survey_page_hr_manager","survey.page","survey.model_survey_page","base.group_hr_manager",1,1,1,1
-"access_survey_question_hr_manager","survey.question","survey.model_survey_question","base.group_hr_manager",1,1,1,1
-"access_survey_question_column_heading_hr_manager","survey.question.column.heading","survey.model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_answer_hr_manager","survey.answer","survey.model_survey_answer","base.group_hr_manager",1,1,1,1
-"access_survey_response_hr_manager","survey.response","survey.model_survey_response","base.group_hr_manager",1,1,1,1
-"access_survey_response_line_hr_manager","survey.response.line","survey.model_survey_response_line","base.group_hr_manager",1,1,1,1
-"access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
-"access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
-"access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
-"access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
-"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0
-"access_survey_page_hr_user","survey.page.hr.user","survey.model_survey_page","base.group_hr_user",1,1,1,1
-"access_survey_response_hr_user","survey.response.hr.user","survey.model_survey_response","base.group_hr_user",1,1,1,0
-"access_survey_history_hr_user","survey.history.hr.user","survey.model_survey_history","base.group_hr_user",1,1,1,0
-"access_survey_request_hr_user","survey.request.hr.user","survey.model_survey_request","base.group_hr_user",1,1,1,0
-"access_survey_request_hr_employee","survey.request.hr.employee","survey.model_survey_request","base.group_user",1,1,1,0
-"access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0
-"access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0
-"access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_user",1,1,1,0
-"access_base_calendar_attendee_survey_user","base.calendar.calendar.attendee.survey.user","base_calendar.model_calendar_attendee","base.group_survey_user",1,1,1,0
-"access_base_calendar_attendee_tool_user","base.calendar.calendar.attendee.tool.user","base_calendar.model_calendar_attendee","base.group_tool_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_evaluation_evaluation_user,hr_evaluation.evaluation.user,model_hr_evaluation_evaluation,base.group_hr_user,1,1,1,1
+access_hr_evaluation_evaluation_employee,hr_evaluation.evaluation.employee,model_hr_evaluation_evaluation,base.group_user,1,0,0,0
+access_hr_evaluation_plan_user,hr_evaluation.plan.user,model_hr_evaluation_plan,base.group_hr_user,1,1,1,1
+access_hr_evaluation_plan_phase_user,hr_evaluation.plan.phase.user,model_hr_evaluation_plan_phase,base.group_hr_user,1,1,1,1
+access_hr_evaluation_interview_user,hr.evaluation.interview.user,model_hr_evaluation_interview,base.group_hr_user,1,1,1,1
+access_hr_evaluation_interview_employee,hr.evaluation.interview.employee,model_hr_evaluation_interview,base.group_user,1,1,1,0
+access_hr_evaluation_report,hr.evaluation.report,model_hr_evaluation_report,base.group_hr_manager,1,1,1,1
+access_survey_type_hr_manager,survey.type,survey.model_survey_type,base.group_hr_manager,1,1,1,1
+access_survey_hr_manager,survey.hr.manager,survey.model_survey,base.group_hr_manager,1,1,1,1
+access_survey_history_manager,survey.history,survey.model_survey_history,base.group_hr_manager,1,1,1,1
+access_survey_question_hr_manager,survey.question,survey.model_survey_question,base.group_hr_manager,1,1,1,1
+access_survey_question_column_heading_hr_manager,survey.question.column.heading,survey.model_survey_question_column_heading,base.group_hr_manager,1,1,1,1
+access_survey_answer_hr_manager,survey.answer,survey.model_survey_answer,base.group_hr_manager,1,1,1,1
+access_survey_response_hr_manager,survey.response,survey.model_survey_response,base.group_hr_manager,1,1,1,1
+access_survey_response_line_hr_manager,survey.response.line,survey.model_survey_response_line,base.group_hr_manager,1,1,1,1
+access_survey_tbl_column_heading_hr_manager,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_hr_manager,1,1,1,1
+access_survey_response_answer_hr_manager,survey.response.answer,survey.model_survey_response_answer,base.group_hr_manager,1,1,1,1
+access_survey_request_hr_manager,survey.request,survey.model_survey_request,base.group_hr_manager,1,1,1,1
+access_survey_answer_hr_user,survey.answer.hr.user,survey.model_survey_answer,base.group_hr_user,1,1,1,0
+access_survey_response_answer_hr_user,survey.response.answer.hr.user,survey.model_survey_response_answer,base.group_hr_user,1,1,1,0
+access_survey_type_hr_user,survey.type.hr.user,survey.model_survey_type,base.group_hr_user,1,1,1,0
+access_survey_question_hr_user,survey.question.hr.user,survey.model_survey_question,base.group_hr_user,1,1,1,0
+access_survey_page_hr_user,survey.page.hr.user,survey.model_survey_page,base.group_hr_user,1,1,1,1
+access_survey_response_hr_user,survey.response.hr.user,survey.model_survey_response,base.group_hr_user,1,1,1,0
+access_survey_history_hr_user,survey.history.hr.user,survey.model_survey_history,base.group_hr_user,1,1,1,0
+access_survey_request_hr_user,survey.request.hr.user,survey.model_survey_request,base.group_hr_user,1,1,1,0
+access_survey_request_hr_employee,survey.request.hr.employee,survey.model_survey_request,base.group_user,1,1,1,0
+access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_question_column_heading,base.group_hr_user,1,0,0,0
+access_survey_response_line_hr_user,survey.response.line.hr.user,survey.model_survey_response_line,base.group_hr_user,1,1,1,0
+access_survey_tbl_column_heading_hr_user,survey.tbl.column.heading.hr.user,survey.model_survey_tbl_column_heading,base.group_hr_user,1,1,1,0
+access_base_calendar_attendee_survey_user,base.calendar.calendar.attendee.survey.user,base_calendar.model_calendar_attendee,base.group_survey_user,1,1,1,0
+access_base_calendar_attendee_tool_user,base.calendar.calendar.attendee.tool.user,base_calendar.model_calendar_attendee,base.group_tool_user,1,1,1,0
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 786dc6beee2..cf884af4250 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -30,8 +30,6 @@
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="department_id" groups="base.group_extended"/>
-                    <field name="ref"/>
                     <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 674b06304d2..0455302319e 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,23 +1,23 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
-"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,1,1,1
-"access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
-"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,1,1,1
-"access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
-"access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
-"access_product_uom_hr_expense_user","product.uom.hr.expense.user","product.model_product_uom","base.group_hr_user",1,1,1,1
-"access_product_price_type_user","product.price.type.user","product.model_product_price_type","base.group_hr_user",1,1,1,1
-"access_account_journal_user","account.journal.user","account.model_account_journal","base.group_hr_user",1,1,1,1
-"access_account_invoice_user","account.invoice.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
-"access_account_invoice_line_user","account.invoice.line.user","account.model_account_invoice_line","base.group_hr_user",1,1,1,1
-"access_account_analytic_journal_user","account.ianalytic.journal.user","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
-"access_account_invoice_tax_user","account.invoice.tax.user","account.model_account_invoice_tax","base.group_hr_user",1,1,1,1
-"access_account_period_user","account.period.user","account.model_account_period","base.group_hr_user",1,1,1,1
-"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
-"access_account_move_user","account.move.user","account.model_account_move","base.group_hr_user",1,1,1,1
-"access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
-"access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
-"access_account_journal_period_manager","account.journal.period.manager","account.model_account_journal_period","base.group_hr_manager",1,1,1,1
-"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
-"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_expense_expense_user,hr.expense.expense.user,model_hr_expense_expense,base.group_hr_user,1,1,1,1
+access_hr_expense_expense_employee,hr.expense.expense.employee,model_hr_expense_expense,base.group_user,1,1,1,1
+access_hr_expense_line_user,hr.expense.line.user,model_hr_expense_line,base.group_hr_user,1,1,1,1
+access_hr_expense_line_employee,hr.expense.line.employee,model_hr_expense_line,base.group_user,1,1,1,1
+access_hr_expense_report_manager,hr.expense.report.manager,model_hr_expense_report,base.group_hr_manager,1,1,1,1
+access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,base.group_hr_user,1,1,1,1
+access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,base.group_hr_user,1,1,1,1
+access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
+access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
+access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
+access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
+access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
+access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,base.group_hr_user,1,1,1,1
+access_account_period_user,account.period.user,account.model_account_period,base.group_hr_user,1,1,1,1
+access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1
+access_account_move_user,account.move.user,account.model_account_move,base.group_hr_user,1,1,1,1
+access_account_move_line_user,account.move.line.user,account.model_account_move_line,base.group_hr_user,1,1,1,1
+access_account_analytic_line_user,account.ianalytic.line.user,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
+access_account_journal_period_manager,account.journal.period.manager,account.model_account_journal_period,base.group_hr_manager,1,1,1,1
+hr.access_account_journal_view_hruser,account.journal.view hruser,account.model_account_journal_view,base.group_hr_user,1,0,0,0
+hr.access_account_journal_column_hruser,account.journal.column hruser,account.model_account_journal_column,base.group_hr_user,1,0,0,0
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8af2392f6e4..a989ea50222 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -397,7 +397,6 @@
                     <field name="max_leaves"/>
                     <field name="leaves_taken"/>
                     <field name="remaining_leaves"/>
-                    <field name="limit"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 940b0f06447..d2e6c27cded 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
-"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
-"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,1,1,1
-"access_hr_holydays_status_employee","hr.holidays.status employee","model_hr_holidays_status","base.group_user",1,0,0,0
-"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
-"access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_holydays_status_user,hr.holidays.status user,model_hr_holidays_status,base.group_hr_user,1,1,1,1
+access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,1,1,1
+access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
+access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
+access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
+access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 4d2afff54c3..24ca631c4d8 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,16 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
-"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
-"access_hr_salary_rule_category","hr.salary.rule.category","model_hr_salary_rule_category","base.group_hr_user",1,1,1,1
-"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
-"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
-"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,1,1,1
-"access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
-"access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_worked_days ","hr.payslip.worked_days","model_hr_payslip_worked_days","base.group_hr_manager",1,1,1,1
-"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_run","hr.payslip.run","model_hr_payslip_run","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1
-"access_hr_rule_input","hr.rule.input","model_hr_rule_input","base.group_hr_manager",1,1,1,1
-"access_hr_salary_rule_user","hr.salary.rule.user","model_hr_salary_rule","base.group_hr_user",1,1,1,1
-\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payroll_structure,hr.payroll.structure,model_hr_payroll_structure,base.group_hr_user,1,1,1,1
+access_hr_contribution_register,hr.contribution.register,model_hr_contribution_register,base.group_hr_user,1,1,1,1
+access_hr_salary_rule_category,hr.salary.rule.category,model_hr_salary_rule_category,base.group_hr_user,1,1,1,1
+access_hr_payslip,hr.payslip,model_hr_payslip,base.group_hr_user,1,1,1,1
+access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_hr_user,1,1,1,1
+access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_hr_user,1,1,1,1
+access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_hr_manager,1,1,1,1
+access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,base.group_hr_manager,1,1,1,1
+access_hr_rule_input,hr.rule.input,model_hr_rule_input,base.group_hr_manager,1,1,1,1
+access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 637bd45abd1..0ce5ff66c0f 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -56,7 +56,9 @@ system to store and search in your CV base.
     'demo_xml': [
         'hr_recruitment_demo.yml',
     ],
-    'test':['test/test_hr_recruitment.yml'],
+    'test':[
+            'test/recruitment_process.yml',
+            ],
     'installable': True,
     'active': False,
     'certificate' : '001073437025460275621',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index dbf0930c6bd..2854ddf95a5 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -365,10 +365,11 @@ class hr_applicant(crm.crm_case, osv.osv):
         self.write(cr, uid, [res_id], vals, context)
         return res_id
 
-    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-
+        if vals is None:
+            vals = {}
         msg_from = msg['from']
         vals.update({
             'description': msg['body_text']
@@ -412,14 +413,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         return res
 
     def case_close(self, cr, uid, ids, *args):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        employee_obj = self.pool.get('hr.employee')
         res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Applicant '%s' is being hired.") % name
@@ -427,40 +420,32 @@ class hr_applicant(crm.crm_case, osv.osv):
         return res
 
     def case_close_with_emp(self, cr, uid, ids, *args):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        employee_obj = self.pool.get('hr.employee')
-        partner_obj = self.pool.get('res.partner')
-        address_id = False
-        applicant = self.browse(cr, uid, ids)[0]
-        if applicant.partner_id:
-            address_id = partner_obj.address_get(cr, uid, [applicant.partner_id.id], ['contact'])['contact']
-        if applicant.job_id:
-            self.pool.get('hr.job').write(cr, uid, [applicant.job_id.id], {'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
-            emp_id = employee_obj.create(cr,uid,{'name': applicant.partner_name or applicant.name,
-                                                 'job_id': applicant.job_id.id,
-                                                 'address_home_id': address_id,
-                                                 'department_id': applicant.department_id.id
-                                                 })
-        else:
-            raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
-        self.case_close(cr, uid, ids, *args)
-
-        mod_obj = self.pool.get('ir.model.data')
-        act = mod_obj.get_object_reference(cr, uid, 'hr', 'open_view_employee_list')
-
-        act_obj = self.pool.get('ir.actions.act_window')
-        act_win = act_obj.read(cr, uid, act[1], [])
-
-        act_win['domain'] = [('id','=',emp_id)]
-        act_win['view_mode'] = 'form,tree'
-        act_win['res_id'] = emp_id
-        return act_win
+        hr_employee = self.pool.get('hr.employee')
+        model_data = self.pool.get('ir.model.data')
+        act_window = self.pool.get('ir.actions.act_window')
+        emp_id = False
+        for applicant in self.browse(cr, uid, ids):
+            address_id = False
+            if applicant.partner_id:
+                address_id = applicant.partner_id.address_get(['contact'])['contact']
+            if applicant.job_id:
+                applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
+                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or applicant.name,
+                                                     'job_id': applicant.job_id.id,
+                                                     'address_home_id': address_id,
+                                                     'department_id': applicant.department_id.id
+                                                     })
+                self.case_close(cr, uid, [applicant.id], *args)
+            else:
+                raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
+
+        
+        action_model, action_id = model_data.get_object_reference(cr, uid, 'hr', 'open_view_employee_list')
+        dict_act_window = act_window.read(cr, uid, action_id, [])
+        if emp_id:
+            dict_act_window['res_id'] = emp_id
+        dict_act_window['view_mode'] = 'form,tree'
+        return dict_act_window
 
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as draft
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 96baaf9e278..6449cc60fda 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,13 +1,13 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_applicant_user","hr.applicant.user","model_hr_applicant","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
-"access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_mail_message_user","mail.message.user","mail.model_mail_message","base.group_hr_user",1,1,1,1
-"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
-"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
-"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
-"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
-"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_source_hr_officer","hr.recruitment.source","model_hr_recruitment_source","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_source_all","hr.recruitment.source","model_hr_recruitment_source",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_applicant_user,hr.applicant.user,model_hr_applicant,base.group_hr_user,1,1,1,1
+access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,1
+access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,1,1,1
+access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1
+access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1
+access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
+access_res_partner_address_hr_user,res.partner.address.user,base.model_res_partner_address,base.group_hr_user,1,1,1,1
+access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0
+access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1
+access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,1,1
+access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
+access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
new file mode 100644
index 00000000000..43575137a6e
--- /dev/null
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -0,0 +1,67 @@
+-
+  In Order to test process of Recruitment,
+-
+  Applicant interested in job position. so He send resume by email.
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('hr_recruitment','test', 'resume.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'hr.applicant', request_message)
+-
+  After getting the mail, I check details of new applicant.
+-
+  !python {model: hr.applicant}: |
+    applicant_ids = self.search(cr, uid, [('email_from','=', 'Mr. Richard Anderson <Richard_Anderson@yahoo.com>')])
+    assert applicant_ids, "Applicant is not created after getting the mail"
+    applicant = self.browse(cr, uid, applicant_ids[0], context=context)
+    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.doc'),('res_model','=',self._name),('res_id','=',applicant.id)])
+    assert applicant.name == "Application for the post of Jr.application Programmer.", "Subject does not match"
+    assert applicant.state == "draft"
+    assert len(resume_ids), "Resume does not attached."
+-
+  I assign the Job position to the applicant
+-
+  !python {model: hr.applicant}: |
+    self.write(cr, uid, [ref('hr_case_programmer')], {'job_id':ref('hr.job_jr_appli')})
+-
+  I open applicant for the Recruitment
+-
+
+  !python {model: hr.applicant}: |
+    self.case_open(cr, uid, [ref("hr_case_programmer")])
+-
+  I start communication with applicant, first schedule phonecall.
+-
+  !python {model: hr.recruitment.job2phonecall}: |
+     self.make_phonecall(cr, uid, [ref('hr_case_programmer')])
+-
+  I schedule meeting with applicant for interview.
+-
+  !python {model: hr.applicant}: |
+     self.action_makeMeeting(cr, uid, [ref('hr_case_programmer')])
+-
+  Applicant fillup the answer of the interview quetion.
+-
+  !python {model: survey.question.wiz}: |
+    ctx = context.copy()
+    ctx.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
+    self.fields_view_get(cr, uid, ref("survey.view_survey_question_message"),"form", context=ctx)
+    vals = self.default_get(cr, uid , [], context=ctx)
+    self.create(cr, uid, vals, context=ctx)
+    self.action_new_page(cr, uid, [ref("survey_job_0")], context=ctx)
+-
+  I print Applicant fill up the interview quetion
+-
+  !python {model: hr.applicant}: |
+    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
+-
+  On a successful interview with the applicant, I hired employee.
+-
+  !python {model: hr.applicant}: |
+     self.case_close_with_emp(cr, uid, [ref('hr_case_programmer')])
+-
+  I check that applicant is "Hired".
+-
+  !assert {model: hr.applicant, id: hr_case_programmer}:
+    - state == 'done'
diff --git a/addons/hr_recruitment/test/resume.eml b/addons/hr_recruitment/test/resume.eml
new file mode 100644
index 00000000000..00cc5620563
--- /dev/null
+++ b/addons/hr_recruitment/test/resume.eml
@@ -0,0 +1,839 @@
+Return-Path: <Richard_Anderson@yahoo.com>
+X-Original-To: hr@mycompany.com
+Delivered-To: hr@mycompany.com
+Received: by mail1.mycompany.com (Postfix, from userid 10002)
+	id 7047CBFC94; Fri, 18 Nov 2011 10:28:16 +0100 (CET)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail1.mycompany.com
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
+	HTML_MESSAGE autolearn=ham version=3.3.1
+Received: from nm12-vm2.bullet.mail.ne1.yahoo.com (nm12-vm2.bullet.mail.ne1.yahoo.com [98.138.91.88])
+	by mail1.mycompany.com (Postfix) with SMTP id 0D04ABF53A
+	for <hr@mycompany.com>; Fri, 18 Nov 2011 10:27:50 +0100 (CET)
+Received: from [98.138.90.50] by nm12.bullet.mail.ne1.yahoo.com with NNFMP; 18 Nov 2011 09:26:49 -0000
+Received: from [98.138.226.126] by tm3.bullet.mail.ne1.yahoo.com with NNFMP; 18 Nov 2011 09:26:49 -0000
+Received: from [127.0.0.1] by smtp205.mail.ne1.yahoo.com with NNFMP; 18 Nov 2011 09:26:49 -0000
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.in; s=s1024; t=1321608409; bh=GGVn24b6ZH8Ojn91evBkrwuNFmAsLAPy4OeUvOqjgig=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type; b=DFCOdjskDmdbkzvuxTqFWJOUHsT0nITWiQe5782VeyTrhymhIzNhwzdRq4wfTrzLu03rJhHadZTX0uweNCf0Jpr4OpEQevZa3aVPw44NNmhFeT2tjs9m3kNWyPnz5Nk1Yv8tiTRFSdssPfZAhwz8UXLCBFowa8DRnY2ZFIsATRE=
+X-Yahoo-Newman-Id: 644435.12111.bm@smtp205.mail.ne1.yahoo.com
+X-Yahoo-Newman-Property: ymail-3
+X-YMail-OSG: 09Al2uQVM1n5JcQepgua6wQsww7jiatAHXaSsMjP5Qvk9Ba
+ c65j0.ETzyjVh0vpjphFK3XqPtX0n17z9cUCfUhUDDXLUmUSFoZ.NjoiJ_mQ
+ vwd4S7.I4ObFZm5jgA0ML0cfTRAy_0msUfO3NKsh9LgBdUXztbVOwrTGQhzD
+ nu2v3TskGG9ZtRTiqM_Iad2qmMqveFdqUz5xBnwYYgBuLWRR7EUmU1qyOgss
+ LL33J2t9EOCUn2Kc9XQbSkPBBR7BYlIatTF.AAxLdsuOW6ovTGO.HM5ap0qo
+ LLM1_BE.EOvXdW38ZC_hHcrM4xYaYSR7c0WaOQsR8EZeXk_Vhio7HHUrdxZl
+ 1oZz7YWK9Q04M023JJoM4v6IrThy3BNepluEFFcavkyOnCw--
+X-Yahoo-SMTP: oNtzSBqswBAqJIGYOgyGesyleENrhUEtEgBkQ053
+Received: from [192.168.1.30] (test@180.211.100.2 with plain)
+        by smtp205.mail.ne1.yahoo.com with SMTP; 18 Nov 2011 01:26:47 -0800 PST
+Message-ID: <4EC624C7.6020000@yahoo.in>
+Date: Fri, 18 Nov 2011 14:56:31 +0530
+From: Mr. Richard Anderson <Richard_Anderson@yahoo.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10
+MIME-Version: 1.0
+To: hr@mycompany.com
+Subject: Application for the post of Jr.application Programmer.
+Content-Type: multipart/mixed;
+ boundary="------------010903010402010104090709"
+
+This is a multi-part message in MIME format.
+--------------010903010402010104090709
+Content-Type: multipart/alternative;
+ boundary="------------010004020303010906010104"
+
+
+--------------010004020303010906010104
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 7bit
+
+Hello Sir,
+
+  I am**Richard Anderson completed MCA from Mac Technological 
+university, i send my resume for the your company job position, i 
+attached my resume here
+
+Thank you
+Richard Anderson
+
+--------------010004020303010906010104
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+
+    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  </head>
+  <body text="#000000" bgcolor="#ffffff">
+    Hello Sir,<br>
+    <br>
+    &nbsp;I am<b> </b>Richard Anderson completed MCA from Mac Technological
+    university, i send my resume for the your company job position, i
+    attached my resume here<br>
+    <br>
+    Thank you<br>
+    Richard Anderson
+  </body>
+</html>
+
+--------------010004020303010906010104--
+
+--------------010903010402010104090709
+Content-Type: application/msword;
+ name="resume.doc"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename="resume.doc"
+
+0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAOwADAP7/CQAGAAAAAAAAAAAAAAABAAAASwAAAAAA
+AAAAEAAAAgAAAAEAAAD+////AAAAAAAAAAD/////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+///////////////////////////////////9//////////7///9KAAAABQAAAAYAAAAHAAAA
+CAAAAAkAAAAKAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUA
+AAD+////FwAAABgAAAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAAIAAAACEAAAAiAAAA
+IwAAACQAAAAlAAAAJgAAACcAAAAoAAAA/v///yoAAAArAAAALAAAAC0AAAAuAAAALwAAADAA
+AAAxAAAAMgAAADMAAAA0AAAANQAAADYAAAA3AAAAOAAAADkAAAA6AAAAOwAAADwAAAA9AAAA
+PgAAAD8AAABAAAAAQQAAAEIAAABDAAAARAAAAEUAAABGAAAARwAAAEgAAABJAAAA/v////7/
+//9MAAAATQAAAP7/////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////1IA
+bwBvAHQAIABFAG4AdAByAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAWAAUA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////8AAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
+/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7///8AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAQAAAP7////+////BAAAAAUAAAAGAAAABwAAAP7/
+//8JAAAA/v//////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////8BAP7/
+AwoAAP////8GCQIAAAAAAMAAAAAAAABGGAAAAE1pY3Jvc29mdCBXb3JkLURva3VtZW50AAoA
+AABNU1dvcmREb2MAEAAAAFdvcmQuRG9jdW1lbnQuOAD0ObJxAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAEAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/wAAAQACAAAAAAAAAAAAAAAAAAAAAAABAAAA
+4IWf8vlPaBCrkQgAKyez2TAAAADsAAAACgAAAAEAAABYAAAAAgAAAGAAAAAEAAAAeAAAAAcA
+AACUAAAACAAAAKQAAAAJAAAAsAAAAAoAAAC8AAAACwAAAMgAAAAMAAAA1AAAAA0AAADgAAAA
+AgAAAOn9AAAeAAAAEAAAAENhbmRpZGF0ZXMgTmFtZQAeAAAAFAAAAHNhZ2FyIHAgc3VyeWF3
+YW5zaGkAHgAAAAcAAABOb3JtYWwAAB4AAAAEAAAAc2FpAB4AAAAEAAAAMTY5AEAAAAAAyPid
+CgAAAEAAAAAAAAAAAAAAAEAAAAAAnpj/jovLAUAAAAAA1LJ/lhzMAQAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAABIAZwAKAAEAWwAPAAIAAAAAAAAAYAAAEPH/AgBgAAAA
+BgBOAG8AcgBtAGEAbAAAABEAAAADJABhJAAxJAEqJAFBJAAALwBCKgBPSgAAUUoAAENKFABt
+SAkEc0gJBFBKAABuSAQIXkoAAGFKFABfSAEEdEgBBABcAAEQAQACAFwAAAAJAEgAZQBhAGQA
+aQBuAGcAIAAxAAAAJwABAAMkA2EkAw3GBQABOAQAXoQAAF2EoAVghAAAE6RkABSkZAAGJAEA
+DwBPSgIAUUoCAENKEgA1CAEAPgACEAEAAgA+AAAACQBIAGUAYQBkAGkAbgBnACAAMgAAAA0A
+AgATpGQAFKRkAAYkAQAMAE9KAgBRSgIAQ0oSADoAAxABAAIAOgAAAAkASABlAGEAZABpAG4A
+ZwAgADMAAAAFAAMABiQBAA8AT0oCAFFKAgBDShIANQgBAFYABBABAAIAVgAAAAkASABlAGEA
+ZABpAG4AZwAgADQAAAAfAAQAEmRoAQEADcYFAAFoAQBehGgBXYQAAGCEmP4GJAEAEgBPSgIA
+UUoCAENKEgA1CAFcCAEyAAUQAQBiBTIAAAAJAEgAZQBhAGQAaQBuAGcAIAA1AAAACgAFABOk
+ZAAUpGQAAwA1CAEAUAAGEAEAAgBQAAAACQBIAGUAYQBkAGkAbgBnACAANgAAABkABgANxgUA
+ATgEAF6EAABdhKAFYIQAAAYkAQASAE9KAgBRSgIAQ0oSAD4qAVwIAWAABxABAAIAYAAAAAkA
+SABlAGEAZABpAG4AZwAgADcAAAAwAAcAQCYGCiYGC0YBAAomBgtGAQAxJAANxgUAARwBADck
+AF6EHAFdhAAAYITk/gYkAQwAT0oCAFFKAgBDShIASAAIEAEAAgBIAAAACQBIAGUAYQBkAGkA
+bgBnACAAOAAAABcACAAxJAA3JABehBwBXYQAAGCE5P4GJAEADABPSgIAUUoCAENKEgAAAEIA
+QUDy/6EAQgAAABkAQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
+dABhAHIAdAAAAAAAAAAAAAAAAABCAP4f8v/xAEIAAAAZAEEAYgBzAGEAdAB6AC0AUwB0AGEA
+bgBkAGEAcgBkAHMAYwBoAHIAaQBmAHQAYQByAHQAAAAAAEgA/h/y/wEBSAAAABwAVwBXAC0A
+QQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAAAAAA
+SgD+H/L/EQFKAAAAHQBXAFcALQBBAGIAcwBhAHQAegAtAFMAdABhAG4AZABhAHIAZABzAGMA
+aAByAGkAZgB0AGEAcgB0ADEAAAAAAEwA/h/y/yEBTAAAAB4AVwBXAC0AQQBiAHMAYQB0AHoA
+LQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAxADEAAAAAAE4A/h/y/zEB
+TgAAAB8AVwBXAC0AQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
+dABhAHIAdAAxADEAMQAAAAAAUAD+H/L/QQFQAAAAIABXAFcALQBBAGIAcwBhAHQAegAtAFMA
+dABhAG4AZABhAHIAZABzAGMAaAByAGkAZgB0AGEAcgB0ADEAMQAxADEAAAAAAFIA/h/y/1EB
+UgAAACEAVwBXAC0AQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
+dABhAHIAdAAxADEAMQAxADEAAAAAAFQA/h/y/2EBVAAAACIAVwBXAC0AQQBiAHMAYQB0AHoA
+LQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAxADEAMQAxADEAMQAAAAAA
+KgD+H/L/cQEqAAAACQBXAFcAOABOAHUAbQAyAHoAMAAAAAgAT0oBAFFKAQAuAP4f8v+BAS4A
+AAAJAFcAVwA4AE4AdQBtADIAegAxAAAADABPSgcAUUoHAF5KBwAqAP4f8v+RASoAAAAJAFcA
+VwA4AE4AdQBtADIAegAzAAAACABPSgEAUUoBADYA/h/y/6EBNgAAAAkAVwBXADgATgB1AG0A
+MwB6ADAAAAATAE9KAABRSgAANQgBUEoAAF5KAAAAKgD+H/L/sQEqAAAACQBXAFcAOABOAHUA
+bQAzAHoAMQAAAAgAT0oHAFFKBwAqAP4f8v/BASoAAAAJAFcAVwA4AE4AdQBtADMAegAyAAAA
+CABPSggAUUoIACoA/h/y/9EBKgAAAAkAVwBXADgATgB1AG0ANAB6ADAAAAAIAE9KCABRSggA
+LgD+H/L/4QEuAAAACQBXAFcAOABOAHUAbQA0AHoAMQAAAAwAT0oHAFFKBwBeSgcAKgD+H/L/
+8QEqAAAACQBXAFcAOABOAHUAbQA0AHoAMwAAAAgAT0oBAFFKAQA8AP4f8v8BAjwAAAAWAEQA
+ZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAAAAAACoA/h/y/xEC
+KgAAAAkAVwBXADgATgB1AG0AMQB6ADAAAAAIAE9KAABRSgAAKgD+H/L/IQIqAAAACQBXAFcA
+OABOAHUAbQAzAHoAMwAAAAgAT0oBAFFKAQAqAP4f8v8xAioAAAAJAFcAVwA4AE4AdQBtADUA
+egAwAAAACABPSgEAUUoBACoA/h/y/0ECKgAAAAkAVwBXADgATgB1AG0ANQB6ADEAAAAIAE9K
+BwBRSgcAKgD+H/L/UQIqAAAACQBXAFcAOABOAHUAbQA1AHoAMgAAAAgAT0oIAFFKCAAqAP4f
+8v9hAioAAAAJAFcAVwA4AE4AdQBtADcAegAwAAAACABPSgEAUUoBADwA/h/y/3ECPAAAAAkA
+VwBXADgATgB1AG0AOAB6ADAAAAAZAEIqBnBo/wAAAE9KCABRSggAUEoAAF5KAAAALgD+H/L/
+gQIuAAAACQBXAFcAOABOAHUAbQA4AHoAMQAAAAwAT0oHAFFKBwBeSgcAKgD+H/L/kQIqAAAA
+CQBXAFcAOABOAHUAbQA4AHoAMgAAAAgAT0oIAFFKCAAqAP4f8v+hAioAAAAJAFcAVwA4AE4A
+dQBtADgAegAzAAAACABPSgEAUUoBACoA/h/y/7ECKgAAAAkAVwBXADgATgB1AG0AOQB6ADAA
+AAAIAE9KAQBRSgEALAD+H/L/wQIsAAAACgBXAFcAOABOAHUAbQAxADAAegAwAAAACABPSgEA
+UUoBACwA/h/y/9ECLAAAAAoAVwBXADgATgB1AG0AMQAxAHoAMAAAAAgAT0oBAFFKAQAsAP4f
+8v/hAiwAAAAKAFcAVwA4AE4AdQBtADEAMgB6ADAAAAAIAE9KAQBRSgEALAD+H/L/8QIsAAAA
+CgBXAFcAOABOAHUAbQAxADIAegAxAAAACABPSgcAUUoHACwA/h/y/wEDLAAAAAoAVwBXADgA
+TgB1AG0AMQAyAHoAMgAAAAgAT0oIAFFKCAA2AP4f8v8RAzYAAAAKAFcAVwA4AE4AdQBtADEA
+MwB6ADAAAAARAEIqBnBo/wAAAE9KAQBRSgEAADAA/h/y/yEDMAAAAAoAVwBXADgATgB1AG0A
+MQAzAHoAMQAAAAwAT0oHAFFKBwBeSgcALAD+H/L/MQMsAAAACgBXAFcAOABOAHUAbQAxADMA
+egAyAAAACABPSggAUUoIACwA/h/y/0EDLAAAAAoAVwBXADgATgB1AG0AMQAzAHoAMwAAAAgA
+T0oBAFFKAQA+AP4f8v9RAz4AAAAKAFcAVwA4AE4AdQBtADEANAB6ADAAAAAZAEIqBnBo/wAA
+AE9KCABRSggAUEoAAF5KAAAAMAD+H/L/YQMwAAAACgBXAFcAOABOAHUAbQAxADQAegAxAAAA
+DABPSgcAUUoHAF5KBwAsAP4f8v9xAywAAAAKAFcAVwA4AE4AdQBtADEANAB6ADIAAAAIAE9K
+CABRSggALAD+H/L/gQMsAAAACgBXAFcAOABOAHUAbQAxADQAegAzAAAACABPSgEAUUoBACwA
+/h/y/5EDLAAAAAoAVwBXADgATgB1AG0AMQA2AHoAMAAAAAgAT0oBAFFKAQAwAP4f8v+hAzAA
+AAAKAFcAVwA4AE4AdQBtADEANgB6ADEAAAAMAE9KBwBRSgcAXkoHACwA/h/y/7EDLAAAAAoA
+VwBXADgATgB1AG0AMQA2AHoAMgAAAAgAT0oIAFFKCAAsAP4f8v/BAywAAAAKAFcAVwA4AE4A
+dQBtADEAOAB6ADAAAAAIAE9KAQBRSgEALAD+H/L/0QMsAAAACgBXAFcAOABOAHUAbQAxADkA
+egAwAAAACABPSgEAUUoBACwA/h/y/+EDLAAAAAoAVwBXADgATgB1AG0AMgAwAHoAMAAAAAgA
+T0oAAFFKAAAsAP4f8v/xAywAAAAKAFcAVwA4AE4AdQBtADIAMgB6ADAAAAAIAE9KAQBRSgEA
+LAD+H/L/AQQsAAAACgBXAFcAOABOAHUAbQAyADIAegAxAAAACABPSgcAUUoHACwA/h/y/xEE
+LAAAAAoAVwBXADgATgB1AG0AMgAyAHoAMgAAAAgAT0oIAFFKCAAsAP4f8v8hBCwAAAAKAFcA
+VwA4AE4AdQBtADIAMwB6ADAAAAAIAE9KAQBRSgEALAD+H/L/MQQsAAAACgBXAFcAOABOAHUA
+bQAyADQAegAwAAAACABPSgEAUUoBACwA/h/y/0EELAAAAAoAVwBXADgATgB1AG0AMgA0AHoA
+MQAAAAgAT0oHAFFKBwAsAP4f8v9RBCwAAAAKAFcAVwA4AE4AdQBtADIANAB6ADIAAAAIAE9K
+CABRSggALAD+H/L/YQQsAAAACgBXAFcAOABOAHUAbQAyADYAegAwAAAACABPSgEAUUoBADAA
+/h/y/3EEMAAAAAoAVwBXADgATgB1AG0AMgA2AHoAMQAAAAwAT0oIAFFKCABDShAALAD+H/L/
+gQQsAAAACgBXAFcAOABOAHUAbQAyADYAegAyAAAACABPSggAUUoIACwA/h/y/5EELAAAAAoA
+VwBXADgATgB1AG0AMgA2AHoANAAAAAgAT0oHAFFKBwA0AP4f8v+hBDQAAAAKAFcAVwA4AE4A
+dQBtADIANwB6ADAAAAAQAE9KAQBRSgEAUEoAAF5KAgAsAP4f8v+xBCwAAAAKAFcAVwA4AE4A
+dQBtADIANwB6ADEAAAAIAE9KBwBRSgcALAD+H/L/wQQsAAAACgBXAFcAOABOAHUAbQAyADcA
+egAyAAAACABPSggAUUoIACwA/h/y/9EELAAAAAoAVwBXADgATgB1AG0AMgA3AHoAMwAAAAgA
+T0oBAFFKAQAsAP4f8v/hBCwAAAAKAFcAVwA4AE4AdQBtADIAOAB6ADAAAAAIAE9KAQBRSgEA
+QgD+H/L/8QRCAAAAGQBXAFcALQBEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgA
+IABGAG8AbgB0AAAAAAA0AFcQ8v8BBTQAAAAPAFMAdAByAG8AbgBnACAARQBtAHAAaABhAHMA
+aQBzAAAABgA1CAFcCAEmAFgQ8v8RBSYAAAAIAEUAbQBwAGgAYQBzAGkAcwAAAAYANggBXQgB
+NgBVEPL/IQU2AAAADQBJAG4AdABlAHIAbgBlAHQAIABMAGkAbgBrAAAADABCKgJwaAAA/wA+
+KgFGAFYQ8v8xBUYAAAAVAFYAaQBzAGkAdABlAGQAIABJAG4AdABlAHIAbgBlAHQAIABMAGkA
+bgBrAAAADABCKgxwaIAAgAA+KgFCAP4fAgJBBUIAAAAKACAAQwBoAGEAcgAgAEMAaABhAHIA
+AAAeAENKGABtSAkEc0gJBDUIAWFKGABfSAEEdEgBBFwIAUYA/h8BAGIFRgAAAAcASABlAGEA
+ZABpAG4AZwAAAA0AVQATpPAAFKR4AAYkAQAYAE9KCQBRSgkAQ0ocAFBKCgBeSgoAYUocADIA
+QhABAGIFMgAAAAkAVABlAHgAdAAgAGIAbwBkAHkAAAAKAFYAE6RkABSkZAAEAENKGAAcAC8Q
+YQVyBRwAAAAEAEwAaQBzAHQAAAACAFcAAAA8AP4fAQCCBTwAAAAHAEMAYQBwAHQAaQBvAG4A
+AAANAFgAE6R4ABSkeAAMJAEADgBDShgANggBYUoYAF0IASIA/h8BAJIFIgAAAAUASQBuAGQA
+ZQB4AAAABQBZAAwkAQAAADgA/h8BAKIFOAAAAAwATgBvAHIAbQBhAGwAIAAoAFcAZQBiACkA
+AAAKAFoAE6RkABSkZAAEAENKGAA2AP4fAQCyBTYAAAALAEIAbwBkAHkAIABUAGUAeAB0ACAA
+MwAAAAoAWwATpGQAFKRkAAQAQ0oYAHwA/h8BAMIFfAAAABEASABUAE0ATAAgAFAAcgBlAGYA
+bwByAG0AYQB0AHQAZQBkAAAANwBcAA3GMgAQlAMoB7wKUA7kEXgVDBmgHDQgyCNcJ/AqhC4Y
+Mqw1QDkAAAAAAAAAAAAAAAAAAAAAABAAT0oHAFFKBwBQSgcAXkoHAEAAQxABANIFQAAAABAA
+VABlAHgAdAAgAGIAbwBkAHkAIABpAG4AZABlAG4AdAAAAA4AXQBehNACXYQAAGCEAAAAADgA
+ShABAGIFOAAAAAgAUwB1AGIAdABpAHQAbABlAAAACABeAAMkAmEkAg4AQ0oYADUIAWFKGABc
+CAE4AP4fAQDyBTgAAAAIAGMAbwBtAHAAbwBzAGUAZgAAAAoAXwATpGQAFKRkAAwAT0oHAFFK
+BwBQSgsASgD+HwEAAgZKAAAADABIAFQATQBMACAAQQBkAGQAcgBlAHMAcwAAAAIAYAAeAE9K
+CwBRSgsAQ0oYADYIAVBKCwBeSgsAYUoYAF0IAS4AIBABABIGLgAAAAYARgBvAG8AdABlAHIA
+AAAQAGEAMSQADcYIAALgEMAhAQIAADoA/h8BACIGOgAAAAsAQgBvAGQAeQAgAFQAZQB4AHQA
+IAAyAAAAAgBiABAAT0oCAFFKAgBDShIAXkoCACwAHxABADIGLAAAAAYASABlAGEAZABlAHIA
+AAANAGMADcYIAALgEMAhAQIAAAAwAP4fYQVCBjAAAAAOAEYAcgBhAG0AZQAgAGMAbwBuAHQA
+ZQBuAHQAcwAAAAIAZAAAADQA/h8BAFIGNAAAAA4AVABhAGIAbABlACAAQwBvAG4AdABlAG4A
+dABzAAAABQBlAAwkAQAAAD4A/h9RBmIGPgAAAA0AVABhAGIAbABlACAASABlAGEAZABpAG4A
+ZwAAAAsAZgADJAFhJAEMJAEABgA1CAFcCAEAAAAADAEAAA0BAAABAAAAAAAAAAAA/////wIE
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAQAADQEAAAAAAAAACAAAAAAAAAAA
+AACABgAABAAAQAAAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAIAADCCwAARg8AAOASAAD+FAAACwAAAAwAAAANAAAADgAAAAAI
+AABQDAAAkgwAAP4MAABoDQAA1A0AAEIOAACuDgAAGA8AACIPAAAsDwAANg8AAEAPAAD2EAAA
+ahMAAO4TAACAFAAAABUAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUAAAAWAAAAFwAAABgA
+AAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAADwAA8GwAAAAAAAbwGAAAAAYEAAACAAAA
+BQAAAAEAAAABAAAABgAAAB8AAfAsAAAAYgAH8CQAAAAGBiP0F3wAAAAANiQDkRECABAAAGoB
+AAABAAAAMkAAAAAAAABAAB7xEAAAAAQAAAgBAAAIAgAACPcAABAADwAC8BwDAAAQAAjwCAAA
+AAUAAAAFBAAADwAD8K4CAAAPAATwKAAAAAEACfAQAAAAAAAAAAAAAAABgP//AYD//wIACvAI
+AAAAAAQAAAUAAAAPAATwqgAAAKIMCvAIAAAAAgQAAAAKAADTAAvwTgAAAIAAAAABAIEAAAAA
+AIIAAAAAAIMAAAAAAIQAAAAAAIgAAAAAAIEB////AIIBAAAAAIMBAAAAAL8BEAAQAP8BAAAI
+AIQDAAAAAIYDfL4BAEMAIvEYAAAAjwMAAAAAkAMAAAAAkQMAAAAAkgMCAAAAAAAQ8AQAAAAA
+AAAAAAAR8AQAAAABAAAAAAAN8AQAAAAAAAEADwAE8G4AAABCAQrwCAAAAAMEAAAACgAAkwAL
+8DYAAABEAQQAAAB/AQEQAAC/AQAAEADAAQAAAADCAf///wDLATBXAADWAQEAAAD/AQgACAA/
+AgAAAgBDACLxGAAAAI8DAAAAAJADAgAAAJEDAAAAAJIDAgAAAA8ABPBuAAAAQgEK8AgAAAAE
+BAAAAAoAAJMAC/A2AAAARAEEAAAAfwEBEAAAvwEAABAAwAEAAAAAwgH///8AywEwVwAA1gEB
+AAAA/wEIAAgAPwIAAAIAQwAi8RgAAACPAwAAAACQAwIAAACRAwAAAACSAwIAAAAPAATw2AAA
+ALIECvAIAAAABQQAAAAKAADzAAvwiAAAAIEAAAAAAIIAAAAAAIMAAAAAAIQAAAAAAARBAQAA
+AAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAIODLgAAAIQD98ABAIYD98AB
+AL8DIAAgAAUABQAIAIkGAACvDgAAiQYAAOM6AADCPgAA4zoAANVCAACvDgAAiQYAAK8OAABD
+ACLxGAAAAI8DAAAAAJADAgAAAJEDAAAAAJIDAgAAAAAAEPAEAAAAAAAAAAAAEfAEAAAAAQAA
+AA8ABPBOAAAAEgAK8AgAAAABBAAAAA4AAHMAC/AqAAAAgQH///8AgwEAAAAAvwEQABAAwAEB
+AAAIywEAAAAA/wEIAAgAAQICAAAIAAAR8AQAAAABAAAAHAAAAGwAAADcAQAAQQIAAIAGAAAE
+BAAAAAAAAAYAAACsJgAABgAAAHQAAAAAAAMEAAAAAAAAmgAAAKwmAACaAAAAdAAAAAAAAgQA
+AI////9iAAAAOCYAABkHAABUBgAAAAAFBAAAbAAAAPf///+dAQAAKAEAAJRAAAAAAP//AQAA
+AA8AXwBQAGkAYwB0AHUAcgBlAEIAdQBsAGwAZQB0AHMAcAUAAH8GAAAAAAAAcQUAAH8GAAAB
+AAEAAAABAAAA/w//D/8P/w//D/8P/w//D/8PAAACAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAA
+EAAAXoTQAmCEMP0VxgUAAdACBgIAAAApAAEAAAD/AAAAAAAAAAAAAAIAAAAAAAAAAAAQAABe
+hEACYITA/RXGBQABAAAGAAABAAAA/wAAAAAAAAAAAAACAAAAAAAAAAAAEAAAXoTQAmCEMP0V
+xgUAAQAABgAAAQAAAP8AAAAAAAAAAAAAAgAAAAAAAAAAABAAAF6EYANghKD8FcYFAAEAAAYA
+AAEAAAD/AAAAAAAAAAAAAAIAAAAAAAAAAAAQAABehPADYIQQ/BXGBQABAAAGAAABAAAA/wAA
+AAAAAAAAAAACAAAAAAAAAAAAEAAAXoSABGCEgPsVxgUAAQAABgAAAQAAAAAAAQAAAAAAAAAA
+AAAAAAAAAAAAABAAAF6EQAtghJj+FcYFAAFACwYCAAYALgABAAAA/wAAAAAAAAAAAAACAAAA
+AAAAAAAAEAAAXoSgBWCEYPoVxgUAAQAABgAAAQAAAP8AAAAAAAAAAAAAAgAAAAAAAAAAABAA
+AF6EMAZghND5FcYFAAEAAAYAAAEAAAABAAAAAAAAAAAAAAAAAAAA////////AQAAAAAA/0AA
+AAAAgAYAAAAAAAACEAAAAAAAAACABgAAUAAACAAAAAAMAAAARxaQAQAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuAAAA
+NRaQAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFMAeQBtAGIAbwBsAAAA
+MyaQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEEAcgBpAGEAbAAAAEcW
+kAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUAGkAbQBlAHMAIABOAGUA
+dwAgAFIAbwBtAGEAbgAAADUmkAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABUAGEAaABvAG0AYQAAAD8WkAECAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABXAGkAbgBnAGQAaQBuAGcAcwAgADIAAAA3JpABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAVgBlAHIAZABhAG4AYQAAAD80kAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABDAG8AdQByAGkAZQByACAATgBlAHcAAAA7BpABAgAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwBpAG4AZwBkAGkAbgBnAHMAAABTJpABgBAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATABpAGIAZQByAGEAdABpAG8AbgAgAFMA
+YQBuAHMAAABBAHIAaQBhAGwAAAA/BpABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAARABlAGoAYQBWAHUAIABTAGEAbgBzAAAASSaQAYAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAEEAcgBpAGEAbAAgAFUAbgBpAGMAbwBkAGUAIABNAFMAAABCAAQA
+AQiNGAAA0AIAAGgBAAAAAHPC62bU3fWmAAAAAAEAAAAAAMkAAAASBgAAAgA/AAAABACDkD8A
+AADJAAAAEgYAAAIAPwAAAD8AAAAAAAAAJwMA8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAIAAAAAAAAAAAAAAAAAAPAQAN/f//0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+gAAAAAAAAAAAAAAA//8SAAAAAAAAAA8AQwBhAG4AZABpAGQAYQB0AGUAcwAgAE4AYQBtAGUA
+AAAAAAAAEwBzAGEAZwBhAHIAIABwACAAcwB1AHIAeQBhAHcAYQBuAHMAaABpAAMAcwBhAGkA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAJ4EAABEAGQA7gAjAQAAAAAAAAAAAAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAADwAE8GYAAACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAA
+AACCAAAAAACDAAAAAACEAAAAAAAEQQEAAAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAA
+EAD/AQAACAAAABDwBAAAAAAAAIBiAAfw5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEA
+AAAAAAAAAAAAAABuHvC4AwAAnRZ3tgAAAAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAA
+CQAAAAsIAwAAAJqHVykAAAMAUExURQAAAPf39///////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////88f9h0AAAADdFJOU///ANfKDUEA
+AAABYktHRACIBR1IAAAADGNtUFBKQ21wMDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjC
+rP8/Ol10K8IJiuo7tbChbMtiRIMkMeT7m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAA
+ngQAAEQAZADuACMBAAAAAAAAAAAAAAAAAAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAPAATwZgAAALIECvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIA
+AAAAAIMAAAAAAIQAAAAAAARBAQAAAAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8B
+AAAIAAAAEPAEAAAAAAAAgGIAB/DkAwAABgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAA
+AAAAAAAAAG4e8LgDAACdFne2AAAAAHs4ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAA
+CwgDAAAAmodXKQAAAwBQTFRFAAAA9/f3////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFi
+S0dEAIgFHUgAAAAMY21QUEpDbXAwNzEyAAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86
+XXQrwgmK6ju1sKFsy2JEgyQx5Pub0Hh7lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAACeBAAA
+RABkAO4AIwEAAAAAAAAAAAAAAAAAAAAAhwClAOgD6AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAA8ABPBmAAAAsgQK8AgAAAABBAAAAAoAALMAC/BCAAAAgQAAAAAAggAAAAAA
+gwAAAAAAhAAAAAAABEEBAAAABgEAAAAAPwEAAAAAgQH///8AgwEAAAAAvwEQABAA/wEAAAgA
+AAAQ8AQAAAAAAACAYgAH8OQDAAAGBp0Wd7YAAAAAezhlIBICABAAAMADAAABAAAAAAAAAAAA
+AAAAbh7wuAMAAJ0Wd7YAAAAAezhlIBICABD/iVBORw0KGgoAAAANSUhEUgAAAAkAAAALCAMA
+AACah1cpAAADAFBMVEUAAAD39/f/////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+///////////////////////////////////PH/YdAAAAA3RSTlP//wDXyg1BAAAAAWJLR0QA
+iAUdSAAAAAxjbVBQSkNtcDA3MTIAAAADSABzvAAAAC5JREFUGFdtjEEKAAAIwqz/PzpddCvC
+CYrqO7WwoWzLYkSDJDHk+5vQeHuUT9geHiQAjlKJhGoAAAAASUVORK5CYIIAAJ4EAABEAGQA
+7gAjAQAAAAAAAAAAAAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAADwAE8GYAAACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAAAACCAAAAAACDAAAA
+AACEAAAAAAAEQQEAAAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAAEAD/AQAACAAAABDw
+BAAAAAAAAIBiAAfw5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEAAAAAAAAAAAAAAABu
+HvC4AwAAnRZ3tgAAAAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAACQAAAAsIAwAAAJqH
+VykAAAMAUExURQAAAPf39///////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////88f9h0AAAADdFJOU///ANfKDUEAAAABYktHRACIBR1I
+AAAADGNtUFBKQ21wMDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjCrP8/Ol10K8IJiuo7
+tbChbMtiRIMkMeT7m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAAngQAAEQAZADuACMB
+AAAAAAAAAAAAAAAAAAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAPAATwZgAAALIECvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIAAAAAAIMAAAAAAIQA
+AAAAAARBAQAAAAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAAAAEPAEAAAA
+AAAAgGIAB/DkAwAABgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAAAAAAAAAAAG4e8LgD
+AACdFne2AAAAAHs4ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAACwgDAAAAmodXKQAA
+AwBQTFRFAAAA9/f3////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFiS0dEAIgFHUgAAAAM
+Y21QUEpDbXAwNzEyAAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86XXQrwgmK6ju1sKFs
+y2JEgyQx5Pub0Hh7lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAACeBAAARABkAO4AIwEAAAAA
+AAAAAAAAAAAAAAAAhwClAOgD6AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8A
+BPBmAAAAsgQK8AgAAAABBAAAAAoAALMAC/BCAAAAgQAAAAAAggAAAAAAgwAAAAAAhAAAAAAA
+BEEBAAAABgEAAAAAPwEAAAAAgQH///8AgwEAAAAAvwEQABAA/wEAAAgAAAAQ8AQAAAAAAACA
+YgAH8OQDAAAGBp0Wd7YAAAAAezhlIBICABAAAMADAAABAAAAAAAAAAAAAAAAbh7wuAMAAJ0W
+d7YAAAAAezhlIBICABD/iVBORw0KGgoAAAANSUhEUgAAAAkAAAALCAMAAACah1cpAAADAFBM
+VEUAAAD39/f/////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+///////////////////PH/YdAAAAA3RSTlP//wDXyg1BAAAAAWJLR0QAiAUdSAAAAAxjbVBQ
+SkNtcDA3MTIAAAADSABzvAAAAC5JREFUGFdtjEEKAAAIwqz/PzpddCvCCYrqO7WwoWzLYkSD
+JDHk+5vQeHuUT9geHiQAjlKJhGoAAAAASUVORK5CYIIAAJ4EAABEAGQA7gAjAQAAAAAAAAAA
+AAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAE8GYA
+AACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAAAACCAAAAAACDAAAAAACEAAAAAAAEQQEA
+AAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAAEAD/AQAACAAAABDwBAAAAAAAAIBiAAfw
+5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEAAAAAAAAAAAAAAABuHvC4AwAAnRZ3tgAA
+AAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAACQAAAAsIAwAAAJqHVykAAAMAUExURQAA
+APf39///////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////88f9h0AAAADdFJOU///ANfKDUEAAAABYktHRACIBR1IAAAADGNtUFBKQ21w
+MDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjCrP8/Ol10K8IJiuo7tbChbMtiRIMkMeT7
+m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAAngQAAEQAZADuACMBAAAAAAAAAAAAAAAA
+AAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAATwZgAAALIE
+CvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIAAAAAAIMAAAAAAIQAAAAAAARBAQAAAAYB
+AAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAAAAEPAEAAAAAAAAgGIAB/DkAwAA
+BgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAAAAAAAAAAAG4e8LgDAACdFne2AAAAAHs4
+ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAACwgDAAAAmodXKQAAAwBQTFRFAAAA9/f3
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFiS0dEAIgFHUgAAAAMY21QUEpDbXAwNzEy
+AAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86XXQrwgmK6ju1sKFsy2JEgyQx5Pub0Hh7
+lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAA7KUBAU0gCQQAAAgSvwAAAAAAADAAAAAAAAgAAAAVAAAOAENhb2xhbjgw
+AAAAAAAAAAAAAAAAAAAAAAAACQQWAJxBAAAAAAAAAAAAAHIFAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAA0BAAAAAAAA//8PAAsAAAAEAAAA//8PAA8AAAARAAAA//8PAAAAAAAAAAAAAAAAAAAA
+AACIAAAAAACIFQAAAAAAAIgVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgV
+AAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsFQAANAAAACAWAAAkAAAA
+RBYAAIwAAAAAAAAAAAAAACYdAAAGAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAOUaAAAmAAAACxsAAAwAAAAXGwAACAAAAAMdAAACAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCAAAGICAACOIgAAdAAAABEd
+AAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+aRoAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQFgAAmQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAACIFQAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHxsAAB4A
+AADjHAAAGAAAAMAVAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+xwAAAgAAAAAAAAAAAAAAAUdAAAMAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAIA2QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAgACAAIAAgACAAIAAgACAAIAAgACAAQwBVAFIAUgBJAEMAVQBMAFUATQAgAFYA
+SQBUAEEARQANAAgADQBSAGkAYwBoAGEAcgBkACAAQQBuAGQAZQByAHMAbwBuACAACwAxADIA
+MwA0ACwAIABXAGUAcwB0ACAANgA3ACAAUwB0AHIAZQBlAHQALAAgAAsAQwBhAHIAbABpAHMA
+bABlACwAIABNAEEAIAAwADEANwA0ADEALAAgAAsAKAAxADIAMwApAC0ANAA1ADYAIAA3ADgA
+OQAwAC4ADQAIAAsAAQAgAEMAYQByAGUAZQByACAATwBiAGoAZQBjAHQAaQB2AGUADQANAEQA
+ZQBzAGkAcgBlACAAYQAgAGMAaABhAGwAbABlAG4AZwBpAG4AZwAgAHAAbwBzAGkAdABpAG8A
+bgAgAGkAbgAgAHQAaABlACAAYQByAGUAYQAgAG8AZgAgAFMAbwBmAHQAdwBhAHIAZQAgAGQA
+ZQB2AGUAbABvAHAAbQBlAG4AdAAsACAAdwBoAGkAYwBoACAAdwBpAGwAbAAgAHUAdABpAGwA
+aQB6AGUAIABtAHkAIABpAG4AdABlAHIAZABpAHMAYwBpAHAAbABpAG4AYQByAHkALAAgAHQA
+ZQBjAGgAbgBpAGMAYQBsACwAIABhAG4AZAAgAHMAbwBmAHQAdwBhAHIAZQAgAGQAZQB2AGUA
+bABvAHAAbQBlAG4AdAAgAGwAaQBmAGUAIABjAHkAYwBsAGUAIABzAGsAaQBsAGwAcwAgAGkA
+bgAgAGEAIABwAHIAbwBkAHUAYwB0AGkAdgBlACwAIABlAG4AdABoAHUAcwBpAGEAcwB0AGkA
+YwAgAGEAbgBkACAAaQBuACAAYQAgAHQAZQBhAG0ALQBvAHIAaQBlAG4AdABlAGQAIABlAG4A
+dgBpAHIAbwBuAG0AZQBuAHQALgANAA0AAQAgAEUAZAB1AGMAYQB0AGkAbwBuAGEAbAAgAFMA
+dQBtAG0AYQByAHkADQBQ8CAAQwBvAG0AcABsAGUAdABlAGQAIABNAGEAcwB0AGUAcgBzACAA
+aQBuACAAQwBvAG0AcAB1AHQAZQByACAAYQBwAHAAbABpAGMAYQB0AGkAbwBuACAAKABNAC4A
+QwAuAEEAKQAgAHcAaQB0AGgAIAA2ADMALgA3ADEAJQAgAA0AAQAgAFQAZQBjAGgAbgBpAGMA
+YQBsACAASwBuAG8AdwBsAGUAZABnAGUAIABTAHUAbQBtAGEAcgB5AA0ACAANAAEAIAAgAEQA
+ZQB0AGEAaQBsAGUAZAAgAEUAZAB1AGMAYQB0AGkAbwBuAGEAbAAgAEEAYwBhAGQAZQBtAGkA
+YwAgAEMAcgBlAGQAZQBuAHQAaQBhAGwAcwANAEUAeABhAG0AaQBuAGEAdABpAG8AbgAHAEIA
+bwBhAHIAZAAvAFUAbgBpAHYAZQByAHMAaQB0AHkABwBQAGEAcwBzAGkAbgBnACAAWQBlAGEA
+cgAHAFAAZQByAGMAZQBuAHQAYQBnAGUABwAHAAgATQAuAEMALgBBACAABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAAVgBJAAcAQwBhAHIAbABpAHMAbABlACAA
+VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAxADEABwA2ADMALgA3ADEABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAAVgAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
+bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMQAwAAcANgA3AC4AMQA3AAcABwAgACAAIAAgACAA
+IAAgACAAIAAgAFMAZQBtAGUAcwB0AGUAcgAgAEkAVgAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
+bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMQAwAAcANgAyAC4AOAAwAAcABwAgACAAIAAgACAA
+IAAgACAAIAAgAFMAZQBtAGUAcwB0AGUAcgAgAEkASQBJAAcAQwBhAHIAbABpAHMAbABlACAA
+VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAxADAABwA2ADIALgAyADUABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAASQBJAAcAQwBhAHIAbABpAHMAbABlACAA
+VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAwADkABwA2ADUALgA3ADUABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAASQAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
+bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMAA5AAcANgAzAC4AMwAzAAcABwAHAAcABwAHAAcA
+BwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcAAQAgAFMAdQBiAGoAZQBjAHQAIAAgAEYA
+YQBtAGkAbABpAGEAcgBpAHQAeQA6AA0AUPAgAEQAYQB0AGEAYgBhAHMAZQAgAE0AYQBuAGEA
+ZwBlAG0AZQBuAHQAIABDAG8AbgBjAGUAcAB0AHMADQBQ8CAATwBiAGoAZQBjAHQAIABPAHIA
+aQBlAG4AdABlAGQAIABQAHIAbwBnAHIAYQBtAG0AaQBuAGcAIABDAG8AbgBjAGUAcAB0AA0A
+UPAgAFMAeQBzAHQAZQBtACAAQQBuAGEAbAB5AHMAaQBzACAAYQBuAGQAIABEAGUAcwBpAGcA
+bgANAFDwIABzAG8AZgB0AHcAYQByAGUAIABFAG4AZwBpAG4AZQBlAHIAaQBuAGcAIAANAFDw
+IABPAHAAZQByAGEAdABpAG4AZwAgAFMAeQBzAHQAZQBtACAAQwBvAG4AYwBlAHAAdAANAFDw
+IABVAG4AaQB4ACAAUwBoAGUAbABsACAAUAByAG8AZwByAGEAbQBtAGkAbgBnAA0AAQAgAEEA
+cgBlAGEAIABvAGYAIABJAG4AdABlAHIAZQBzAHQAOgANAFDwIABTAG8AZgB0AHcAYQByAGUA
+IABkAGUAdgBlAGwAbwBwAG0AZQBuAHQAIAAgAHUAcwBpAG4AZwAgAEoAYQB2AGEALwAuAE4A
+ZQB0ACAAdABlAGMAaABuAG8AbABvAGcAaQBlAHMADQBQ8CAATABlAGEAcgBuAGkAbgBnACAA
+bgBlAHcAIAB0AGUAYwBoAG4AbwBsAG8AZwBpAGUAcwAuAA0AAQAgAFAAZQByAHMAbwBuAGEA
+bAAgAEQAZQB0AGEAaQBsAHMADQBOAGEAbQBlADoAIAAgAAkACQBSAGkAYwBoAGEAcgBkACAA
+QQBuAGQAZQByAHMAbwBuAA0AQwB1AHIAcgBlAG4AdAAgAEEAZABkAHIAZQBzAHMACQAxADIA
+MwA0ACwAIABXAGUAcwB0ACAANgA3ACAAUwB0AHIAZQBlAHQALAAgAAsAQwBhAHIAbABpAHMA
+bABlACwAIABNAEEAIAAwADEANwA0ADEALAAgAAsAKAAxADIAMwApAC0ANAA1ADYAIAA3ADgA
+OQAwAC4ADQBEAGEAdABlACAAbwBmACAAQgBpAHIAdABoADoAIAAJADEAcwB0ACAAagB1AG4A
+ZQANAEcAZQBuAGQAZQByADoAIAAJAAkATQBhAGwAZQAJAA0ADQABAA0ATABhAG4AZwB1AGEA
+ZwBlAHMAIABLAG4AbwB3AG4AIAAHAEMALAAgAEMAKwArACwASgBBAFYAQQAsACAALgBOAEUA
+VAAgADMALgA1ACwAIABBAFMAUAAuAE4ARQBUACAAMwAuADUALABWAEIAIAAyADAAMAA4ACwA
+cAB5AHQAaABvAG4ABwAHAEQAQgBNAFMALwBSAEQAQgBNAFMAIAAHAE8AUgBBAEMATABFACwA
+TQBTACAAQQBjAGMAZQBzAHMALAAgAFMAUQBMACwAIABQAG8AcwB0AGcAcgBlAHMAcwAgAFMA
+UQBMAAcABwBXAGUAYgAgAFQAZQBjAGgAbgBvAGwAbwBnAHkABwBIAFQATQBMACwASgBBAFYA
+QQAgAFMAYwByAGkAcAB0AAcABwBPAHAAZQByAGEAdABpAG4AZwAgAFMAeQBzAHQAZQBtAAcA
+VwBpAG4AZABvAHcAcwAgACgAOQA4AC8AMgAwADAANwAvAFgAUAAgAC8AVgBJAFMAVABBACwA
+NwApACwAdQBiAHUAbgB0AHUABwAHAE8AdABoAGUAcgAHAE4AZQB0AHcAbwByAGsAIABQAHIA
+bwBnAHIAYQBtAG0AaQBuAGcAIABpAG4AIABKAGEAdgBhACwAIABVAG4AaQB4ACAAUwBoAGUA
+bABsACAAUAByAG8AZwByAGEAbQBtAGkAbgBnAAcABwAgAA0ADQANAA0AAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAWCAAAOAgAADoIAAA8CAAAXAgAANgI
+AADaCAAA3AgAAN4IAADgCAAAAgkAAAQJAADMCgAAzgoAANAKAADSCgAA+goAAPwKAAD+CgAA
+EgsAAGALAABiCwAAbAsAAHwLAAB+CwAAgAsAALgLAAC6CwAAvAsAAL4LAADACwAAwgsAAPn5
+9Ovh2PTMv7bMANisn7aVjoeHf3h4eGu2YfQAVLZhAAAAABlVCAEDauANAAAwSlAAXkoEAE9K
+BABRSgQAEj4qATUIAV5KBABPSgQAUUoEAAAZVQgBA2pACQAAMEpQAF5KBABPSgQAUUoEAAxe
+SgQAT0oEAFFKBAAADzUIAV5KBABPSgQAUUoEAAxDShIAT0oCAFFKAgAADENKEgBPSgUAUUoF
+AAATMEpQAD4qAV5KBABPSgQAUUoEABlVCAEDaqAEAAAwSlAAXkoEAE9KBABRSgQAEkNKEgA+
+KgE1CAFPSgIAUUoCAAAQMEpQAF5KBABPSgQAUUoEAAAZVQgBA2oAAAAAMEpQAF5KBABPSgQA
+UUoEABcwSlAAQ0oUAD4qAV5KBABPSgQAUUoEABBDShQAXkoEAE9KBABRSgQAABNDShQANQgB
+XkoEAE9KBABRSgQAEENKFABtSAAEc0gABG5IAAQACQNqAAAAAFUIAQxDShYAT0oCAFFKAgAg
+wgsAABYMAAAuDAAAUAwAAGoMAACADAAAggwAAIQMAACGDAAAkgwAAKgMAADADAAA0AwAAOgM
+AADyDAAA/gwAABQNAAAqDQAAOg0AAFINAABcDQAAaA0AAH4NAACWDQAApg0AAL4NAADIDQAA
+1A0AAOoNAAAEDgAAFA4AACwOAAA2DgAAQg4AAFgOAABwDgAAgA4AAJgOAACiDgAArg4AAMQO
+AADaDgAA6g4AAAIPAAAMDwAAGA8AABwPAAAeDwAAIA8AACIPAAAmDwAAKA8AACoPAAAsDwAA
+MA8AADIPAAA0DwAANg8AADoPAAA8DwAAPg8AAEAPAABCDwAARA8AAEYPAAD27Ozs7ADn39/Y
+2M/Y2NjY2M/Y2NjY2M/Y2MnY2M/Y2MnY2M/Y2MnY2M/Y2Mnf2NjYvdjY2N/Y2Njf2NjYALCn
+AAAAAAAAAAAAABAwSlAAXkoEAE9KBABRSgQAABlVCAEDaoASAAAwSlAAXkoEAE9KBABRSgQA
+FkNKEgA1CAFhShIAXAgBT0oGAFFKBgAAC1wIAU9KBgBRSgYAEENKFABeSgQAT0oEAFFKBAAA
+DF5KBABPSgQAUUoEAAAPNQgBXkoEAE9KBABRSgQACQNqAAAAAFUIARNDShIANQgBXkoEAE9K
+BABRSgQAEj4qATUIAV5KBABPSgQAUUoEAEBGDwAAbg8AAHIPAAB0DwAAdg8AALAPAACyDwAA
+tA8AAPwPAAD+DwAAABAAADYQAAA4EAAAOhAAAGYQAABoEAAAahAAAJwQAACeEAAAoBAAAM4Q
+AADQEAAA0hAAAPYQAAD4EAAA+hAAAGARAABiEQAAZBEAAJoRAACcEQAAnhEAAMARAADMEQAA
+0hEAAPQRAAASEgAAFBIAAIwSAACqEgAArhIAALISAAC+EgAA0hIAANoSAADeEgAA4BIAAPLm
+4dra4dra4dra4dra4dra4drazcS64dra4drarcS6pdqbpZaNpdqF2qXapQAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9IKgFeSgQAT0oEAFFKBAAQQ0oUAF5KBABPSgQAUUoE
+AAAIT0oGAFFKBgAAE0NKFAA1CAFeSgQAT0oEAFFKBAAPNQgBXkoEAE9KBABRSgQAGVUIAQNq
+wBsAADBKUABeSgQAT0oEAFFKBAASQ0oSAD4qATUIAU9KAgBRSgIAABAwSlAAXkoEAE9KBABR
+SgQAABlVCAEDaiAXAAAwSlAAXkoEAE9KBABRSgQADF5KBABPSgQAUUoEAAAIT0oFAFFKBQAA
+F0NKEgA1CAFeSgIAYUoSAE9KAgBRSgIAGkNKEgA+KgE1CAFeSgIAYUoSAE9KAgBRSgIALuAS
+AADiEgAAAhMAAAYTAABqEwAAhBMAAM4TAADuEwAAEBQAADQUAAB+FAAAjBQAAPQUAAD+FAAA
+8eri3erd193q3eLdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALXAgB
+T0oGAFFKBgAIT0oGAFFKBgAAD15KBABcCAFPSgQAUUoEAAxeSgQAT0oEAFFKBAAAHFUIAQNq
+YCAAADBKUABeSgQAPAgBT0oEAFFKBAANAAgAADgIAAA8CAAA2AgAAAIJAAAECQAAzAoAAM4K
+AAD6CgAAfAsAALgLAAC8CwAAFgwAAC4MAABQDAAA9wAAAAAAAAAAAAAAAPIAAAAAAAAAAAAA
+AADkAAAAAAAAAAAAAAAA1QAAAAAAAAAAAAAAAMYAAAAAAAAAAAAAAAC3AAAAAAAAAAAAAAAA
+sgAAAAAAAAAAAAAAAK0AAAAAAAAAAAAAAACoAAAAAAAAAAAAAAAAowAAAAAAAAAAAAAAAJ4A
+AAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAiwAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAA
+AAAAAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQB
+YSQBRyQAAAQAABJkaAEBAAAEAAASZGgBAQAABAAAEmRoAQEAAAQAABJkaAEBAAAEAAASZGgB
+AQAABAAAEmRoAQEAAA5aAAMkA2EkA16EAABdhNACYIQAABOkAAAUpAAAAA5aAAMkA2EkA16E
+AABdhNACYIQAABOkAAAUpAAAAA5aAAMkA2EkA16EAABdhKAFYIQAABOkAAAUpAAADlYAAyQB
+YSQBDcYIAAJwCEALAAATpAAAFKQAAAAEXgADJANhJAMAB14AXoSAFl2EAABghNACAA5QDAAA
+agwAAIAMAACCDAAAkgwAAPEAAAAAAAAAAAAAAADjAAAAAAAAAAAAAAAAZgAAAAAAAAAAAAAA
+AFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAA
+CNZcAARi/8ILeBlyH8IkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAA
+AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAQABAAEAARLW
+KAAAAP/l5eUAAAAAAAD/5eXlAAAAAAAA/+Xl5QAAAAAAAP/l5eUAAABw1igAAAD/5eXlAAAA
+AAAA/+Xl5QAAAAAAAP/l5eUAAAAAAAD/5eXlAAAANNYGAAEBAwAANNYGAAECA2wANNYGAAEE
+AwAANNYGAAEIA2wAAzQAZjQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJ
+ZgEAAAASZGgBAQADJAFhJAFHJAAABJIMAACUDAAAwAwAAOgMAADyDAAA/gwAAMQAAAAAAAAA
+AAAAAAC5AAAAAAAAAAAAAAAArgAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAACSAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYB
+AAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJ
+ZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAADoAABYkARckAUlmAQAAAAjW
+GgABYv/CJIAAAAAEAQEABAEBAAQBAQAEAQEACdYCAAAS1goAAAD/AAAA/wAAcNYKAAAA/wAA
+AP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAF/gwAAAAN
+AAAqDQAAUg0AAFwNAABoDQAAggAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAABsAAAAAAAAAAAA
+AAAAXgAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJ
+ZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAAoAABYk
+AUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAA
+CNZcAARi/8IL0hlyH8IkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAA
+AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAAAAAAAAABLW
+KAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AABw1igAAAD/AAAA/wAA
+AAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEE
+AwAANNYGAAEIA2wAAzQAZjQAAAVoDQAAag0AAJYNAAC+DQAAyA0AANQNAACCAAAAAAAAAAAA
+AAAAdwAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJ
+ZgEAAAASZGgBAQADJAFhJAFHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAAoAABYkAUlmAQAA
+ABJkaAEBAEckAAB8AAAWJAEXJAFJZgEAAAAI1lwABGL/wgvSGXIfwiSAAAAABAEBAAQBAQAE
+AQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEB
+AAQBAQAEAQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA
+/wAAAAAA/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/
+AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAABdQNAADWDQAA
+BA4AACwOAAA2DgAAQg4AAIIAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAA
+AF4AAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYB
+AAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJ
+ZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAHwAABYkARckAUlmAQAAAAjW
+XAAEYv/CC9IZch/CJIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACA
+AAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAEAQEACdYIAAAAAAAAAAAS1igA
+AAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAA
+AP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMA
+ADTWBgABCANsAAM0AGY0AAAFQg4AAEQOAABwDgAAmA4AAKIOAACuDgAAggAAAAAAAAAAAAAA
+AHcAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYB
+AAAAEmRoAQEAAyQBYSQBRyQAAAoAABYkAUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAAS
+ZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAACNZcAARi/8IL0hlyH8IkgAAAAAQBAQAEAQEABAEB
+AAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAE
+AQEABAEBAAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8A
+AAAAAP8AAAD/AABw1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAA
+NNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQAAAWuDgAAsA4AANoO
+AAACDwAADA8AABgPAACCAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAABe
+AAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AABYkAUlmAQAA
+ABJkaAEBAAMkAWEkAUckAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAACgAAFiQBSWYB
+AAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEBAEckAAB8AAAWJAEXJAFJZgEAAAAI1lwA
+BGL/wgvSGXIfwiSAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAA
+AAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA
+/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/
+AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA0
+1gYAAQgDbAADNABmNAAABRgPAAAaDwAAHA8AAB4PAAAgDwAAIg8AAIIAAAAAAAAAAAAAAAB3
+AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAA
+ABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRo
+AQEARyQAAHwAABYkARckAUlmAQAAAAjWXAAEYv/CC9IZch/CJIAAAAAEAQEABAEBAAQBAQAA
+AAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEB
+AAQBAQAEAQEACdYIAAAAAAAAAAAS1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAA
+AAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTW
+BgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAFIg8AACQPAAAmDwAA
+KA8AACoPAAAsDwAAggAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAXgAA
+AAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJZgEAAAAS
+ZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAAoAABYkAUlmAQAA
+ABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAACNZcAARi
+/8IL0hlyH7gkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAE
+AQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8A
+AAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AABw1igAAAD/AAAA/wAAAAAA/wAA
+AP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYG
+AAEIA2wAAzQAZjQAAAUsDwAALg8AADAPAAAyDwAANA8AADYPAACCAAAAAAAAAAAAAAAAdwAA
+AAAAAAAAAAAAAGwAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJZgEAAAAS
+ZGgBAQADJAFhJAFHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEB
+AEckAAB8AAAWJAEXJAFJZgEAAAAI1lwABGL/wgvSGXIfuCSAAAAABAEBAAQBAQAEAQEAAAAA
+AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAE
+AQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA
+/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYA
+AQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAABTYPAAA4DwAAOg8AADwP
+AAA+DwAAQA8AAIIAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAAAF4AAAAA
+AAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYBAAAAEmRo
+AQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJZgEAAAAS
+ZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAHwAABYkARckAUlmAQAAAAjWXAAEYv/C
+C9IZch+4JIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEB
+AAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAEAQEACdYIAAAAAAAAAAAS1igAAAD/AAAA
+/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAAAP8AAAD/
+AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgAB
+CANsAAM0AGY0AAAFQA8AAEIPAAByDwAAsA8AAPwPAAA2EAAAZhAAAJwQAADOEAAA9hAAAIIA
+AAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAHMAAAAAAAAAAAAAAABuAAAA
+AAAAAAAAAAAAaQAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAABfAAAAAAAAAAAAAAAAWgAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAABJkaAEBAAAEAAASZGgBAQAABAAA
+EmRoAQEAAAQAABJkaAEBAAAEAAASZGgBAQAABAAAEmRoAQEAAAQAABJkaAEBAAAEAAASZGgB
+AQAAfAAAFiQBFyQBSWYBAAAACNZcAARi/8IL0hlyH7gkgAAAAAQBAQAEAQEABAEBAAAAAACA
+AAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEB
+AAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8A
+AAD/AABw1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEB
+AwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQAAAn2EAAAYBEAAJoRAADAEQAA
+9BEAAIwSAAC+EgAA3hIAAOASAADkEgAABhMAAGoTAAD6AAAAAAAAAAAAAAAA9QAAAAAAAAAA
+AAAAAPAAAAAAAAAAAAAAAADoAAAAAAAAAAAAAAAA3QAAAAAAAAAAAAAAANUAAAAAAAAAAAAA
+AADNAAAAAAAAAAAAAAAAxQAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAC1AAAAAAAAAAAAAAAA
+qgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAoAABYkAUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAABF4AAyQAYSQA
+AAcAABJkaAEBAAMkA2EkAwAHAAASZGgBAQADJANhJAMABwAAEmRoAQEAAyQDYSQDAAoAABJk
+aAEBAF6EcAhdhAAAYISQ9wAHAAASZGgBAQADJANhJAMABAAAEmRoAQEAAAQAABJkaAEBAAAE
+AAASZGgBAQAAC2oTAABsEwAAhBMAAM4TAADQEwAA7hMAAKwAAAAAAAAAAAAAAAChAAAAAAAA
+AAAAAAAAmQAAAAAAAAAAAAAAAEYAAAAAAAAAAAAAAAA7AAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAFIAABYkARckAUlm
+AQAAAAjWMAACAADeCgIngAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEB
+AAeUSAEJ1gQAAAAAEtYUAAAA/wAAAP8AAAAAAP8AAAD/AABw1hQAAAD/AAAA/wAAAAAA/wAA
+AP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAHAAAWJAFJ
+ZgEAAABHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAFIAABYkARckAUlmAQAAAAjWMAACAADe
+CgIngAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEBAAeUOwEJ1gQAAAAA
+EtYUAAAA/wAAAP8AAAAAAP8AAAD/AABw1hQAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMA
+ADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAF7hMAABAUAAASFAAANBQAAH4U
+AACAFAAA9AAAAAAAAAAAAAAAAKEAAAAAAAAAAAAAAACWAAAAAAAAAAAAAAAAiwAAAAAAAAAA
+AAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSAAAWJAEXJAFJZgEA
+AAAI1jAAAgAA3goCJ4AAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAH
+lFkBCdYEAAAAABLWFAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYUAAAA/wAAAP8AAAAAAP8AAAD/
+AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAACgAAFiQBSWYB
+AAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEBAEckAABSAAAWJAEXJAFJZgEAAAAI1jAA
+AgAA3goCJ4AAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAHlIEBCdYE
+AAAAABLWFAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYUAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYA
+AQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAACgAAFiQBSWYBAAAAEmRo
+AQEARyQAAAWAFAAAjBQAAPQUAAD2FAAA+hQAAPwUAAD+FAAAABUAAPcAAAAAAAAAAAAAAADv
+AAAAAAAAAAAAAAAAnAAAAAAAAAAAAAAAAJoAAAAAAAAAAAAAAACYAAAAAAAAAAAAAAAAlgAA
+AAAAAAAAAAAAAJEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEXgADJABhJAAAAQAAAAEAAAABAAAAUgAA
+FiQBFyQBSWYBAAAACNYwAAIAAN4KAieAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEB
+AAQBAQAEAQEAB5RZAQnWBAAAAAAS1hQAAAD/AAAA/wAAAAAA/wAAAP8AAHDWFAAAAP8AAAD/
+AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQA
+AAcAABYkAUlmAQAAAEckAAAHAAAWJAFJZgEAAABHJAAABzAAH7DQLyCw4D0hsKAFIrCgBSOQ
+0AIkkKAFMlAAADGQaAEwcAAAAAAzUAAAKDIADjAAAG4e8GIBAAAj9Bd8AAAAADYkA5ERAgAQ
+/4lQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAABaPTP9wAAAAlwSFlzAAALEgAACxIB0t1+
+/AAAAQNJREFUeJxjYYACFhDx/vXz/yxwke+f3//n5BVkBIv8BwIQzQgELDAGimZkgF3Lhw8v
+GN6/eI5QISgoidsMrGaCwPfv3//D2B/ePGeQlFViRFFw/8Yxhg+vPwBZP4CYA9MELUNnuL1Y
+rSDoBrwKqmdt/d+S6gUXrJm9jaE1zRvVkT9+/IAw/vzAYQVQAqTox4/v2BWcP70PovsPiCeA
+qgBkXytFvqAEoBiw9fC1/8eu38ep2EpTkcHbVgslRlAMAGlGDk9kAAqhlsX78LsAppCTkxND
+4b3b17AajGEAKKndu30OnKh+MMAiD5SqnxM2AOTHKduvY1UIk8drAHoAEQMojkYAJEdjeTsx
+JnYAAAAASUVORK5CYIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAA/v8AAAEAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAALVzdWcLhsQk5cIACss+a5EAAAA
+BdXN1ZwuGxCTlwgAKyz5rlwAAAAYAAAAAQAAAAEAAAAQAAAAAgAAAOn9AAAYAAAAAQAAAAEA
+AAAQAAAAAgAAAOn9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSAG8AbwB0ACAARQBuAHQAcgB5AAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAFAP//////////
+AQAAAAYJAgAAAAAAwAAAAAAAAEYAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAACAAgAAAAAAAAEA
+QwBvAG0AcABPAGIAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAASAAIAAgAAAAUAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAGoAAAAAAAAAAQBPAGwAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAgD/////AwAAAP////8AAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAFAAAAAAAAAAxAFQAYQBiAGwAZQAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgACAAQA
+AAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAACIwAA
+AAAAAEQAYQB0AGEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAKAAIA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAFgAAAP4kAAAAAAAABQBTAHUAbQBtAGEAcgB5AEkAbgBmAG8AcgBtAGEA
+dABpAG8AbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAgAGAAAACAAAAP////8AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAHAEAAAAAAABXAG8AcgBkAEQA
+bwBjAHUAbQBlAG4AdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+GgACAAcAAAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACkA
+AACcQQAAAAAAAE8AYgBqAGUAYwB0AFAAbwBvAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAWAAEA////////////////AAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAABQBEAG8AYwB1AG0AZQBuAHQAUwB1AG0A
+bQBhAHIAeQBJAG4AZgBvAHIAbQBhAHQAaQBvAG4AAAAAAAAAAAAAADgAAgD/////////////
+//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAdAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAP///////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAP7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////
+//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAA
+AAA=
+--------------010903010402010104090709--
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
deleted file mode 100644
index b797353bde2..00000000000
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ /dev/null
@@ -1,139 +0,0 @@
--
-  In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitment process.
--
-
-  I create a department.
--
-  !record {model: hr.department, id: hr_department_rd0}:
-    manager_id: base.user_root
-    name: 'R & D '
-
--
-  I create new Job Position.
--
-  !record {model: hr.job, id: hr_job_jea0}:
-    department_id: 'hr_department_rd0'
-    description: 'Position of Jr. Application Engineer'
-    expected_employees: 5
-    name: 'JAE '
--
-  I create a recruitment stage "Initial Jobs Demand".
--
-  !record {model: hr.recruitment.stage, id: hr_recrutiment_stage_first0}:
-    name: 'Initial Jobs Demand'
-    sequence: 1
--
-  I create an applicant.
--
-  !record {model: hr.applicant, id: hr_applicant_fresher0}:
-    availability: 0.0
-    department_id: hr.dep_it
-    name: Fresher
-    partner_address_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-    partner_name: Marion Jones
-    partner_phone: '1111112223'
-    response: 0.0
-    job_id: hr.job_jr_developers
-    salary_expected: 0.0
-    salary_proposed: 0.0
-    stage_id: hr_recrutiment_stage_first0
-    type_id: hr_recruitment.degree_licenced
-
--
-  I check that applicant is on "draft" state.
--
-  !assert {model: hr.applicant, id:  hr_applicant_fresher0}:
-    - state == 'draft'
-
--
-  I change the state by click on "In Progress" button.
--
-  !python {model: hr.applicant}: |
-    self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
-      })
--
-  I change the stages by clicking on stage next and stage previous buttons.
--
-  !python {model: hr.applicant}: |
-    self.stage_next(cr, uid, [ref('hr_applicant_fresher0')], None)
-    self.stage_previous(cr, uid, [ref('hr_applicant_fresher0')], None)
--
-  I create a new case category.
--
-  !record {model: crm.case.categ, id: crm_case_categ_employee0}:
-    name: 'Employee'
-
--
-  I schedule a phonecall for this applicant by click on "Schedule a Phone Call" button.
--
-  !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
-    user_id: base.user_root
-    deadline: !eval time.strftime('%Y-%m-%d 11:51:00')
-    note: 'For interview.'
-    category_id: 'crm_case_categ_employee0'
-
--
-  I click on "Schedule phonecall" button of this wizard.
--
-  !python {model: hr.recruitment.job2phonecall}: |
-     self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
-
--
-  I schedule meeting for interview of this applicant by click on "Schedule Meeting" button.
--
-  !python {model: hr.applicant}: |
-     self.action_makeMeeting(cr, uid, [ref('hr_recruitment_forinterview0')])
--
-  I create an entry for the meeting with the applicant.
--
-  !record {model: crm.meeting, id: crm_meeting_fresher0}:
-    alarm_id: base_calendar.alarm1
-    count: 0.0
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 00:00:00')" 
-    date_deadline: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 08:00:00')" 
-    day: 0.0
-    duration: 8.0
-    name: Fresher
-    opportunity_id: crm.crm_case_construstazunits0
-    partner_address_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-    recurrent_uid: 0.0
-    rrule_type: none
-    state: open
-    user_id: base.user_root
--
-  I print the survery filled up by the applicant.
--
-  !python {model: hr.applicant}: |
-     self.action_print_survey(cr, uid, [ref('hr_applicant_fresher0')], None)
--
-  I assign the position to the applicant and its relevant department.
--
-  !python {model: hr.applicant}: |
-     res = self.onchange_job(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.job_jr_developers'), None)
-     values = dict([('job_id', ref('hr.job_jr_developers'))] + res['value'].items())
-     res1 = self.onchange_department_id(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.dep_it'), None)
-     values.update(dict([('department_id', ref('hr.dep_it'))] + res1['value'].items()))
-     self.write(cr, uid, [ref('hr_applicant_fresher0')], values, None)
--
-  On a successful meeting with the applicant, I hired employee by click on "Hired" button.
--
-  !python {model: hired.employee}: |
-     self.case_close(cr, uid, [], context={'active_ids': [ref('hr_applicant_fresher0')]})
--
-  I check that applicant state is "Hired".
--
-  !assert {model: hr.applicant, id: hr_applicant_fresher0}:
-    - state == 'done'
--
-  I create partner for the hired applicant for accounting purpose.
--
-  !record {model: hr.recruitment.partner.create, id: hr_recruitment_partner_create0}:
-    close: False
--
-  I click on Create Partner button to create a partner for applicant.
--
-  !python {model: hr.recruitment.partner.create}: |
-     self.make_order(cr, uid, [ref('hr_recruitment_partner_create0')], context={'active_ids': [ref('hr_applicant_fresher0')]})
-
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index cd9cbea52f7..0f7d30b215a 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -88,7 +88,7 @@ class job2phonecall(osv.osv_memory):
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
         if id3:
             id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
+        new_phonecall_id = []
         for job in job_case_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             #TODO: Take other info from job
             new_phonecall_id = phonecall_case_obj.create(cr, uid, {
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 43f5e62e37c..16331a7a2cf 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources (Timesheet encoding)',
+    'name': 'Timesheets',
     'version': '1.0',
     "category": "Human Resources",
     'complexity': "easy",
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2b2064a89b4..d5f89098a69 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,14 +1,14 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
-"access_hr_analytic_timesheet_employee","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line_employee","account.account.analytic.line employee","account.model_account_analytic_line","base.group_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
-"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
-"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
-"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
-"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
-"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
-"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_account_analytic_journal_user","account.account.analytic.journal.user","account.model_account_analytic_journal","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_analytic_timesheet,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_hr_user,1,1,1,1
+access_hr_analytic_timesheet_employee,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,0
+access_hr_account_analytic_line,account.account.analytic.line,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
+access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,0
+access_account_analytic_journal,account.account.analytic.journal,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
+access_product_product_user,product.product user,product.model_product_product,base.group_hr_user,1,1,1,1
+access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,base.group_hr_user,1,1,1,1
+access_product_uom_hr_timesheet,product.uom.hr.timesheet,product.model_product_uom,base.group_hr_user,1,1,1,1
+access_account_fiscalyear_hr_user,account.account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1
+hr.access_account_journal_view_hruser,account.journal.view hruser,account.model_account_journal_view,base.group_hr_user,1,0,0,0
+hr.access_account_journal_column_hruser,account.journal.column hruser,account.model_account_journal_column,base.group_hr_user,1,0,0,0
+access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,model_hr_analytic_timesheet,base.group_user,1,1,1,0
+access_account_analytic_journal_user,account.account.analytic.journal.user,account.model_account_analytic_journal,base.group_user,1,0,0,0
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index bd5c58fde1b..e731f9215ff 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Invoice on Analytic Lines',
+    'name': 'Invoice on Timesheets',
     'version': '1.0',
     'category': 'Sales Management',
     'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 71c5be3cdfc..02d6175cd17 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,16 +1,16 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_invoice_factor_employee","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_user",1,1,1,1
-"access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
-"access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
-"access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
-"access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
-"access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
-"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
-"access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1
-"access_report_timesheet_line_employee_user","report.timesheet.line","model_report_timesheet_line","base.group_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_invoice_factor_hr_user,hr_timesheet_invoice.factor.hr.user,model_hr_timesheet_invoice_factor,base.group_hr_user,1,1,1,1
+access_hr_timesheet_invoice_factor_employee,hr_timesheet_invoice.factor.hr.user,model_hr_timesheet_invoice_factor,base.group_user,1,1,1,1
+access_hr_timesheet_invoice_factor_acc_inv,hr_timesheet_invoice.factor.account.invoice,model_hr_timesheet_invoice_factor,account.group_account_invoice,1,1,1,1
+access_report_analytic_account_close,report.analytic.account.close,model_report_analytic_account_close,account.group_account_manager,1,0,0,0
+access_report_account_analytic_line_to_invoice,report.account.analytic.line.to.invoice,model_report_account_analytic_line_to_invoice,account.group_account_manager,1,0,0,0
+access_report_timesheet_user,report_timesheet.user,model_report_timesheet_user,base.group_hr_manager,1,1,1,1
+access_report_timesheet_account,report_timesheet.account,model_report_timesheet_account,base.group_hr_manager,1,1,1,1
+access_report_timesheet_account_date,report_timesheet.account.date,model_report_timesheet_account_date,base.group_hr_manager,1,1,1,1
+access_report_timesheet_invoice,report_timesheet.invoice,model_report_timesheet_invoice,base.group_hr_manager,1,1,1,1
+access_report_analytic_account_close_manager,report.analytic.account.close.manager,model_report_analytic_account_close,base.group_hr_manager,1,1,1,1
+access_report_account_analytic_line_to_invoice_manager,report.account.analytic.line.to.invoice.manager,model_report_account_analytic_line_to_invoice,base.group_hr_manager,1,1,1,1
+access_account_invoice_hr_user,account.invoice.hr.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
+access_account_invoice_tax_hr_manager,account.invoice.tax.hr.manager,account.model_account_invoice_tax,base.group_hr_manager,1,1,1,1
+access_report_timesheet_line_employee,report.timesheet.line.employee,model_report_timesheet_line,base.group_hr_user,1,1,1,1
+access_report_timesheet_line_employee_user,report.timesheet.line,model_report_timesheet_line,base.group_user,1,1,1,0
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 3421083a1cc..7299e283d6d 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Timesheets',
+    'name': 'Timesheets Validation',
     'version': '1.0',
     'category': 'Human Resources',
     'description': """
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 3e4b36380cc..8b9414d9b9d 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,9 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system_employee","hr_timesheet_sheet.sheet.system.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
-"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,1,1,0
-"access_timesheet_report","timesheet.report","model_timesheet_report","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
+access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
+access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,1,1
+access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0
+access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
+access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,1,1
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index c4a7f033993..eadff96babf 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden/Test",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],
diff --git a/addons/html_view/security/ir.model.access.csv b/addons/html_view/security/ir.model.access.csv
index e79e65bb4b5..4370c07b57a 100644
--- a/addons/html_view/security/ir.model.access.csv
+++ b/addons/html_view/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_html_view","html.view","model_html_view","base.group_system",1,0,0,0
-"access_html_view_sale_user","html.view user","model_html_view","base.group_sale_salesman",1,1,1,0
-"access_html_view_sale_manager","html.view manager","model_html_view","base.group_sale_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_html_view,html.view,model_html_view,base.group_system,1,0,0,0
+access_html_view_sale_user,html.view user,model_html_view,base.group_sale_salesman,1,1,1,0
+access_html_view_sale_manager,html.view manager,model_html_view,base.group_sale_manager,1,0,0,0
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index e482aa18d3a..9fdb3e8fffe 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Ideas Box',
+    'name': 'Ideas',
     'version': '0.1',
-    'category': 'Human Resources',
+    'category': 'Tools',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
@@ -53,7 +53,6 @@ Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
         'test/test_idea.yml'
     ],
     'installable': True,
-    'application': True,
     'certificate': '0071515601309',
     'images': ['images/1_ideas.jpeg','images/2_idea_categories.jpeg','images/3_vote_idea.jpeg'],
 }
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index b76cc9bd58a..989530277f6 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,8 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
-"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
-"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
-"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
-"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
-"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_idea_category_user,idea.category user,model_idea_category,base.group_tool_user,1,1,1,1
+access_idea_idea_user,idea.idea user,model_idea_idea,base.group_tool_user,1,1,1,1
+access_idea_vote_user,idea.vote user,model_idea_vote,base.group_tool_user,1,1,1,1
+access_idea_vote_stat_user,idea.vote.stat user,model_idea_vote_stat,base.group_tool_user,1,1,1,1
+access_idea_comment_user,idea.comment user,model_idea_comment,base.group_tool_user,1,1,1,1
+access_report_vote_manager,report.vote manager,model_report_vote,base.group_tool_manager,1,1,1,1
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index 78988d00fec..742e16dfe80 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Framework for complex import',
     'version': '0.9',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'description': """
         This module provide a class import_framework to help importing 
         complex data from other software
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index a0a15756ec3..fe469c94504 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -42,6 +42,5 @@
     ],
     'installable': True,
     'active': False,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/security/ir.model.access.csv b/addons/import_google/security/ir.model.access.csv
index 50b689efa69..cb0a8946d46 100644
--- a/addons/import_google/security/ir.model.access.csv
+++ b/addons/import_google/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_users_partner_manager","google.res.partner.manager","base.model_ir_model_data","base.group_partner_manager",1,1,1,0
-"access_ir_model_data_partner_manager","ir.model.data.partner.manager","base.model_res_users","base.group_partner_manager",1,1,0,0
-"access_google_import_message_partner_manager","google.import.message.partner.manager","model_google_import_message","base.group_partner_manager",1,1,0,0
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_users_partner_manager,google.res.partner.manager,base.model_ir_model_data,base.group_partner_manager,1,1,1,0
+access_ir_model_data_partner_manager,ir.model.data.partner.manager,base.model_res_users,base.group_partner_manager,1,1,0,0
+access_google_import_message_partner_manager,google.import.message.partner.manager,model_google_import_message,base.group_partner_manager,1,1,0,0
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index c0ad1ba250b..093331a1bbe 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Import Data from SugarCRM',
+    'name': 'SugarCRM Import',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv
index 20e93035b6c..5aadbf32950 100644
--- a/addons/import_sugarcrm/security/ir.model.access.csv
+++ b/addons/import_sugarcrm/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_import_sugarcrm_system","import.sugarcrm system","model_import_sugarcrm","base.group_system",1,1,1,1
-"access_import_message_system","import.message system","model_import_message","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_import_sugarcrm_system,import.sugarcrm system,model_import_sugarcrm,base.group_system,1,1,1,1
+access_import_message_system,import.message system,model_import_message,base.group_system,1,1,1,1
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 27333f59c41..e37419ffcaf 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
-    'category': 'Knowledge Management',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     "description": """
 Installer for knowledge-based Hidden.
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index 7a057fcfcbe..34255019afe 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,4 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_attachment_sale_manager,ir_attachment manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
+access_ir_attachment_partner_manager,ir_attachment_partner manager,base.model_ir_attachment,base.group_partner_manager,1,1,1,1
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 570841374d8..4cc109f814a 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Austria - Chart of Accounts",
+    "name" : "Austria - Accounting",
     "version" : "1.0",
     "author" : "conexus.at",
-	"website" : "http://www.conexus.at",
-    "category" : "Localization/Account Charts",
+    "website" : "http://www.conexus.at",
+    "category" : "Localization",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.",
     "demo_xml" : [],
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index d4300186660..e4bdeccbd75 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{   'name': 'Belgium - Plan Comptable Minimum Normalise',
+{   'name': 'Belgium - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Belgium in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index d667cdfa126..488345869b2 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 {
-    'name': 'Belgian Payroll Rules',
-    'category': 'Localization/Payroll',
+    'name': 'Belgium - Payroll',
+    'category': 'Localization',
     'author': 'OpenERP SA',
     'depends': ['hr_payroll'],
     'version': '1.0',
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index c18f49817b5..2fde058b4be 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    'name': 'Add support for Belgian structured communication to Invoices',
+    'name': 'Belgium - Structured Communication',
     'version': '1.2',
     'license': 'AGPL-3',
     'author': 'Noviat',
-    'category' : 'Localization/Accounting',
+    'category' : 'Localization',
     'description': """
     
 Belgian localisation for in- and outgoing invoices (prereq to account_coda):
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 86ff4cd4e83..8b0c34f6b78 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -19,8 +19,8 @@
 #################################################################################
 
 {
-    'name': 'Brazilian Localization',
-    'category': 'Localization/Account Charts',
+    'name': 'Brazilian - Accounting',
+    'category': 'Localization',
     'description': """
 Base module for the Brazilian localization
 ==========================================
diff --git a/addons/l10n_br/security/ir.model.access.csv b/addons/l10n_br/security/ir.model.access.csv
index 2a1ecd6910f..9381bd449b3 100644
--- a/addons/l10n_br/security/ir.model.access.csv
+++ b/addons/l10n_br/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"l10n_br_account_cst","l10n_br_account.cst","model_l10n_br_account_cst","account.group_account_invoice",1,1,1,1
-"l10n_br_account_cst_template","l10n_br_account.cst.template","model_l10n_br_account_cst_template","account.group_account_invoice",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+l10n_br_account_cst,l10n_br_account.cst,model_l10n_br_account_cst,account.group_account_invoice,1,1,1,1
+l10n_br_account_cst_template,l10n_br_account.cst.template,model_l10n_br_account_cst_template,account.group_account_invoice,1,1,1,1
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index fbfadbf9755..430bc31c7c3 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 {
-    "name" : "Canada - English and French - Canadian Chart of Accounts",
+    "name" : "Canada - Accounting",
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index cde4d7d496d..4e1988e6c75 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Switzerland - localization with 2011 taxes",
+    "name" : "Switzerland - Accounting",
     "description" :  """
 Swiss localisation :
  - DTA generation for a lot of payment types
@@ -63,7 +63,7 @@ TODO :
 """,
     "version" : "6.1",
     "author" : "Camptocamp",
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     "website": "http://www.camptocamp.com",
 
     "depends" : [
diff --git a/addons/l10n_ch/security/ir.model.access.csv b/addons/l10n_ch/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/l10n_ch/security/ir.model.access.csv
+++ b/addons/l10n_ch/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 6a063505275..1057eae7807 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -18,9 +18,9 @@
 #
 ##############################################################################
 {
-    "name" : "中国会计科目表",
+    "name" : "中国会计科目表 - Accounting",
     "version" : "1.0",
-    "category": "Localization/Account Charts",
+    "category": "Localization",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 5fc4d80d7f7..6eb78017547 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -33,12 +33,12 @@
 ##############################################################################
 
 {
-    'name': 'Costa Rica - Chart of Accounts',
+    'name': 'Costa Rica - Accounting',
     'version': '0.1',
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 646836eba2a..45bcc7dd210 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -121,11 +121,11 @@
 
 
 {
-    "name" : "Deutschland - SKR03 and SKR04",
+    "name" : "Deutschland - Accounting",
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index f3dbf88289b..71f18c1e6f3 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -18,9 +18,9 @@
 #
 ##############################################################################
 {
-    'name': 'Ecuador - Accounting Chart',
+    'name': 'Ecuador - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index e2f5ad3402d..d68a465969e 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -22,11 +22,11 @@
 ##############################################################################
 
 {
-    "name" : "Spanish Charts of Accounts (PGCE 2008)",
+    "name" : "Spanish - Accounting (PGCE 2008)",
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 1bcb659c322..a7f5eea650d 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -26,18 +26,18 @@
 #
 ##############################################################################
 {
-    "name" : "France - Plan Comptable Général",
+    "name" : "France - Accounting",
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
 
 Credits: Sistheo Zeekom CrysaLEAD
 """,
-    "depends" : ['base', 'account', 'account_chart', 'base_vat'],
+    "depends" : ['base', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
     "init_xml" : [],
     "update_xml" : [
         "fr_report_demo.xml",
diff --git a/addons/l10n_fr/security/ir.model.access.csv b/addons/l10n_fr/security/ir.model.access.csv
index 13405e7ce76..3642d709040 100644
--- a/addons/l10n_fr/security/ir.model.access.csv
+++ b/addons/l10n_fr/security/ir.model.access.csv
@@ -1,5 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_fr_report_manager","l10n_fr.report account manager","model_l10n_fr_report","account.group_account_manager",1,1,1,1
-"access_l10n_fr_report_user","l10n_fr_report account user","model_l10n_fr_report","account.group_account_user",1,1,1,1
-"access_l10n_fr_line_manager","l10n_fr_line account manager","model_l10n_fr_line","account.group_account_manager",1,1,1,1
-"access_l10n_fr_line_user","l10n_fr.l10n_fr_line_account user","model_l10n_fr_line","account.group_account_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_fr_report_user,l10n_fr_report account user,model_l10n_fr_report,account.group_account_user,1,1,1,1
+access_l10n_fr_line_user,l10n_fr.l10n_fr_line_account user,model_l10n_fr_line,account.group_account_user,1,1,1,1
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
index 16d26995dc4..072f8f5c1ac 100644
--- a/addons/l10n_fr_rib/__openerp__.py
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'French RIB Bank Details',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'description': '''
 This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details).
 RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". The four standard RIB fields will then become mandatory:
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 72b1d2c7cc4..4ab134e18b9 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 {
-    "name" : "Greece - Normal Plan",
+    "name" : "Greece - Accounting",
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index d80c1fa80a7..c4f9ff0f0a4 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -33,9 +33,9 @@
 #
 
 {
-    'name': 'Guatemala - Plan contable general',
+    'name': 'Guatemala - Accounting',
     'version': '3.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 31d9344cb65..157d396a6ae 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -33,9 +33,9 @@
 #
 
 {
-    'name': 'Honduras - Plan contable general',
+    'name': 'Honduras - Accounting',
     'version': '0.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras.  It also includes taxes and the Lempira currency""",
     'author': 'Salvatore Josue Trimarchi Pinto',
     'website': 'http://trimarchi.co.cc',
@@ -49,6 +49,5 @@
     ],
     'demo_xml': [],
     'installable': True,
-    'certificate': '', 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 9aaec061319..6578eb2242a 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Indian Chart of Account",
+    "name": "India - Accounting",
     "version": "1.0",
     "description": """
 Indian Accounting : Chart of Account.
@@ -29,7 +29,7 @@ Indian Accounting : Chart of Account.
 Indian accounting chart and localization.
     """,
     "author": ['OpenERP SA', 'Axelor'],
-    "category": "Localization/Account Charts",
+    "category": "Localization",
     "depends": [
         "account",
         "account_chart"
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 2c5811a6915..5376896cf06 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -28,7 +28,7 @@
 ##############################################################################
 
 {
-    "name" : "Italy - Generic Chart of Accounts",
+    "name" : "Italy - Accounting",
     "version" : "0.1",
     "depends" : ['base_vat','account_chart','base_iban'],
     "author" : "OpenERP Italian Community",
@@ -39,7 +39,7 @@ Piano dei conti italiano di un'impresa generica.
 Italian accounting chart and localization.
     """,
     "license": "AGPL-3",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
         ],
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 7a4436e31c1..fdb9240c63c 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Luxembourg - Plan Comptable Minimum Normalise',
+    'name': 'Luxembourg - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index a9bd7ce557e..d1d2c5900c9 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name" : "Maroc - Plan Comptable Général",
+    "name" : "Maroc - Accounting",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_ma/security/ir.model.access.csv b/addons/l10n_ma/security/ir.model.access.csv
index da5da5f48a2..2c89d1d3692 100644
--- a/addons/l10n_ma/security/ir.model.access.csv
+++ b/addons/l10n_ma/security/ir.model.access.csv
@@ -1,5 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_ma_report_manager","l10n_ma.report account manager","model_l10n_ma_report","account.group_account_manager",1,1,1,1
-"access_l10n_ma_report_user","l10n_ma_report account user","model_l10n_ma_report","account.group_account_user",1,1,1,1
-"access_l10n_ma_line_manager","l10n_ma_line account manager","model_l10n_ma_line","account.group_account_manager",1,1,1,1
-"access_l10n_ma_line_user","l10n_ma.l10n_ma_line_account user","model_l10n_ma_line","account.group_account_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_ma_report_user,l10n_ma_report account user,model_l10n_ma_report,account.group_account_user,1,1,1,1
+access_l10n_ma_line_user,l10n_ma.l10n_ma_line_account user,model_l10n_ma_line,account.group_account_user,1,1,1,1
diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
index 197a416cc44..f7c3b4db1d7 100644
--- a/addons/l10n_multilang/__openerp__.py
+++ b/addons/l10n_multilang/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name" : "Multi language Chart of Accounts",
+    "name" : "Multi Language Chart of Accounts",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Localization/Account Charts',
+    "category": 'Hidden/Dependency',
     "description": """
     * Multi language support for Chart of Accounts, Taxes, Tax Codes , Journals, Accounting Templates,
         Analytic Chart of Accounts and Analytic Journals.
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index d56d5f570b1..1e8c3bdc9c8 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 {
-    "name" : "Mexico - Chart of Account",
+    "name" : "Mexico - Accounting",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 5635e16d6c3..951a8e45c68 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -86,9 +86,9 @@
 #   Changed naming of 7020 and 7030 to Kostprijs omzet xxxx
 
 {
-    "name" : "Netherlands - Grootboek en BTW rekeningen",
+    "name" : "Netherlands - Accounting",
     "version" : "1.5",
-    "category": "Localization/Account Charts",
+    "category": "Localization",
     "description": """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 0ec97ab7cb6..f9acc28db9e 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -21,11 +21,11 @@
 #
 ##############################################################################
 {
-    "name" : "Poland - Chart of Accounts",
+    "name" : "Poland - Accounting",
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 647b4b35449..69886777879 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 {
-    "name" : "Romania - Chart of Accounts",
+    "name" : "Romania - Accounting",
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "depends" : ["account_chart", 'base_vat'],
     "description": """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 0fa4631b1f1..197199092c9 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name" : "OHADA - The accounting chart ",
+    "name" : "OHADA - Accounting",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description": """This module implements the accounting chart for OHADA area.
     It allows any company or association to manage its financial accounting.
     Countries that use OHADA are the following:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 4ab8f7d355c..ea29b7cde13 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Thailand - Thai Chart of Accounts',
+    'name': 'Thailand - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index f6e253fffc2..1e205759a8b 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -20,9 +20,9 @@
 
 
 {
-    'name': 'UK Chart of Accounts - latest (Smartode/CT600)',
+    'name': 'UK - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 45ac68fc105..06c1ce9747e 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -23,10 +23,10 @@
 #
 ##############################################################################
 {
-    "name" : "Venezuela -Chart of Account",
+    "name" : "Venezuela - Accounting",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Localization/Account Charts",
+    "category" : "Localization",
     "description":
 '''
 This is the module to manage the accounting chart for Venezuela in OpenERP.
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 02092ffd366..363b0b3a2c2 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Human Resources",
+    "category" : "Tools",
     'description': """
     The base module to manage lunch
 
@@ -55,7 +55,6 @@
     "demo_xml": ['lunch_demo.xml'],
     "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
     "installable": True,
-    'application': True,
     "certificate" : "001292377792581874189",
     'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
 }
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 59670a8d1b1..72c06cceb2b 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
-"access_lunch_category_manager","lunch.category.user","model_lunch_category","base.group_tool_user",1,1,1,1
-"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
-"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
-"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_lunch_order_user,lunch.order user,model_lunch_order,base.group_tool_user,1,1,1,1
+access_lunch_cashmove_user,lunch.cashmove user,model_lunch_cashmove,base.group_tool_user,1,1,1,1
+access_report_lunch_amount_manager,report.lunch.amount manager,model_report_lunch_amount,base.group_tool_manager,1,1,1,1
+access_lunch_category_manager,lunch.category.user,model_lunch_category,base.group_tool_user,1,1,1,1
+access_report_lunch_order_manager,report.lunch.order manager,model_report_lunch_order,base.group_tool_manager,1,1,1,1
+access_lunch_product_user,lunch.product user,model_lunch_product,base.group_tool_user,1,1,1,1
+access_lunch_cashbox_user,lunch.cashbox user,model_lunch_cashbox,base.group_tool_user,1,1,1,1
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 94f2361d05d..8f4833c294f 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Emails Management',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 A generic email subsystem with message storage and queuing
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 159259f151d..fd00135816e 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -380,12 +380,16 @@ class mail_message(osv.osv):
 
         if 'To' in fields:
             msg['to'] = decode(msg_txt.get('To'))
+
         if 'Delivered-To' in fields:
             msg['to'] = decode(msg_txt.get('Delivered-To'))
 
         if 'CC' in fields:
             msg['cc'] = decode(msg_txt.get('CC'))
 
+        if 'Cc' in fields:
+            msg['cc'] = decode(msg_txt.get('Cc'))
+
         if 'Reply-To' in fields:
             msg['reply'] = decode(msg_txt.get('Reply-To'))
 
@@ -455,6 +459,7 @@ class mail_message(osv.osv):
         msg['sub_type'] = msg['subtype'] or 'plain'
         return msg
 
+
     def send(self, cr, uid, ids, auto_commit=False, context=None):
         """Sends the selected emails immediately, ignoring their current
            state (mails that have already been sent should not be passed
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c8f7da9a5bb..70b536296bf 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -58,6 +58,14 @@ class mail_thread(osv.osv):
         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', readonly=True),
     }
 
+    def message_capable_models(self, cr, uid, context=None):
+        ret_dict = {}
+        for model_name in self.pool.obj_list():
+            model = self.pool.get(model_name)
+            if 'mail.thread' in getattr(model, '_inherit', []):
+                ret_dict[model_name] = model._description        
+        return ret_dict
+
     def message_thread_followers(self, cr, uid, ids, context=None):
         """Returns a list of email addresses of the people following
            this thread, including the sender of each mail, and the
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index b508cd68d83..42c70da9f19 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mail_message","mail.message","model_mail_message",,1,0,0,0
-"access_mail_thread","mail.thread","model_mail_thread",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mail_message,mail.message,model_mail_message,,1,0,0,0
+access_mail_thread,mail.thread,model_mail_thread,,1,0,0,0
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 1f1995c52da..31d50dc61ac 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Marketing',
+    "category": 'Hidden/Dependency',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing/security/ir.model.access.csv b/addons/marketing/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/marketing/security/ir.model.access.csv
+++ b/addons/marketing/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 5f2155a07db..44646a07ead 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -64,7 +64,6 @@ Note: If you need demo data, you can install the marketing_campaign_crm_demo mod
         'test/marketing_campaign.yml',
      ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00421723279617928365',
     'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index b0157b76c51..9e54e06c5b1 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,21 +1,21 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
-"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
-"access_email_template_account_user","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
-"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
-"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
-"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_account_manager","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_marketing_campaign_admin,marketing.campaign,model_marketing_campaign,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_segment_campaignadmin,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_activity_campaignadmin,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_workitem_campaignadmin,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_transition_campaignadmin,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_analysis_campaignadmin,campaign.analysis,model_campaign_analysis,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_workitem_all,marketing.campaign.workitem,model_marketing_campaign_workitem,base.group_user,1,0,0,0
+access_email_template_user,email.template,model_email_template,marketing.group_marketing_user,1,1,0,0
+access_email_template_account_user,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_system,marketing.campaign system,model_marketing_campaign,base.group_system,1,0,0,0
+access_marketing_campaign_segment_system,marketing.campaign.segment system,model_marketing_campaign_segment,base.group_system,1,0,0,0
+access_marketing_campaign_workitem_system,marketing.campaign.workitem system,model_marketing_campaign_workitem,base.group_system,1,0,0,0
+access_marketing_campaign_manager,marketing.campaign,model_marketing_campaign,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_segment_campaign_manager,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_activity_campaign_manager,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_workitem_campaign_manager,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_transition_campaign_manager,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_analysis_campaign_manager,campaign.analysis,model_campaign_analysis,marketing.group_marketing_manager,1,1,1,1
+access_email_template_manager,email.template,model_email_template,marketing.group_marketing_manager,1,1,1,1
+access_email_template_account_manager,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_manager,1,1,1,1
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index d394088aca5..a47ac040656 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Marketing Campaign, demo data",
+    "name" : "Marketing Campaign - Demo",
     "version" : "1.0",
     "depends" : ["marketing_campaign",
                  "crm",
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 3e78b4775ab..0012ec2d0b4 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Membership',
+    'name': 'Membership Management',
     'version': '0.1',
     'category': 'Association',
     'description': """
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index f3d91646c44..d53e57a5151 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
-"access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
-"access_report_membership","report.membership","model_report_membership","base.group_partner_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_membership_membership_line_partner_manager,membership.membership_line partner_manager,model_membership_membership_line,base.group_partner_manager,1,1,1,1
+access_membership_membership_line,membership.membership_line,model_membership_membership_line,,1,0,0,0
+access_report_membership,report.membership,model_report_membership,base.group_partner_manager,1,0,0,0
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index c9311b701a2..588ba103f04 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Manufacturing Resource Planning",
+    "name" : "MRP",
     "version" : "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index ea6d44026ab..9956aae4ffe 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -9,11 +9,10 @@
                 <form string="Manufacturing board">
                     <board style="2-1">
                         <column>
-                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders" creatable="true"/>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
+                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders" creatable="true"/>
                         </column>
                         <column>
-                            <action name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load"/> <!--groups="base.group_extended"-->
                             <action name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
                         </column>
                     </board>
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index feee2db4426..4600dbaa8c6 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 08:21+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 09:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-12-07 04:51+0000\n"
-"X-Generator: Launchpad (build 14435)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -31,6 +31,11 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
@@ -40,22 +45,22 @@ msgstr "Mjesto gdje sistem traži komponente"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "Iskorištenje Radnih Centara"
+msgstr "Iskorištenost radnih centara"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Slijed Radnih Centara"
+msgstr "Radni centri usmjeravanja"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Planiranje resursa proizvodnje"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "Br. Ciklusa"
+msgstr "Br. ciklusa"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
@@ -68,12 +73,14 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
+"'Pravilo minimalne zalihe' omogućuje automatsko kreiranje naloga nabave kada "
+"nivo zalihe dostigne definirani minimum."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Skladišnica"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -90,7 +97,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "Otpad"
+msgstr "Otpis proizvoda"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -102,22 +109,22 @@ msgstr "Dan"
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr ""
+msgstr "Usmjeravanja"
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Proizvod radnog centra"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Pretraži Listu Materijala"
+msgstr "Traži sastavnice"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "For stockable products and consumables"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -130,6 +137,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -137,18 +146,18 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "Referenca"
+msgstr "Vezna oznaka"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr "Gotovi Proizvodi"
+msgstr "Gototvi proizvodi"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr "Za Kupiti"
+msgstr "Za nabaviti"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -165,17 +174,17 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
-msgstr ""
+msgstr "Sustav automatski pokreče RFQ na preferiranog dobavljača."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr "Proizvodi za Završiti"
+msgstr "Proizvodi za završiti"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr "Set / Pakovanje"
+msgstr "Set / Paket"
 
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
@@ -188,12 +197,12 @@ msgstr "MRP Podproizvodi"
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Stanje"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr "Trošak po Stu"
+msgstr "Trošak po satu"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -201,7 +210,7 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
-"U slučaju da je metoda nabave proizvoda Proizvodnja, sistem kreira nalog za "
+"Kada je metoda nabave proizvoda Proizvodnja, sistem kreira nalog za "
 "proizvodnju."
 
 #. module: mrp
@@ -217,7 +226,7 @@ msgstr "JM"
 #: field:mrp.production.order,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "Količina proizvoda"
+msgstr "Količina"
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -225,6 +234,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Ispunite ovaj proizvod kako b jednostavno  pratili troškove proizvodnje  "
+"unutar analitike računovodstva."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -244,7 +255,7 @@ msgstr "Izvještavanje"
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr "Račun Ciklusa"
+msgstr "Konto ciklusa"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -260,7 +271,7 @@ msgstr "["
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr "Nabava servisa"
+msgstr "Nabava usluga"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -270,7 +281,7 @@ msgstr "Informacija o kapacitetu"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Odredišna Lokacija"
+msgstr "Odredišna lokacija"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -280,7 +291,7 @@ msgstr "naslov"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr "Matični Podaci"
+msgstr "Glavni podaci"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -288,11 +299,13 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "Referenca Parnera"
+msgstr "Oznaka partnera"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -337,7 +350,7 @@ msgstr "Lipanj"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Proizvedi Proizvod"
+msgstr "Proizvedi proizvod"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -353,12 +366,12 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr "Nabava skladištivog Proizvoda"
+msgstr "Nabava uskladištivog proizvoda"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr "Predefinirana JM"
+msgstr "Uobičajena JM"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -377,7 +390,7 @@ msgstr "Broj sati"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "Potvrdi Proizvodnju"
+msgstr "Potvrdi proizvodnju"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
@@ -385,6 +398,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"Sistem kreira nalog (za proizvodnju ili nabavu) prema prodanim količinama i "
+"parametrima proizvoda."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -392,6 +407,8 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -411,7 +428,7 @@ msgstr "Radno vrijeme"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr "Tjedna Varijacija Vrijednosti Zalihe"
+msgstr "Tjedna varijacija vrijednosti zalihe"
 
 #. module: mrp
 #: help:mrp.installer,mrp_repair:0
@@ -425,12 +442,12 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
-msgstr "Planirani Datum"
+msgstr "Planirani datum"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Lista Materijala"
+msgstr "Sastavnica"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -439,21 +456,24 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
 
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Stock Value Variation"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Struktura Liste Materijala"
+msgstr "Struktura sastavnice"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr "Tip proizvoda je servis"
+msgstr "Tip proizvoda je usluga"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -461,16 +481,18 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
 msgstr ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Dekompozicija proizvodnje"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr "Za Servise"
+msgstr "Za usluge."
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -484,6 +506,8 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -494,7 +518,7 @@ msgstr "Broj ciklusa"
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr "Zahtjev za Ponudu"
+msgstr "Zahtjev za ponudom"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -502,32 +526,34 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
 
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Pogreška: Nevažeći EAN kod"
+msgstr "Greška: Neispravan barkod!"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr ""
+msgstr "Lokacija proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Promjeni kol."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr ""
+msgstr "Force Reservation"
 
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: mrp
 #: field:report.mrp.inout,value:0
@@ -537,12 +563,12 @@ msgstr "Vrijednost Zalihe"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr ""
+msgstr "Proizvod BoM Struktura"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr "Pretraži Proizvodnju"
+msgstr "Traži proizvodnju"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -558,36 +584,36 @@ msgstr "Ožujak"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "BoM Hierarchy"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
+msgstr "Produce"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "Trošak radnog centra po ciklusu."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Skladišna iznimka"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr ""
+msgstr "BoM Lines"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr ""
+msgstr "Time before prod."
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -595,11 +621,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Usmjeravanje materijala"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -607,7 +635,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
-msgstr "Utrošeni Proizvodi"
+msgstr "Utrošeni proizvodi"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -619,7 +647,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Opterećenje Radnog Centra"
+msgstr "Opterećenje radnog centra"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -631,7 +659,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "Komponente Liste Materijala"
+msgstr "Komponente sastavnice"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
@@ -656,16 +684,20 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr ""
+msgstr "Vrijeme u satima za jedan ciklus."
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "Ozn. sastavnice"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -678,7 +710,7 @@ msgstr "U proizvodnji"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Glavna sastavnica"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -686,6 +718,7 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"JP proizvoda (Jedinica Prodaje) je mjerna jedinica za fakturiranje prodaje."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -697,7 +730,7 @@ msgstr "Ispis"
 #: view:mrp.bom:0
 #: view:mrp.workcenter:0
 msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:150
@@ -709,7 +742,7 @@ msgstr "Ukupni Trošak "
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Vezano na 'Pravilo minimalne zalihe' metodu nabave."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -727,7 +760,7 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr "Ime Proizvoda"
+msgstr "Naziv proizvoda"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:491
@@ -738,7 +771,7 @@ msgstr "Pogrešna akcija !"
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
-msgstr ""
+msgstr "A factor of 0.9 means a loss of 10% within the production process."
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -756,12 +789,12 @@ msgstr "Datum ispisa"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr ""
+msgstr "ZZP (RFQ)"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Pravilo nabave"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -790,6 +823,9 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -800,12 +836,12 @@ msgstr "Hitno"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Work Center Usage"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr "Nalog za Proizvodnju"
+msgstr "Nalog proizvodnje"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -823,19 +859,19 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr "Ukupno Ciklusa"
+msgstr "Ukupno ciklusa"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Ready to Produce"
-msgstr "Spremno za Proizvodnju"
+msgstr "Spremno za proizvodnju"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
 msgid "Modification name"
-msgstr "Ime promjene"
+msgstr "Naziv promjene"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -847,7 +883,7 @@ msgstr "Datum"
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr ""
+msgstr "BoM Type"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -865,7 +901,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr "Traži"
+msgstr "Search"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -875,30 +911,30 @@ msgstr "Broj Ciklusa"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr "Tvrtke"
+msgstr "Organizacije"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Minimalna zaliha"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
-msgstr "Kontrolna ploča"
+msgstr "Kokpit"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr "Buduće Opterećenje Radnog Centra"
+msgstr "Buduće opterećenje radnog centra"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
-msgstr "Uskladištivi proizvod"
+msgstr "Stockable Product"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -914,7 +950,7 @@ msgstr "Šifra"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "Br. Sati"
+msgstr "Br. sati"
 
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
@@ -925,7 +961,7 @@ msgstr ""
 #: view:mrp.property:0
 #: view:mrp.property.group:0
 msgid "Property Group"
-msgstr "Grupa Svojstava"
+msgstr "Grupa svojstava"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -935,7 +971,7 @@ msgstr "Kol."
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr "Plan Proizvodnje"
+msgstr "Plan proizvodnje."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -957,7 +993,7 @@ msgstr ""
 #: view:mrp.production:0
 #: view:mrp.workcenter.load:0
 msgid "Cancel"
-msgstr "Otkaži"
+msgstr "Odustani"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -970,6 +1006,8 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -977,11 +1015,13 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Ako je usluga koristi način opskrbe \"Kupovina\", stvara se RFQ, "
+"podugovaranje potražnje za primjer"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr "Premjesti Proizvod"
+msgstr "Premjesti proizvod"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -991,7 +1031,7 @@ msgstr "Kasni"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr ""
+msgstr "Sa skladišta (MTS)"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
@@ -1002,28 +1042,28 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "BOM Name"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Start Production"
-msgstr "Pokreni Proizvodnju"
+msgstr "Pokreni proizvodnju"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "Upravljačka ploča proizvodnje"
+msgstr "Kokpit proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Lok. izvora"
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr "Interna Referenca"
+msgstr "Interna oznaka"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1035,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr "Struktura Proizvoda"
+msgstr "Struktura proizvoda"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1064,7 +1104,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr "Način"
+msgstr "Mode"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1074,7 +1114,7 @@ msgstr "]"
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
 msgid "Amount measuring unit"
-msgstr ""
+msgstr "Mjerna jedinica iznosa"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
@@ -1086,6 +1126,12 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
 
 #. module: mrp
 #: constraint:mrp.production:0
@@ -1095,7 +1141,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr "Nalozi za Proizvodnju u Radu"
+msgstr "Nalozi proizvodnje u tijeku"
 
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@@ -1139,7 +1185,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr "Nalozi za Proizvodnju koji čekaju Proizvode"
+msgstr "Nalozi proizvodnje koji čekaju proizvode"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1160,19 +1206,19 @@ msgstr "Trašak Ciklusa"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Količina u ciklusima"
+msgstr "Iznos u ciklusima"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 #: view:mrp.production.order:0
 #: field:mrp.production.order,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "Lokacija Završenih Proizvoda"
+msgstr "Lokacija gotovih proizvoda"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr "Resursi"
+msgstr "Sredstva"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1184,7 +1230,7 @@ msgstr "Dnevnik analitike"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr "Radni Centri"
+msgstr "Radni centri"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1199,6 +1245,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1208,7 +1258,7 @@ msgstr "Broj Sati"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr "Operacije Radnih Centara"
+msgstr "Operacije radnog centra"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1222,7 +1272,7 @@ msgstr "Bilješke"
 #: field:mrp.production.order,bom_id:0
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
-msgstr "Lista Materijala"
+msgstr "Sastavnica"
 
 #. module: mrp
 #: view:mrp.workcenter.load:0
@@ -1237,7 +1287,7 @@ msgstr "Opterećenje radnog centra"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Lokacija gotovih proizvoda"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -1245,6 +1295,8 @@ msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
 msgstr ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
@@ -1254,7 +1306,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr "Prijenos Zaliha"
+msgstr "Skladišni prijenosi"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1263,11 +1315,14 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
-msgstr ""
+msgstr "Dan po dan"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1288,7 +1343,7 @@ msgstr "Prioritet"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr "Lista odabira"
+msgstr "Skladišni dokument"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1304,7 +1359,7 @@ msgstr "Nalog za Proizvodnju '%s' je planiran za %s."
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr ""
+msgstr "Production Order N° :"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:630
@@ -1315,19 +1370,19 @@ msgstr "Nalog za Proizvodnju '%s' je spreman za proizvodnju."
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Production Scheduled Product"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr ""
+msgstr "Rezervni dani za svaku operaciju proizvodnje"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
 #: model:process.transition,name:mrp.process_transition_servicemts0
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Sa skladišta (MTS)"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -1343,24 +1398,29 @@ msgid ""
 "product needs. You can either create a bill of materials to define specific "
 "production steps or define a single multi-level bill of materials."
 msgstr ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
-msgstr ""
+msgstr "Kada je Metoda nabave \"Kupi\", sistem kreira nalog za nabavu."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
 #: view:mrp.product_price:0
 msgid "Product Cost Structure"
-msgstr ""
+msgstr "Struktura troška proizvoda"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -1376,7 +1436,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Radni centri proizvodnje"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1393,28 +1453,28 @@ msgstr ""
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Search for mrp workcenter"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr ""
+msgstr "BoM Structure"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 #: field:mrp.production.order,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
-msgstr ""
+msgstr "Hour Account"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Odredišna lokacija"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
@@ -1424,24 +1484,24 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Procure Products"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Opterećenje radnog centra"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1452,13 +1512,13 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "Svojstva"
 
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
 "Reference of the document that generated this production order request."
-msgstr ""
+msgstr "Dokument koji je generirao ovaj nalog za proizvodnju."
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1467,21 +1527,24 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Dodatne Informacije"
+msgstr "Dodatni Podaci"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Promijeni količine proizvoda"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Upravlja nalozima nabave za sirovine."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1491,19 +1554,19 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Konto glavne knjige"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr ""
+msgstr "SO Number"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
@@ -1515,13 +1578,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Not urgent"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1533,7 +1596,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Naloz za Proizvodnju Za Pokrenuti"
+msgstr "Ne pokrenuti nalozi proizvodnje"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:491
@@ -1548,12 +1611,12 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Radni centar"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
-msgstr ""
+msgstr "Kapacitet po ciklusu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_product_product
@@ -1566,30 +1629,30 @@ msgstr ""
 #: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Uk. sati"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 #: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
-msgstr ""
+msgstr "Lokacija sirovina"
 
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Print Cost Structure of Product."
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "JP Proizvoda"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -1602,7 +1665,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Utroši proizvode"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1610,14 +1673,14 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "JM proizvoda"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Po narudžbi (MTO)"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
@@ -1634,29 +1697,29 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr ""
+msgstr "Proizvodnja proizvoda"
 
 #. module: mrp
 #: field:mrp.production,date_finished:0
 #: field:mrp.production.order,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr ""
+msgstr "Valjanost Bom ili komponente. Držite prazno ako je uvijek valjan."
 
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "JP Proizvoda"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1667,7 +1730,7 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "Very Urgent"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1677,37 +1740,41 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Properties categories"
 
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "Definira poredak radnih naloga u popisu."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr "Planirani Proizvodi"
+msgstr "Planirani proizvodi"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr ""
+msgstr "Production Products Consommation"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1716,7 +1783,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr "Nalozi za Proizvodnju"
+msgstr "Nalozi za proizvodnju"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1727,29 +1794,34 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
 
 #. module: mrp
 #: view:mrp.production:0
 #: report:mrp.production.order:0
 msgid "Work Orders"
-msgstr "Radni Nalozi"
+msgstr "Radni nalozi"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
 msgid "Cost per cycle"
-msgstr ""
+msgstr "Cost per cycle"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1761,6 +1833,7 @@ msgstr ""
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1769,6 +1842,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1779,12 +1855,12 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr ""
+msgstr "Time for 1 cycle (hour)"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1793,50 +1869,50 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Production Order"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Pravilo automatske nabave"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
-msgstr ""
+msgstr "Compute Data"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "Količina JP"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Components"
 
 #. module: mrp
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr ""
+msgstr "BOM Struktura"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr ""
+msgstr "Valid Until"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr ""
+msgstr "Valid From"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr ""
+msgstr "Normal BoM"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
@@ -1847,7 +1923,7 @@ msgstr "Pripremno vrijeme proizvodnje"
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr ""
+msgstr "Količina JP"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -1856,21 +1932,24 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
 
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr "Efikasnost Proizvodnje"
+msgstr "Efikasnost proizvodnje"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1878,17 +1957,19 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr ""
+msgstr "Zaokruživanje decimala"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Radni nalog"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1900,12 +1981,12 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Samo za utrošiti"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
-msgstr ""
+msgstr "Ponovo kreiraj prijenos"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -1916,11 +1997,16 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
 
 #. module: mrp
 #: field:mrp.bom,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metoda"
 
 #. module: mrp
 #: help:mrp.production,state:0
@@ -1933,62 +2019,68 @@ msgid ""
 " When the production gets started then the state is set to 'In Production'.\n"
 " When the production is over, the state is set to 'Done'."
 msgstr ""
+"Nakon kreiranja nalog za proizvodnju je u stanju 'Nacrt'.\n"
+" Potvrđeni nalozi su u stanju 'Na čekanju' (materijala).\n"
+" U slučaju iznimki stanje je 'Skladišna iznimka'. \n"
+" Ako je zaliha dostatna za proizvodnju stanje je 'Spremno za proizvodnju'.\n"
+" Kad je proizvodnja pokrenuta stanje je  'U proizvodnji'.\n"
+" Izvršeni nalozi su u stanju 'Izvršen'."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr ""
+msgstr "Na nalogu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Postava"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr ""
+msgstr "Vrijeme nakon prod."
 
 #. module: mrp
 #: field:mrp.workcenter.load,time_unit:0
 msgid "Type of period"
-msgstr ""
+msgstr "Type of period"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr ""
+msgstr "Ukupna kol."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Broj sati"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Costing Information"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Zaokruživanje se primjenjuje na količinu proizvoda."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Prijenos iz proizvodnje ili naloga za nabavu."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr ""
+msgstr "Nadređeno usmjeravanje"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -1998,7 +2090,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "Vrijeme u satima za pripremu."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2014,7 +2106,7 @@ msgstr ""
 #: field:mrp.bom.revision,bom_id:0
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "BoM"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2026,25 +2118,25 @@ msgstr "Varijacija vrijednosti Zalihe"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Dodjela sa skladišta"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Waiting Goods"
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr ""
+msgstr "last indice"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
 #: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr ""
+msgstr "BoM Revisions"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2056,7 +2148,7 @@ msgstr ""
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr "Tjedni"
+msgstr "Week"
 
 #. module: mrp
 #: field:mrp.installer,progress:0
@@ -2067,24 +2159,24 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normalan"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr "Koraci Proizvodnje"
+msgstr "Koraci proizvodnje"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Cost Structure"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Utroši i proizvedi"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2094,7 +2186,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Nadređena sastavnica"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
@@ -2103,6 +2195,9 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2112,7 +2207,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Product type is Stockable or Consumable."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:591
@@ -2125,7 +2220,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Odaberi količinu"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2133,7 +2228,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr ""
+msgstr "Sastavnica"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -2142,22 +2237,25 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revizija sastavnice"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 #: view:mrp.workcenter:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:194
@@ -2171,6 +2269,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2182,7 +2282,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr ""
+msgstr "Usmjeravanje"
 
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
@@ -2192,12 +2292,12 @@ msgstr "Proizvodne Operacije"
 #. module: mrp
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Zakazani datum"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2208,27 +2308,32 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the the needs."
 msgstr ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the the needs."
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Nabave s iznimkama"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "'Minimum stock rule' material"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Cijena proizvoda"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@@ -2238,18 +2343,18 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Split in Production lots"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Promjeni količinu"
 
 #. module: mrp
 #: view:change.production.qty:0
 #: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
-msgstr ""
+msgstr "Promjeni kol. proizvoda"
 
 #. module: mrp
 #: view:mrp.bom.revision:0
@@ -2262,7 +2367,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2272,12 +2377,12 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr "Ploča proizvodnje"
+msgstr "Kokpit proizvodnje"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Planirani datum završetka"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2286,11 +2391,14 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Način nabave ovisi o vrsti proizvoda"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2300,7 +2408,7 @@ msgstr "Proizvodnja"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Next Production Orders"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2311,7 +2419,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Grupe svojstava"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2324,16 +2432,18 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
 msgid "Time in hours for the cleaning."
-msgstr ""
+msgstr "Završno vrijeme u satima za čišćenje."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Automatski ZZP (zahtjev za ponudom)"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2341,6 +2451,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Ako je metoda nabave usluge 'Proizvedi' kreirati će zadatak u modulu "
+"upravljanja projektima."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2349,6 +2461,9 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2356,11 +2471,13 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr ""
+msgstr "Na skladištu"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -2368,17 +2485,17 @@ msgstr ""
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
+msgstr "Daje poredak u prikazu sastavnica."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2386,7 +2503,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Proizvodi za utrošiti"
 
 #. module: mrp
 #: view:mrp.production.order:0
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 09e15ebf39f..b7e51dd7cf0 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -41,14 +41,6 @@
                 </search>
             </field>
         </record>
-        <record id="action_report_workcenter_load_tree" model="ir.actions.act_window">
-            <field name="name">Work Center Loads</field>
-            <field name="res_model">report.workcenter.load</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="search_view_id" ref="view_workcenter_load_search"/>
-            <field name="help">Work Center Loads gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles.</field>
-        </record>
         <menuitem id="next_id_77" name="Reporting"
             parent="base.menu_mrp_root" sequence="49"/>
 
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 1d93fb460b5..4289010d165 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,94 +1,83 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
-"access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
-"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
-"access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_salesman","mrp.production salesman","model_mrp_production","base.group_sale_salesman",1,1,1,0
-"access_mrp_production_product_line_salesman","mrp.production.product.line salesman","model_mrp_production_product_line","base.group_sale_salesman",1,0,1,0
-"access_mrp_production_workcenter_line_salesman","mrp.production.workcenter.line salesman","model_mrp_production_workcenter_line","base.group_sale_salesman",1,0,1,0
-"access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
-"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
-"access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
-"access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
-"access_stock_picking_mrp_worker","stock.picking mrp_worker","stock.model_stock_picking","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0
-"access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0
-"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
-"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
-"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
-"access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
-"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
-"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_manager","product.product manager","product.model_product_product","mrp.group_mrp_manager",1,0,0,0
-"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
-"access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
-"access_product_product_user","product.product user","product.model_product_product","mrp.group_mrp_user",1,0,0,0
-"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,0,0,0
-"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,0,0,0
-"access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1
-"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,0,0,0
-"access_stock_tracking","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_user",1,1,1,0
-"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,0,0,0
-"access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
-"access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
-"access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
-"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
-"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,0,0,0
-"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,0,0,0
-"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,0,0,0
-"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
-"access_product_template_manager","product.template mgr","product.model_product_template","mrp.group_mrp_manager",1,0,0,0
-"access_product_uom_manager","product.uom user","product.model_product_uom","mrp.group_mrp_manager",1,0,0,0
-"access_product_supplierinfo_manager","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_manager",1,0,0,0
-"access_res_partner_address_manager","res.partner.address","base.model_res_partner_address","mrp.group_mrp_manager",1,0,0,0
-"access_stock_tracking_manager","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_manager",1,0,0,0
-"access_res_partner_manager","res.partner","base.model_res_partner","mrp.group_mrp_manager",1,0,0,0
-"access_product_puom_categ_manager","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_manager",1,0,0,0
-"access_resource_resource_manager","resource.resource","resource.model_resource_resource","mrp.group_mrp_manager",1,0,0,0
-"access_board_board_manager","mrp.board.board","board.model_board_board","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
-"access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
-"access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
-"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
-"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
-"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
-"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
-"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
-"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
-"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
-"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
-"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
-"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
-"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
-"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
-"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
-"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
-"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
-"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,0
-"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
-"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
-"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
-"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
-"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
-"access_purchase_order_stock_user","purchase.order stock user","purchase.model_purchase_order","stock.group_stock_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0
+access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
+access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
+access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
+access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
+access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
+access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
+access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
+access_mrp_production_workcenter_line_salesman,mrp.production.workcenter.line salesman,model_mrp_production_workcenter_line,base.group_sale_salesman,1,0,1,0
+access_mrp_property_group,mrp.property.group,procurement.model_mrp_property_group,mrp.group_mrp_manager,1,1,1,1
+access_mrp_property,mrp.property,procurement.model_mrp_property,mrp.group_mrp_manager,1,1,1,1
+access_mrp_production_product_line,mrp.production.product.line,model_mrp_production_product_line,mrp.group_mrp_user,1,1,1,1
+access_procurement,procurement.order,model_procurement_order,mrp.group_mrp_user,1,1,1,1
+access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_manager,1,1,1,1
+access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
+access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
+access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
+access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
+access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
+access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
+access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
+access_stock_warehouse,stock.warehouse mrp_worker,stock.model_stock_warehouse,mrp.group_mrp_user,1,0,0,0
+access_account_analytic_journal_mrp_worker,account.analytic.journal mrp_worker,account.model_account_analytic_journal,mrp.group_mrp_user,1,0,0,0
+access_account_account,account.account mrp_worker,account.model_account_account,mrp.group_mrp_user,1,0,0,0
+access_purchase_order_mrp_worker,purchase.order mrp_worker,purchase.model_purchase_order,mrp.group_mrp_user,1,0,0,0
+access_purchase_order_line_mrp_worker,purchase.order.line mrp_worker,purchase.model_purchase_order_line,mrp.group_mrp_user,1,0,0,0
+access_hr_timesheet_group_mrp_worker,resource.calendar mrp_manager,resource.model_resource_calendar,mrp.group_mrp_manager,1,1,1,1
+access_procurement_stock_worker,procurement.order stock_worker,model_procurement_order,stock.group_stock_user,1,1,1,1
+access_procurement_user,procurement.order.user,model_procurement_order,base.group_user,1,1,1,1
+access_mrp_production_stock_worker,mrp.production stock_worker,model_mrp_production,stock.group_stock_user,1,0,0,0
+access_report_workcenter_load,report.workcenter.load,model_report_workcenter_load,mrp.group_mrp_manager,1,1,1,1
+access_report_mrp_inout,report.mrp.inout,model_report_mrp_inout,mrp.group_mrp_manager,1,1,1,1
+access_ir_property_manager,ir.property manager,base.model_ir_property,mrp.group_mrp_manager,1,1,1,1
+access_account_sequence_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,mrp.group_mrp_user,1,1,1,1
+access_product_product_user,product.product user,product.model_product_product,mrp.group_mrp_user,1,0,0,0
+access_product_template_user,product.template user,product.model_product_template,mrp.group_mrp_user,1,0,0,0
+access_product_uom_user,product.uom user,product.model_product_uom,mrp.group_mrp_user,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1
+access_res_partner_address,res.partner.address,base.model_res_partner_address,mrp.group_mrp_user,1,0,0,0
+access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0
+access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0
+access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
+access_resource_calendar_leaves_user,mrp.resource.calendar.leaves.user,resource.model_resource_calendar_leaves,mrp.group_mrp_user,1,1,1,1
+access_resource_calendar_leaves_manager,mrp.resource.calendar.leaves.manager,resource.model_resource_calendar_leaves,mrp.group_mrp_manager,1,0,0,0
+access_resource_calendar_attendance_manager,mrp.resource.calendar.attendance.manager,resource.model_resource_calendar_attendance,mrp.group_mrp_manager,1,1,1,1
+access_product_puom_categ,product.uom.categ,product.model_product_uom_categ,mrp.group_mrp_user,1,0,0,0
+access_resource_resource,resource.resource,resource.model_resource_resource,mrp.group_mrp_user,1,0,0,0
+access_board_board_user,mrp.board.board,board.model_board_board,mrp.group_mrp_user,1,0,0,0
+access_account_sequence_fiscalyear_manager,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
+access_product_supplierinfo_manager,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_manager,1,0,0,0
+access_stock_tracking_manager,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_manager,mrp.production manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
+access_procurement_manager,procurement.order,model_procurement_order,mrp.group_mrp_manager,1,0,0,0
+access_workcenter_manager,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
+access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_product_line_manager,mrp.production.product.line manager,model_mrp_production_product_line,mrp.group_mrp_manager,1,0,0,0
+access_account_sequence_fiscalyear_system,account.sequence.fiscalyear.system,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
+access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
+access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_manager,1,0,0,0
+access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0
+access_report_mrp_inout_user,report.mrp.inout user,model_report_mrp_inout,mrp.group_mrp_user,1,0,0,0
+access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0
+access_mrp_bom_salesman,mrp.bom,model_mrp_bom,base.group_sale_salesman,1,0,0,0
+access_mrp_bom_stockuser,mrp.bom,model_mrp_bom,stock.group_stock_user,1,0,0,0
+access_product_uom_categ_mrp_manager,product.uom.categ mrp_manager,product.model_product_uom_categ,mrp.group_mrp_manager,1,1,1,1
+access_product_uom_mrp_manager,product.uom mrp_manager,product.model_product_uom,mrp.group_mrp_manager,1,1,1,1
+access_product_ul_mrp_manager,product.ul mrp_manager,product.model_product_ul,mrp.group_mrp_manager,1,1,1,1
+access_product_category_mrp_manager,product.category mrp_manager,product.model_product_category,mrp.group_mrp_manager,1,1,1,1
+access_product_template_mrp_manager,product.template mrp_manager,product.model_product_template,mrp.group_mrp_manager,1,1,1,1
+access_product_product_mrp_manager,product.product mrp_manager,product.model_product_product,mrp.group_mrp_manager,1,1,1,1
+access_product_packaging_mrp_manager,product.packaging mrp_manager,product.model_product_packaging,mrp.group_mrp_manager,1,1,1,1
+access_pricelist_partnerinfo_mrp_manager,pricelist.partnerinfo mrp_manager,product.model_pricelist_partnerinfo,mrp.group_mrp_manager,1,1,1,1
+access_product_price_type_mrp_manager,product.price.type mrp_manager,product.model_product_price_type,mrp.group_mrp_manager,1,1,1,1
+access_product_pricelist_type_mrp_manager,product.pricelist.type mrp_manager,product.model_product_pricelist_type,mrp.group_mrp_manager,1,1,1,1
+access_product_pricelist_mrp_manager,product.pricelist mrp_manager,product.model_product_pricelist,mrp.group_mrp_manager,1,1,1,1
+access_ir_property_group_product_mrp_manager,ir_property group_product_mrp_manager,base.model_ir_property,mrp.group_mrp_manager,1,1,1,1
+access_product_group_res_partner_mrp_manager,res_partner group_mrp_manager,base.model_res_partner,mrp.group_mrp_manager,1,1,1,0
+access_product_pricelist_version_mrp_manager,product.pricelist.version mrp_manager,product.model_product_pricelist_version,mrp.group_mrp_manager,1,1,1,1
+access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,product.model_product_pricelist_item,mrp.group_mrp_manager,1,1,1,1
+access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
+access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
+access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
diff --git a/addons/mrp/static/src/img/icon.png b/addons/mrp/static/src/img/icon.png
new file mode 100644
index 00000000000..600104af507
--- /dev/null
+++ b/addons/mrp/static/src/img/icon.png
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index 6c845797ba4..9f965c216ea 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-12-22 12:16+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:29+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,3 +46,22 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul omogućuje Just in Time izračun naloga za nabavu.\n"
+"\n"
+"    Ako instalirate ovaj modul nećete više morati pokretati normalni planer "
+"\n"
+"    zahtjeva u nabavi (ali i dalje ćete morati pokrenuti planer pravila "
+"minimalne točke \n"
+"    naručivanja, ili ga postaviti da se npr. pokreće dnevno)\n"
+"    Svi zahtjevi za nabavom će se procesirati odmah, što može u nekim "
+"slučajevima\n"
+"    utjecati na brzinu rada.\n"
+"\n"
+"    Također može povećati veličinu vaših zaliha jer se artikli naručuju čim "
+"je to \n"
+"    moguće i raspon vremena planiranja se više ne uzima u obzir.\n"
+"    u tom slučaju ne možete koristiti prioritete kod različitih prijenosa.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index e9745098516..7a6d5bd3c42 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-10-15 09:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 10:24+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:31+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -23,17 +23,17 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Work Orders"
-msgstr ""
+msgstr "Radni nalozi"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancel the operation."
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
@@ -45,76 +45,76 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Information from the routing definition."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "Radni centri"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "Resume"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "Product to Produce"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr ""
+msgstr "Production Operation"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "Free Serialisation"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Mrp operacije"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Production Order"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Skladišna iznimka"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Creation of the work order"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:463
@@ -132,7 +132,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "The work orders are created on the basis of the production order."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
@@ -149,28 +149,28 @@ msgstr ""
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr ""
+msgstr "Potvrđeni radni nalozi"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr ""
+msgstr "Operations"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -178,7 +178,7 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -191,13 +191,13 @@ msgstr "U proizvodnji"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Radni nalog"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -205,11 +205,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Tu je 1 radni nalog po radnom centru. Podaci o broju ciklusa ili vrijeme "
+"ciklusa."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Month -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -232,7 +234,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Planiran datum"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:479
@@ -244,22 +246,22 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Količina"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr ""
+msgstr "Operation Name"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
@@ -270,16 +272,20 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Za proizvodnju ili sastavljanje proizvoda, i korištenje sirovina i gotovih "
+"proizvoda morate upravljatii proizvodnim operacijama. Proizvodne operacije "
+"često se nazivaju radnim nalozima. Različite operacije će imati različite "
+"utjecaje na troškove proizvodnje i planiranje, ovisno o raspoloživosti posla."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr ""
+msgstr "Future Work Orders"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:459
@@ -292,50 +298,50 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operation Cancelled"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Work Order Report"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Waiting Goods"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -351,53 +357,53 @@ msgstr "Pauza"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr "U Tijeku"
+msgstr "In Progress"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog proizvodnje"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Calendar View"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
-msgstr ""
+msgstr "Operaciju je moguće otkazati na kartici radnog naloga."
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr ""
+msgstr "Set Draft"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Ukupno ciklusa"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr ""
+msgstr "Šifra operacije proizvodnje"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:467
@@ -408,12 +414,12 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Započeto"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -451,7 +457,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:482
@@ -462,28 +468,28 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "Spremno za proizvodnju"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Children Moves"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "Work Orders Planning"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -493,22 +499,22 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Završi operacije."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:452
@@ -519,7 +525,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Information from the production order."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:452
@@ -533,13 +539,13 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:475
@@ -555,35 +561,35 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Operation Codes"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operacija izvršena"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: view:mrp.workorder:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "Start/Stop Barcode"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
@@ -594,36 +600,41 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr "pokreni operaciju"
+msgstr "Pokreni operaciju"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr "Obavijest"
+msgstr "Informacija"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Work Centers Barcode"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Kasni"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Kašnjenje"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -631,41 +642,41 @@ msgstr ""
 #: field:mrp.workorder,production_id:0
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Search Work Orders"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "Radni centar"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "Realan"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planirani datum"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Uk. sati"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -673,16 +684,18 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Provjerite mogućnost nezavisnog izvršavanja radnih naloga, bez izvršavanja "
+"ovisnih."
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Work Order Analysis"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -690,59 +703,59 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Dovršeno"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "JM"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Hours by Work Center"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Radno vrijeme(od-do)"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operacija otkazana"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Start the operation."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operation done"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "#Line Orders"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -750,32 +763,34 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"When the operation is finished, the operator updates the system by finishing "
+"the work order."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Detalji radnog naloga"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Stanje proizvodnje"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: mrp_operations
 #: constraint:mrp.production:0
@@ -785,7 +800,7 @@ msgstr ""
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
index c27d8fd66e5..54bfe482edb 100644
--- a/addons/mrp_operations/security/ir.model.access.csv
+++ b/addons/mrp_operations/security/ir.model.access.csv
@@ -1,10 +1,10 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_operations_operation_code","operations.operation.code","model_mrp_operations_operation_code","mrp.group_mrp_user",1,1,1,1
-"access_mrp_operations_operation_code_manager","operations.operation.code.manager","model_mrp_operations_operation_code","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_operations_operation","operations.operation","model_mrp_operations_operation","mrp.group_mrp_user",1,1,1,1
-"access_mrp_operations_operation_manager","operations.operation.manager","model_mrp_operations_operation","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_user","mrp_production_user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_manager","mrp_production_manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_workcenter_line","mrp.production.workcenter.line","mrp.model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_workcenter_line_manager","mrp.production.workcenter.line.manager","mrp.model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_workorder_manager","mrp.workorder.manager","model_mrp_workorder","mrp.group_mrp_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_operations_operation_code,operations.operation.code,model_mrp_operations_operation_code,mrp.group_mrp_user,1,1,1,1
+access_mrp_operations_operation_code_manager,operations.operation.code.manager,model_mrp_operations_operation_code,mrp.group_mrp_manager,1,0,0,0
+access_mrp_operations_operation,operations.operation,model_mrp_operations_operation,mrp.group_mrp_user,1,1,1,1
+access_mrp_operations_operation_manager,operations.operation.manager,model_mrp_operations_operation,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_user,mrp_production_user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
+access_mrp_production_manager,mrp_production_manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_workcenter_line,mrp.production.workcenter.line,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
+access_mrp_production_workcenter_line_manager,mrp.production.workcenter.line.manager,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
+access_mrp_workorder_manager,mrp.workorder.manager,model_mrp_workorder,mrp.group_mrp_manager,1,1,1,1
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index cf141b61978..39f5a51e92c 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -51,7 +51,6 @@ The aim is to have a complete module to manage all products repairs. The followi
     'demo_xml': [],
     'test': ['test/test_mrp_repair.yml', 'test/mrp_repair_report.yml','test/mrp_repair_cancel.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate': '0060814381277',
 }
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index f70205f2e7f..3a3a089e0bf 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-12 12:24+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:39+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Fees Line"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -35,11 +35,18 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" * 'Nacrt' je početno stanje naloga.  \n"
+"* 'Potvrđen' je slijedeće stanje     \n"
+"* 'U tijeku' označava početak aktivnosti na popravku. \n"
+"* 'Za fakturiranje' stanje koje se koristi za generiranje računa prije ili "
+"poslije izvršenja naloga za popravak.  \n"
+"* 'Izvršen' nalog za popravak je izvršen  \n"
+"* 'Otkazan' nalog za popravak je otkazan."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr ""
+msgstr "Skladišni prijenos"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
@@ -50,16 +57,21 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Nalozi za popravak olakšavaju upravljanje post-prodajnim aktivnostima "
+"popravaka i servisa unutar i nakon jamstvenog roka. U nalogu za popravak "
+"navodite komponente koje treba odbaciti, dodati ili zamijeniti, bilježite "
+"vrijeme potrebno za popravak. Nalog koristi datume jamstva kako bi znao "
+"treba li fakturirati nalog kupcu ili ne."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Ponovo izradi račun"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -69,28 +81,32 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a picking with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Otkaži nalog za popravak"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Printing Date"
 
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
 msgid "Group by partner invoice address"
-msgstr ""
+msgstr "Grupiraj po adresi računa"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:430
@@ -101,45 +117,45 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi na nacrt"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Iznimka računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Adresa dostave"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
 #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
 #: field:mrp.repair.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Adresa računa :"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "Limit jamstva"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -160,12 +176,12 @@ msgstr ""
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:430
@@ -176,17 +192,17 @@ msgstr ""
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "Operations"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Temeljnica"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:365
@@ -198,28 +214,28 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repair Orders"
-msgstr ""
+msgstr "Nalozi za popravak"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Ponuda / Nalog"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Nalog za popravak br."
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:379
@@ -232,49 +248,49 @@ msgstr ""
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr ""
+msgstr "Nalozi za popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Order N° :"
-msgstr ""
+msgstr "Nalog za popravak N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
-msgstr ""
+msgstr "Lot Number"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Fees Lines"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Fees Line(s)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Shipping address :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:379
@@ -287,7 +303,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Količina (JM)"
 
 #. module: mrp_repair
 #: help:mrp.repair.line,state:0
@@ -300,11 +316,17 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * Stanje 'Nacrt' se postavlja automatski prilikom upisa/inicijalnog "
+"kreiranja naloga za popravak. \n"
+"* Stanje 'Potvrđen' označava nalog koji treba izvršiti.  \n"
+"* Izvršeni nalozi su u stanju 'Izvršen' .                        \n"
+"* Nalozi u stanju 'Otkazan' se neće izvršavati i ostaju u sistemu radi "
+"evidencije."
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -312,17 +334,19 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Ova operacija će otkazati proces popravka, ali neće otkazati pripadajući "
+"račun. Nastaviti?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Pricelist"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "Quotation Notes"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
@@ -333,34 +357,34 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Search Reair Orders"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Add)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr ""
+msgstr "Stavka popravka"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
 msgid "Invoice Method"
-msgstr ""
+msgstr "Metoda računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr ""
+msgstr "Popravljeno"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
@@ -371,145 +395,145 @@ msgstr ""
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Stavka računa"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr ""
+msgstr "Prije popravka"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr ""
+msgstr "Trenutna lokacija"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoiced:0
 #: field:mrp.repair.fee,invoiced:0
 #: field:mrp.repair.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Remove)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Kreirati račun(e) ?"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Popravak br."
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Nalog za popravak"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr ""
+msgstr "U popravku"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Spremno za popravak"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "Guarantee Limit"
 
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr ""
+msgstr "Proizvodi za popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
-msgstr ""
+msgstr "N° :"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "Cjenik odabranog partnera."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Stavka naknade popravka"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr ""
+msgstr "Potvrdi popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Quotation"
-msgstr ""
+msgstr "Ponuda za popravak"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr ""
+msgstr "Završi popravak"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:408
@@ -521,43 +545,43 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
 #: report:repair.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Start Repair"
-msgstr ""
+msgstr "Pokreni popravak"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
 #: field:mrp.repair.line,price_unit:0
 #: report:repair.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -567,42 +591,46 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"Jamstveni limit se računa kao: datum zadnjeg prijenosa + jamstvo definirano "
+"na proizvodu. Ako je trenutni datum unutar jamstva svaka operacija i naknada "
+"koju dodate biti će označena sa 'nije za fakturiranje'. Naravno, to možete "
+"ručno promijeniti prema potrebi."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "Fees"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: view:mrp.repair.make_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Lokacija isporuke"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "Stavka(e) operacije"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr ""
+msgstr "Lokacija isporuke"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -611,71 +639,73 @@ msgid ""
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
 msgstr ""
+"Ako odaberete različito od 'Ne fakturirati', možete odabrati cjenik i adresu "
+"računa."
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: report:repair.order:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "Stavke operacije"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "fakturirano"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Račun korigiran"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr ""
+msgstr "Isporuči"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Skladišnice"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
@@ -692,75 +722,75 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "UoM"
-msgstr ""
+msgstr "JM"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "JM Proizvoda"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr ""
+msgstr "Adresa za račun"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "Poslije popravka"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "Otkaži popravak"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "Nema računa"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr ""
+msgstr "Stanja"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
-msgstr ""
+msgstr "Odaberite partnera isporuke i računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "Spremno za popravak"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:365
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index b7f0c156fb9..ae6e3e06292 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -1,29 +1,29 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_repair_user","MRP Repair user","model_mrp_repair","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_line_user","MRP Repair Line user","model_mrp_repair_line","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,1,1,1
-"access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,0,0,0
-"access_mrp_repair_user","MRP Repair user","model_mrp_repair","mrp.group_mrp_user",1,1,1,1
-"access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","mrp.group_mrp_manager",1,0,0,0
-"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","mrp.group_mrp_manager",1,0,0,0
-"access_product_pricelist_user","product.pricelist user","product.model_product_pricelist","mrp.group_mrp_user",1,1,1,1
-"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
-"access_stock_production_lot_manager","stock.production.lot manager","stock.model_stock_production_lot","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_repair_line_user","mrp.repair.line user","model_mrp_repair_line","mrp.group_mrp_user",1,1,1,1
-"access_mrp_repair_line_manager","mrp.repair.line manager","model_mrp_repair_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_production_lot_revision_manager","stock.production.lot.revision manager","stock.model_stock_production_lot_revision","mrp.group_mrp_manager",1,0,0,0
-"access_stock_production_lot_revision_user","stock.production.lot.revision user","stock.model_stock_production_lot_revision","mrp.group_mrp_user",1,1,1,1
-"access_product_price_type_manager","product.price.type manager","product.model_product_price_type","mrp.group_mrp_manager",1,0,0,0
-"access_product_price_type_user","product.price.type","product.model_product_price_type","mrp.group_mrp_user",1,1,1,1
-"access_account_tax_user","account.tax","account.model_account_tax","mrp.group_mrp_user",1,1,1,1
-"access_account_tax_manager","account.tax manager","account.model_account_tax","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_repair_fee_user_mrp","MRP Repair Fee user mrp","model_mrp_repair_fee","mrp.group_mrp_user",1,1,1,1
-"access_mrp_repair_fee_mgr","MRP Repair Fee mgr","model_mrp_repair_fee","mrp.group_mrp_manager",1,0,0,0
-"access_account_invoice_user","account.invoice","account.model_account_invoice","mrp.group_mrp_user",1,1,1,1
-"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","mrp.group_mrp_manager",1,0,0,0
-"access_account_invoice_line_user","account.invoice.line","account.model_account_invoice_line","mrp.group_mrp_user",1,1,1,1
-"access_account_invoice_line_manager","account.invoice.line manager","account.model_account_invoice_line","mrp.group_mrp_manager",1,0,0,0
-"access_account_journal_user","account.journal","account.model_account_journal","mrp.group_mrp_user",1,1,1,1
-"access_account_journal_manager","account.journal manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_repair_user,MRP Repair user,model_mrp_repair,stock.group_stock_user,1,0,0,0
+access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,stock.group_stock_manager,1,1,1,1
+access_mrp_repair_line_user,MRP Repair Line user,model_mrp_repair_line,stock.group_stock_user,1,0,0,0
+access_mrp_repair_line_manager,MRP Repair Line manager,model_mrp_repair_line,stock.group_stock_manager,1,1,1,1
+access_mrp_repair_fee_user,MRP Repair Fee user,model_mrp_repair_fee,stock.group_stock_user,1,1,1,1
+access_mrp_repair_fee_manager,MRP Repair Fee manager,model_mrp_repair_fee,stock.group_stock_manager,1,0,0,0
+access_mrp_repair_user,MRP Repair user,model_mrp_repair,mrp.group_mrp_user,1,1,1,1
+access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,mrp.group_mrp_manager,1,0,0,0
+access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,mrp.group_mrp_manager,1,0,0,0
+access_product_pricelist_user,product.pricelist user,product.model_product_pricelist,mrp.group_mrp_user,1,1,1,1
+access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
+access_stock_production_lot_manager,stock.production.lot manager,stock.model_stock_production_lot,mrp.group_mrp_manager,1,0,0,0
+access_mrp_repair_line_user,mrp.repair.line user,model_mrp_repair_line,mrp.group_mrp_user,1,1,1,1
+access_mrp_repair_line_manager,mrp.repair.line manager,model_mrp_repair_line,mrp.group_mrp_manager,1,0,0,0
+access_stock_production_lot_revision_manager,stock.production.lot.revision manager,stock.model_stock_production_lot_revision,mrp.group_mrp_manager,1,0,0,0
+access_stock_production_lot_revision_user,stock.production.lot.revision user,stock.model_stock_production_lot_revision,mrp.group_mrp_user,1,1,1,1
+access_product_price_type_manager,product.price.type manager,product.model_product_price_type,mrp.group_mrp_manager,1,0,0,0
+access_product_price_type_user,product.price.type,product.model_product_price_type,mrp.group_mrp_user,1,1,1,1
+access_account_tax_user,account.tax,account.model_account_tax,mrp.group_mrp_user,1,1,1,1
+access_account_tax_manager,account.tax manager,account.model_account_tax,mrp.group_mrp_manager,1,0,0,0
+access_mrp_repair_fee_user_mrp,MRP Repair Fee user mrp,model_mrp_repair_fee,mrp.group_mrp_user,1,1,1,1
+access_mrp_repair_fee_mgr,MRP Repair Fee mgr,model_mrp_repair_fee,mrp.group_mrp_manager,1,0,0,0
+access_account_invoice_user,account.invoice,account.model_account_invoice,mrp.group_mrp_user,1,1,1,1
+access_account_invoice_manager,account.invoice manager,account.model_account_invoice,mrp.group_mrp_manager,1,0,0,0
+access_account_invoice_line_user,account.invoice.line,account.model_account_invoice_line,mrp.group_mrp_user,1,1,1,1
+access_account_invoice_line_manager,account.invoice.line manager,account.model_account_invoice_line,mrp.group_mrp_manager,1,0,0,0
+access_account_journal_user,account.journal,account.model_account_journal,mrp.group_mrp_user,1,1,1,1
+access_account_journal_manager,account.journal manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index fc2966f7950..8e50561f0a4 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 08:08+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 10:52+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:38+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
 msgid "Product"
-msgstr "Proizvod"
+msgstr "Artikl"
 
 #. module: mrp_subproduct
 #: sql_constraint:mrp.bom:0
@@ -28,6 +28,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Sve količine artikala moraju biti veće od 0.\n"
+"Morate instalirati modul mrp_subproduct ako želite dodatne artikle na "
+"sastavnici !"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -37,13 +40,15 @@ msgstr "podproizvodi"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog za proizvodnju"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 msgid ""
 "MRP Sub Product - To produce several products from one production order"
 msgstr ""
+"MRP podproizvod - ZA proizvodnju više proizvoda iz jednog naloga za "
+"proizvodnju"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -63,7 +68,7 @@ msgstr "Tip količine"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Sastavnica"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -78,11 +83,20 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućuje proizvodnju više proizvoda iz jednog naloga za "
+"proizvodnju.\n"
+"Možete konfigurirati podproizvode u sastavnici.\n"
+"Bez ovog modula:\n"
+"    A + B + C -> D\n"
+"Sa ovim modulom:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product UOM"
-msgstr "Jedinica mjere proizvoda"
+msgstr "JM proizvoda"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,bom_id:0
@@ -92,7 +106,7 @@ msgstr "Sastavnica"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne sastavnice."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -102,22 +116,22 @@ msgstr "Podproizvodi"
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Variable"
-msgstr "Varijabla"
+msgstr "Promjenljiva"
 
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Količina na nalogu ne smije biti negativna ili nula!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Podproizvod"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
-msgstr "Određeno"
+msgstr "Fiksno"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index 307827265f2..7c012237dd6 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_subproduct_user","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_user",1,1,1,1
-"access_mrp_subproduct_manager","mrp.subproduct manager","model_mrp_subproduct","mrp.group_mrp_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,1,1,1
+access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,0,0,0
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 024de2fcf48..04bc8914653 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-12 12:48+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -40,6 +40,21 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Datum: %(date)s\n"
+"\n"
+"Dragi %(partner_name)s,\n"
+"\n"
+"U privitku se nalazi podsjetnik na sve vaše neplaćene račune sa dospijelim "
+"iznosom od:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Hvala,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
@@ -66,7 +81,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Predefinirana organizacija po objektu"
 
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
@@ -81,7 +96,7 @@ msgstr ""
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Uvjet"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
diff --git a/addons/multi_company/security/ir.model.access.csv b/addons/multi_company/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/multi_company/security/ir.model.access.csv
+++ b/addons/multi_company/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/outlook/README b/addons/outlook/README
deleted file mode 100644
index 93f735ac1f8..00000000000
--- a/addons/outlook/README
+++ /dev/null
@@ -1,29 +0,0 @@
-OpenERP Outlook PLUG-IN Installation Guide
-
-Pre requirements :
-======================================================================================
-    1.Python 2.6+ . python can be downloaded from http://www.python.org/download/releases/ .
-    2.Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. It can be downloaded from 
-            http://sourceforge.net/projects/pywin32/  or
-            http://starship.python.net/crew/mhammond/win32/
-    3.If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)". It can be downloaded from 
-            http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2714320D-C997-4DE1-986F-24F081725D36&displaylang=en
-      and With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook.
-        To read more regarding  Collaboration Data Objects(CDO) click following link:
-          + http://support.microsoft.com/kb/171440
-                   
-How to install openerp-outlook plug-in?
-======================================================================================
-    1. Save the executable plug-in file.
-    2. Close Outlook Application if Running.
-    3. Run executable plug-in file and the folllow the instruction.
-
-How to uninstall openerp-outlook plug-in?
-=====================================================================================
-    1. Go to Control Panel Click "Add/Remove Programmes"
-    2. You will entry, you will find entry named 'OpenERP Outlook Addin 1.0' select it and click Uninstall.
-
-Note : Plug In has been successfully tested with MS Office 2003 and MS Offcie 2007.
-
-Enjoy Archiving your Outlook E-mails to OpenERP.
-
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index beab5aca648..9d1c5a554f4 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -25,7 +25,7 @@
     'version' : '1.0',
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
-    'depends' : ['base', 'mail'],
+    'depends' : ['base', 'mail','plugin'],
     'category' : 'Customer Relationship Management',
     'description': '''
 This module provides the Outlook Plug-in.
@@ -33,7 +33,7 @@ This module provides the Outlook Plug-in.
 Outlook plug-in allows you to select an object that you’d like to add
 to your email and its attachments from MS Outlook. You can select a partner, a task,
 a project, an analytical account, or any other object and archive selected
-mail into email.messages with attachments.
+mail into mail.message with attachments.
       ''',
     'init_xml' : [],
     'demo_xml' : [],
diff --git a/addons/outlook/i18n/hr.po b/addons/outlook/i18n/hr.po
new file mode 100644
index 00000000000..868034d8431
--- /dev/null
+++ b/addons/outlook/i18n/hr.po
@@ -0,0 +1,161 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 12:57+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Priručnik za instalaciju"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Outlook Plug-in"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Outlook Plug-In"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Preskoči"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Sučelje za Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Naziv datoteke"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Outlook Plug-in "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Ovaj modul omogućava Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in omogućava vam da odaberete objekt koji bi željeli "
+"dodati\n"
+"      u vaš e-mail i njegove privitke iz MS Outlooka. Možete izabrati "
+"partnera, zadatak,\n"
+"      projekt, analitički konto,  ili bilo koi drugi objekt i arhivirati "
+"odabranu poruku sa privicima\n"
+"      u mailgate.messages.\n"
+"\n"
+"      "
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Datoteka sa dokumentacijom :- kako instalirati Outlook Plug-in."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Outlook Plug-In konfiguracija"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Ovaj plugin omogućuje vam povezivanje e-maila s OpenERP dokumentima. Možete "
+"ga dodati bilo kojem postojećem ili kreirati novi."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Dozvoljava vam da odaberete objekt koji želite dodati vašoj elektroničkoj "
+"poruci i njegove privitke."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Koraci instalacije i konfiguracije"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"outlook plug-in datoteka. Snimi kako ovu datoteku i instaliraj ovaj plugin u "
+"Outlook."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 061c27da5e5..547d0b18650 100644
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -32,7 +32,7 @@ class outlook_installer(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         data = super(outlook_installer, self).default_get(cr, uid, fields, context=context)
         data['doc_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_outlook.html'
-        file = open(addons.get_module_resource('outlook','plugin','openerp-outlook-addin.exe'), 'r')
+        file = open(addons.get_module_resource('outlook','static','openerp-outlook-plugin','OpenERPOutlookPluginSetup','Release','OpenERPOutlookPluginSetup.msi'), 'r')
         data['plugin_file'] = base64.encodestring(file.read())
         return data
 
@@ -47,21 +47,18 @@ class outlook_installer(osv.osv_memory):
 
     _defaults = {
         'outlook' : True,
-        'name' : 'Openerp-Outlook-Addin.exe',
+        'name' : 'OpenERPOutlookPlugin.msi',
         'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
         'description' : """
 System requirements:
-    1.  Python 2.6+.
-    2.  Python for Windows extensions (PyWin32); this module must be installed for the appropriate version of Python.
-    3.1 With MS Outlook 2007, install the package Collaboration Data Objects, version 1.2.1, http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2714320D-C997-4DE1-986F-24F081725D36
-    3.2 With MS Outlook 2003, install the builtin Collaboration Data Objects(CDO) while installing Outlook.
+    1.  MS Outlook 2005 or above.
+    2.  MS .Net Framework 3.5 .
+    
 
 Plugin installation:
-    1.  Save the executable plug-in file.
+    1.  Save the msi plug-in file.
     2.  Close the Outlook application if it is open.
-    3.  Run the executable plug-in file, and follow the given instructions.
-
-Please refer to the README file for dependencies (external link: openobject-addons/outlook/README).
+    3.  Run the executable plug-in file (OpenERPOutlookPlugin.msi).
 """
         }
 outlook_installer()
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 7e2b7cd6d58..4cdb0127631 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -14,7 +14,9 @@
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
+                        <attribute name="string">This plug-in allows you to create new contact or link contact to an existing partner. 
+Also allows to link your e-mail to OpenERP's documents. 
+You can attach it to any existing one in OpenERP or create a new one.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
deleted file mode 100644
index aa3c0dac378..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-python addin.py
-pause
-\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
deleted file mode 100644
index 0f821974661..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-python addin.py --unregister
-pause
-\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
deleted file mode 100644
index c720c5e417d..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ /dev/null
@@ -1,301 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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/>.
-#
-##############################################################################
-
-from win32com import universal
-from win32com.client import gencache, DispatchWithEvents
-import pythoncom
-from win32com.client import constants
-import sys
-import os
-from win32com.client import Dispatch
-import win32con
-sys.path.append(os.path.abspath(os.path.dirname(__file__)))    #outlook
-sys.path.append(os.path.abspath(__file__))                     #outlook/addin
-import manager
-from win32com.client import CastTo
-import win32ui
-from tiny_xmlrpc import XMLRpcConn
-import locale
-locale.setlocale(locale.LC_NUMERIC, "C")
-# Support for COM objects we use.
-gencache.EnsureModule('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0, bForDemand=True) # Outlook 9
-gencache.EnsureModule('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1, bForDemand=True) # Office 9
-# The TLB defiining the interfaces we implement
-universal.RegisterInterfaces('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}', 0, 1, 0, ["_IDTExtensibility2"])
-global NewConn
-# Retrieves registered XMLRPC connection
-def GetConn():
-    d=Dispatch("Python.OpenERP.XMLRpcConn")
-    return d
-class Configuration:
-
-    def OnClick(self, button, cancel):
-        import win32ui
-        try:
-            mngr = manager.GetManager()
-            mngr.ShowManager()
-        except Exception,e:
-            win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
-        return cancel
-#
-class ViewPartners:
-    def OnClick(self, button, cancel):
-        from win32com.client import Dispatch
-        import win32con
-        mngr = manager.GetManager()
-        data = mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1 or ex.Selection.Count == 0:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_VIEW_PARTNER_DIALOG")
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Open Contact",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class OpenPartner:
-    def OnClick(self, button, cancel):
-        import win32ui
-        mngr = manager.GetManager()
-        data = mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_OPEN_PARTNER_DIALOG")
-            elif ex.Selection.Count == 0:
-                win32ui.MessageBox("No mail selected to push to OpenERP","Push to OpenERP",win32con.MB_ICONINFORMATION)
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Push to OpenERP",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class OpenDocument:
-    def OnClick(self, button, cancel):
-        from win32com.client import Dispatch
-        import win32con
-        mngr = manager.GetManager()
-        data = mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1 or ex.Selection.Count == 0:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_OPEN_DOCUEMNT_DIALOG")
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Open Document",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class ArchiveEvent:
-    def OnClick(self, button, cancel):
-        from win32com.client import Dispatch
-        import win32con
-        mngr = manager.GetManager()
-        data=mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_SYNC")
-            elif ex.Selection.Count == 0:
-                win32ui.MessageBox("No mail selected to push to OpenERP","Push to OpenERP",win32con.MB_ICONINFORMATION)
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Push to OpenERP",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class OutlookAddin:
-    _com_interfaces_ = ['_IDTExtensibility2']
-    _public_methods_ = ['OnConnection','GetAppDataPath']
-    _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER
-    _reg_clsid_ = "{0F47D9F3-598B-4d24-B7E3-92AC15ED27E8}"
-    _reg_progid_ = "Python.OpenERP.OutlookAddin"
-    _reg_policy_spec_ = "win32com.server.policy.EventHandlerPolicy"
-    def OnConnection(self, application, connectMode, addin, custom):
-        # ActiveExplorer may be none when started without a UI (eg, WinCE synchronisation)
-        activeExplorer = application.ActiveExplorer()
-        if activeExplorer is not None:
-            bars = activeExplorer.CommandBars
-            new_bar = bars.Add('Open ERP',0,0,0)
-
-            menu_bar = bars.Item("Menu Bar")
-
-            tools_menu = menu_bar.Controls(5)
-            tools_menu = CastTo(tools_menu, "CommandBarPopup")
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_Button = DispatchWithEvents(item, Configuration)
-            item.Caption="Configuration"
-            item.TooltipText = "Click to configure OpenERP"
-            item.Enabled = True
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_arch_Button = DispatchWithEvents(item, ArchiveEvent)
-            item.Caption="Push"
-            item.TooltipText = "Click to push to OpenERP"
-            item.Enabled = True
-
-            toolbar = bars.Item("Standard")
-            openerp_bar = bars.Item('Open ERP')
-
-            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonConfig = DispatchWithEvents(item, Configuration)
-            item.Caption = "Configuration"
-            item.TooltipText = "Click to configure OpenERP."
-            item.Enabled = True
-
-            item = openerp_bar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.toolbarButton = DispatchWithEvents(item, ArchiveEvent)
-            item.Caption="Push"
-            item.TooltipText = "Click to push to OpenERP"
-            item.Enabled = True
-
-            # Adding Menu in Menu Bar to the Web Menu of the Outlook
-            toolbarweb = bars.Item("Web")
-
-            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonOpenPartner = DispatchWithEvents(item, OpenPartner)
-            item.Caption = "Partner"
-            item.TooltipText = "Click to Open OpenERP Partner Contact Information."
-            item.Enabled = True
-
-
-            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
-            item.Caption = "Document"
-            item.TooltipText = "Click to Open Document that has been pushed to server."
-            item.Enabled = True
-
-            # Hook events for the item
-#            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-#            item = self.toolbarButtonPartner = DispatchWithEvents(item, ViewPartners)
-#            item.Caption = "Open Contact"
-#            item.TooltipText = "Click to Open OpenERP Partner Contact Information."
-#            item.Enabled = True
-
-
-#            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-#            # Hook events for the item
-#            item = self.menu_bar_viewpartner_Button = DispatchWithEvents(item, ViewPartners)
-#            item.Caption = "Open Contact"
-#            item.TooltipText = "Click to Open Partner detail"
-#            item.Enabled = True
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_openpartner_Button = DispatchWithEvents(item, OpenPartner)
-            item.Caption = "Partner"
-            item.TooltipText = "Click to Open Partner detail"
-            item.Enabled = True
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_opendocument_Button = DispatchWithEvents(item, OpenDocument)
-            item.Caption = "Document"
-            item.TooltipText = "Click to Open Document that has been pushed to server."
-            item.Enabled = True
-
-    def OnDisconnection(self, mode, custom):
-        mngr = manager.GetManager()
-        mngr.config['login'] = False
-        mngr.SaveConfig()
-        self.item.close()
-        pass
-    def OnAddInsUpdate(self, custom):
-        pass
-    def OnStartupComplete(self, custom):
-        pass
-    def OnBeginShutdown(self, custom):
-        pass
-    def GetAppDataPath(self):
-        mngr = manager.GetManager()
-        return mngr.data_directory
-
-def RegisterAddin(klass):
-    import _winreg
-    key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins")
-    subkey = _winreg.CreateKey(key, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
-    _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
-    _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_)
-
-def UnregisterAddin(klass):
-    import _winreg
-    try:
-        _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_)
-    except:
-        pass
-
-def UnregisterXMLConn(klass):
-    import _winreg
-    try:
-        _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\XMLConnection" + klass._reg_progid_)
-    except:
-        pass
-
-def RegisterXMLConn(klass):
-    import _winreg
-    key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\XMLConnection")
-    subkey = _winreg.CreateKey(key, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
-    _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
-    _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_)
-
-if __name__ == '__main__':
-    import win32com.server.register
-    NewConn=XMLRpcConn()
-    win32com.server.register.UseCommandLine(OutlookAddin)
-    win32com.server.register.UseCommandLine(NewConn)
-    if "--unregister" in sys.argv:
-        UnregisterAddin(OutlookAddin)
-        UnregisterXMLConn(NewConn)
-        print "\n \tPlug In Un-registered Successfully.\n\tThank You for Using PlugIn."
-    else:
-        RegisterAddin(OutlookAddin)
-        RegisterXMLConn(NewConn)
-        print "\n \tPlug In Registered Successfully.\n\tEnjoy Archiving with OpenERP.\n\tSee UserGuide for More. "
-
-#mngr = manager.GetManager()
-#mngr.ShowManager("IDD_MANAGER")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
deleted file mode 100644
index 3aa329807ef..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
+++ /dev/null
@@ -1,5609 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.38
-#
-# Do not make changes to this file unless you know what you are doing--modify
-# the SWIG interface file instead.
-# This file is compatible with both classic and new-style classes.
-
-from sys import version_info
-if version_info >= (2,6,0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        try:
-            fp, pathname, description = imp.find_module('_chilkat', [dirname(__file__)])
-            _mod = imp.load_module('_chilkat', fp, pathname, description)
-        finally:
-            if fp is not None: fp.close()
-        return _mod
-    _chilkat = swig_import_helper()
-    del swig_import_helper
-else:
-    import _chilkat
-del version_info
-try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError(name)
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-try:
-    _object = object
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-
-
-
-def GetSwigProgLang():
-  return _chilkat.GetSwigProgLang()
-GetSwigProgLang = _chilkat.GetSwigProgLang
-class SYSTEMTIME(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SYSTEMTIME, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SYSTEMTIME, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["wYear"] = _chilkat.SYSTEMTIME_wYear_set
-    __swig_getmethods__["wYear"] = _chilkat.SYSTEMTIME_wYear_get
-    if _newclass:wYear = _swig_property(_chilkat.SYSTEMTIME_wYear_get, _chilkat.SYSTEMTIME_wYear_set)
-    __swig_setmethods__["wMonth"] = _chilkat.SYSTEMTIME_wMonth_set
-    __swig_getmethods__["wMonth"] = _chilkat.SYSTEMTIME_wMonth_get
-    if _newclass:wMonth = _swig_property(_chilkat.SYSTEMTIME_wMonth_get, _chilkat.SYSTEMTIME_wMonth_set)
-    __swig_setmethods__["wDayOfWeek"] = _chilkat.SYSTEMTIME_wDayOfWeek_set
-    __swig_getmethods__["wDayOfWeek"] = _chilkat.SYSTEMTIME_wDayOfWeek_get
-    if _newclass:wDayOfWeek = _swig_property(_chilkat.SYSTEMTIME_wDayOfWeek_get, _chilkat.SYSTEMTIME_wDayOfWeek_set)
-    __swig_setmethods__["wDay"] = _chilkat.SYSTEMTIME_wDay_set
-    __swig_getmethods__["wDay"] = _chilkat.SYSTEMTIME_wDay_get
-    if _newclass:wDay = _swig_property(_chilkat.SYSTEMTIME_wDay_get, _chilkat.SYSTEMTIME_wDay_set)
-    __swig_setmethods__["wHour"] = _chilkat.SYSTEMTIME_wHour_set
-    __swig_getmethods__["wHour"] = _chilkat.SYSTEMTIME_wHour_get
-    if _newclass:wHour = _swig_property(_chilkat.SYSTEMTIME_wHour_get, _chilkat.SYSTEMTIME_wHour_set)
-    __swig_setmethods__["wMinute"] = _chilkat.SYSTEMTIME_wMinute_set
-    __swig_getmethods__["wMinute"] = _chilkat.SYSTEMTIME_wMinute_get
-    if _newclass:wMinute = _swig_property(_chilkat.SYSTEMTIME_wMinute_get, _chilkat.SYSTEMTIME_wMinute_set)
-    __swig_setmethods__["wSecond"] = _chilkat.SYSTEMTIME_wSecond_set
-    __swig_getmethods__["wSecond"] = _chilkat.SYSTEMTIME_wSecond_get
-    if _newclass:wSecond = _swig_property(_chilkat.SYSTEMTIME_wSecond_get, _chilkat.SYSTEMTIME_wSecond_set)
-    __swig_setmethods__["wMilliseconds"] = _chilkat.SYSTEMTIME_wMilliseconds_set
-    __swig_getmethods__["wMilliseconds"] = _chilkat.SYSTEMTIME_wMilliseconds_get
-    if _newclass:wMilliseconds = _swig_property(_chilkat.SYSTEMTIME_wMilliseconds_get, _chilkat.SYSTEMTIME_wMilliseconds_set)
-    def __init__(self): 
-        this = _chilkat.new_SYSTEMTIME()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_SYSTEMTIME
-    __del__ = lambda self : None;
-SYSTEMTIME_swigregister = _chilkat.SYSTEMTIME_swigregister
-SYSTEMTIME_swigregister(SYSTEMTIME)
-
-class CkString(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkString, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkString, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkString()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkString
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkString_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkString_put_Utf8(self, *args)
-    def loadFile(self, *args): return _chilkat.CkString_loadFile(self, *args)
-    def charAt(self, *args): return _chilkat.CkString_charAt(self, *args)
-    def intValue(self): return _chilkat.CkString_intValue(self)
-    def doubleValue(self): return _chilkat.CkString_doubleValue(self)
-    def clone(self): return _chilkat.CkString_clone(self)
-    def countCharOccurances(self, *args): return _chilkat.CkString_countCharOccurances(self, *args)
-    def appendCurrentDateRfc822(self): return _chilkat.CkString_appendCurrentDateRfc822(self)
-    def setStr(self, *args): return _chilkat.CkString_setStr(self, *args)
-    def endsWith(self, *args): return _chilkat.CkString_endsWith(self, *args)
-    def endsWithStr(self, *args): return _chilkat.CkString_endsWithStr(self, *args)
-    def beginsWithStr(self, *args): return _chilkat.CkString_beginsWithStr(self, *args)
-    def indexOf(self, *args): return _chilkat.CkString_indexOf(self, *args)
-    def indexOfStr(self, *args): return _chilkat.CkString_indexOfStr(self, *args)
-    def replaceAll(self, *args): return _chilkat.CkString_replaceAll(self, *args)
-    def replaceFirst(self, *args): return _chilkat.CkString_replaceFirst(self, *args)
-    def substring(self, *args): return _chilkat.CkString_substring(self, *args)
-    def matchesStr(self, *args): return _chilkat.CkString_matchesStr(self, *args)
-    def matches(self, *args): return _chilkat.CkString_matches(self, *args)
-    def getChar(self, *args): return _chilkat.CkString_getChar(self, *args)
-    def removeAll(self, *args): return _chilkat.CkString_removeAll(self, *args)
-    def removeFirst(self, *args): return _chilkat.CkString_removeFirst(self, *args)
-    def chopAtStr(self, *args): return _chilkat.CkString_chopAtStr(self, *args)
-    def urlDecode(self, *args): return _chilkat.CkString_urlDecode(self, *args)
-    def urlEncode(self, *args): return _chilkat.CkString_urlEncode(self, *args)
-    def base64Decode(self, *args): return _chilkat.CkString_base64Decode(self, *args)
-    def base64Encode(self, *args): return _chilkat.CkString_base64Encode(self, *args)
-    def qpDecode(self, *args): return _chilkat.CkString_qpDecode(self, *args)
-    def qpEncode(self, *args): return _chilkat.CkString_qpEncode(self, *args)
-    def hexDecode(self, *args): return _chilkat.CkString_hexDecode(self, *args)
-    def hexEncode(self, *args): return _chilkat.CkString_hexEncode(self, *args)
-    def entityDecode(self): return _chilkat.CkString_entityDecode(self)
-    def entityEncode(self): return _chilkat.CkString_entityEncode(self)
-    def appendUtf8(self, *args): return _chilkat.CkString_appendUtf8(self, *args)
-    def appendAnsi(self, *args): return _chilkat.CkString_appendAnsi(self, *args)
-    def clear(self): return _chilkat.CkString_clear(self)
-    def prepend(self, *args): return _chilkat.CkString_prepend(self, *args)
-    def appendInt(self, *args): return _chilkat.CkString_appendInt(self, *args)
-    def append(self, *args): return _chilkat.CkString_append(self, *args)
-    def appendChar(self, *args): return _chilkat.CkString_appendChar(self, *args)
-    def appendN(self, *args): return _chilkat.CkString_appendN(self, *args)
-    def appendStr(self, *args): return _chilkat.CkString_appendStr(self, *args)
-    def appendEnc(self, *args): return _chilkat.CkString_appendEnc(self, *args)
-    def getEnc(self, *args): return _chilkat.CkString_getEnc(self, *args)
-    def setString(self, *args): return _chilkat.CkString_setString(self, *args)
-    def setStringAnsi(self, *args): return _chilkat.CkString_setStringAnsi(self, *args)
-    def setStringUtf8(self, *args): return _chilkat.CkString_setStringUtf8(self, *args)
-    def getAnsi(self): return _chilkat.CkString_getAnsi(self)
-    def getUtf8(self): return _chilkat.CkString_getUtf8(self)
-    def compareStr(self, *args): return _chilkat.CkString_compareStr(self, *args)
-    def getString(self): return _chilkat.CkString_getString(self)
-    def getSizeUtf8(self): return _chilkat.CkString_getSizeUtf8(self)
-    def getSizeAnsi(self): return _chilkat.CkString_getSizeAnsi(self)
-    def getNumChars(self): return _chilkat.CkString_getNumChars(self)
-    def trim(self): return _chilkat.CkString_trim(self)
-    def trim2(self): return _chilkat.CkString_trim2(self)
-    def trimInsideSpaces(self): return _chilkat.CkString_trimInsideSpaces(self)
-    def replaceAllOccurances(self, *args): return _chilkat.CkString_replaceAllOccurances(self, *args)
-    def replaceFirstOccurance(self, *args): return _chilkat.CkString_replaceFirstOccurance(self, *args)
-    def toCRLF(self): return _chilkat.CkString_toCRLF(self)
-    def toLF(self): return _chilkat.CkString_toLF(self)
-    def eliminateChar(self, *args): return _chilkat.CkString_eliminateChar(self, *args)
-    def lastChar(self): return _chilkat.CkString_lastChar(self)
-    def shorten(self, *args): return _chilkat.CkString_shorten(self, *args)
-    def toLowerCase(self): return _chilkat.CkString_toLowerCase(self)
-    def toUpperCase(self): return _chilkat.CkString_toUpperCase(self)
-    def encodeXMLSpecial(self): return _chilkat.CkString_encodeXMLSpecial(self)
-    def decodeXMLSpecial(self): return _chilkat.CkString_decodeXMLSpecial(self)
-    def containsSubstring(self, *args): return _chilkat.CkString_containsSubstring(self, *args)
-    def containsSubstringNoCase(self, *args): return _chilkat.CkString_containsSubstringNoCase(self, *args)
-    def equals(self, *args): return _chilkat.CkString_equals(self, *args)
-    def equalsStr(self, *args): return _chilkat.CkString_equalsStr(self, *args)
-    def equalsIgnoreCase(self, *args): return _chilkat.CkString_equalsIgnoreCase(self, *args)
-    def equalsIgnoreCaseStr(self, *args): return _chilkat.CkString_equalsIgnoreCaseStr(self, *args)
-    def removeChunk(self, *args): return _chilkat.CkString_removeChunk(self, *args)
-    def removeCharOccurances(self, *args): return _chilkat.CkString_removeCharOccurances(self, *args)
-    def replaceChar(self, *args): return _chilkat.CkString_replaceChar(self, *args)
-    def chopAtFirstChar(self, *args): return _chilkat.CkString_chopAtFirstChar(self, *args)
-    def saveToFile(self, *args): return _chilkat.CkString_saveToFile(self, *args)
-    def split(self, *args): return _chilkat.CkString_split(self, *args)
-    def split2(self, *args): return _chilkat.CkString_split2(self, *args)
-    def tokenize(self, *args): return _chilkat.CkString_tokenize(self, *args)
-    def splitAtWS(self): return _chilkat.CkString_splitAtWS(self)
-    def beginsWith(self, *args): return _chilkat.CkString_beginsWith(self, *args)
-    def appendHexData(self, *args): return _chilkat.CkString_appendHexData(self, *args)
-CkString_swigregister = _chilkat.CkString_swigregister
-CkString_swigregister(CkString)
-
-class CkHtmlToXml(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHtmlToXml, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHtmlToXml, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHtmlToXml()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHtmlToXml
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkHtmlToXml_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHtmlToXml_put_Utf8(self, *args)
-    def SetHtmlBytes(self, *args): return _chilkat.CkHtmlToXml_SetHtmlBytes(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkHtmlToXml_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkHtmlToXml_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkHtmlToXml_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHtmlToXml_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHtmlToXml_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHtmlToXml_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkHtmlToXml_get_Version(self, *args)
-    def put_Nbsp(self, *args): return _chilkat.CkHtmlToXml_put_Nbsp(self, *args)
-    def get_Nbsp(self): return _chilkat.CkHtmlToXml_get_Nbsp(self)
-    def put_Html(self, *args): return _chilkat.CkHtmlToXml_put_Html(self, *args)
-    def get_Html(self, *args): return _chilkat.CkHtmlToXml_get_Html(self, *args)
-    def put_XmlCharset(self, *args): return _chilkat.CkHtmlToXml_put_XmlCharset(self, *args)
-    def get_XmlCharset(self, *args): return _chilkat.CkHtmlToXml_get_XmlCharset(self, *args)
-    def SetHtmlFromFile(self, *args): return _chilkat.CkHtmlToXml_SetHtmlFromFile(self, *args)
-    def ToXml(self, *args): return _chilkat.CkHtmlToXml_ToXml(self, *args)
-    def ReadFileToString(self, *args): return _chilkat.CkHtmlToXml_ReadFileToString(self, *args)
-    def WriteStringToFile(self, *args): return _chilkat.CkHtmlToXml_WriteStringToFile(self, *args)
-    def ConvertFile(self, *args): return _chilkat.CkHtmlToXml_ConvertFile(self, *args)
-    def DropTagType(self, *args): return _chilkat.CkHtmlToXml_DropTagType(self, *args)
-    def UndropTagType(self, *args): return _chilkat.CkHtmlToXml_UndropTagType(self, *args)
-    def DropTextFormattingTags(self): return _chilkat.CkHtmlToXml_DropTextFormattingTags(self)
-    def UndropTextFormattingTags(self): return _chilkat.CkHtmlToXml_UndropTextFormattingTags(self)
-    def put_DropCustomTags(self, *args): return _chilkat.CkHtmlToXml_put_DropCustomTags(self, *args)
-    def get_DropCustomTags(self): return _chilkat.CkHtmlToXml_get_DropCustomTags(self)
-    def lastErrorText(self): return _chilkat.CkHtmlToXml_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHtmlToXml_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHtmlToXml_lastErrorHtml(self)
-    def html(self): return _chilkat.CkHtmlToXml_html(self)
-    def xmlCharset(self): return _chilkat.CkHtmlToXml_xmlCharset(self)
-    def xml(self): return _chilkat.CkHtmlToXml_xml(self)
-    def version(self): return _chilkat.CkHtmlToXml_version(self)
-    def toXml(self): return _chilkat.CkHtmlToXml_toXml(self)
-    def readFileToString(self, *args): return _chilkat.CkHtmlToXml_readFileToString(self, *args)
-CkHtmlToXml_swigregister = _chilkat.CkHtmlToXml_swigregister
-CkHtmlToXml_swigregister(CkHtmlToXml)
-
-class CkUpload(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkUpload, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkUpload, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkUpload()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkUpload
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkUpload_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkUpload_put_Utf8(self, *args)
-    def get_Ssl(self): return _chilkat.CkUpload_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkUpload_put_Ssl(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkUpload_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkUpload_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkUpload_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkUpload_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkUpload_get_Version(self, *args)
-    def SleepMs(self, *args): return _chilkat.CkUpload_SleepMs(self, *args)
-    def get_ChunkSize(self): return _chilkat.CkUpload_get_ChunkSize(self)
-    def put_ChunkSize(self, *args): return _chilkat.CkUpload_put_ChunkSize(self, *args)
-    def get_IdleTimeoutMs(self): return _chilkat.CkUpload_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkUpload_put_IdleTimeoutMs(self, *args)
-    def get_UploadInProgress(self): return _chilkat.CkUpload_get_UploadInProgress(self)
-    def get_UploadSuccess(self): return _chilkat.CkUpload_get_UploadSuccess(self)
-    def get_Login(self, *args): return _chilkat.CkUpload_get_Login(self, *args)
-    def put_Login(self, *args): return _chilkat.CkUpload_put_Login(self, *args)
-    def get_Password(self, *args): return _chilkat.CkUpload_get_Password(self, *args)
-    def put_Password(self, *args): return _chilkat.CkUpload_put_Password(self, *args)
-    def login(self): return _chilkat.CkUpload_login(self)
-    def password(self): return _chilkat.CkUpload_password(self)
-    def get_ProxyPort(self): return _chilkat.CkUpload_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkUpload_put_ProxyPort(self, *args)
-    def put_ProxyDomain(self, *args): return _chilkat.CkUpload_put_ProxyDomain(self, *args)
-    def get_ProxyDomain(self, *args): return _chilkat.CkUpload_get_ProxyDomain(self, *args)
-    def get_ProxyLogin(self, *args): return _chilkat.CkUpload_get_ProxyLogin(self, *args)
-    def put_ProxyLogin(self, *args): return _chilkat.CkUpload_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkUpload_get_ProxyPassword(self, *args)
-    def put_ProxyPassword(self, *args): return _chilkat.CkUpload_put_ProxyPassword(self, *args)
-    def proxyLogin(self): return _chilkat.CkUpload_proxyLogin(self)
-    def proxyPassword(self): return _chilkat.CkUpload_proxyPassword(self)
-    def proxyDomain(self): return _chilkat.CkUpload_proxyDomain(self)
-    def AddCustomHeader(self, *args): return _chilkat.CkUpload_AddCustomHeader(self, *args)
-    def AddParam(self, *args): return _chilkat.CkUpload_AddParam(self, *args)
-    def AddFileReference(self, *args): return _chilkat.CkUpload_AddFileReference(self, *args)
-    def get_Port(self): return _chilkat.CkUpload_get_Port(self)
-    def put_Port(self, *args): return _chilkat.CkUpload_put_Port(self, *args)
-    def get_Hostname(self, *args): return _chilkat.CkUpload_get_Hostname(self, *args)
-    def put_Hostname(self, *args): return _chilkat.CkUpload_put_Hostname(self, *args)
-    def get_Path(self, *args): return _chilkat.CkUpload_get_Path(self, *args)
-    def put_Path(self, *args): return _chilkat.CkUpload_put_Path(self, *args)
-    def get_TotalUploadSize(self): return _chilkat.CkUpload_get_TotalUploadSize(self)
-    def get_NumBytesSent(self): return _chilkat.CkUpload_get_NumBytesSent(self)
-    def get_PercentUploaded(self): return _chilkat.CkUpload_get_PercentUploaded(self)
-    def get_ResponseStatus(self): return _chilkat.CkUpload_get_ResponseStatus(self)
-    def get_ResponseHeader(self, *args): return _chilkat.CkUpload_get_ResponseHeader(self, *args)
-    def get_ResponseBody(self, *args): return _chilkat.CkUpload_get_ResponseBody(self, *args)
-    def BlockingUpload(self): return _chilkat.CkUpload_BlockingUpload(self)
-    def BeginUpload(self): return _chilkat.CkUpload_BeginUpload(self)
-    def AbortUpload(self): return _chilkat.CkUpload_AbortUpload(self)
-    def UploadToMemory(self, *args): return _chilkat.CkUpload_UploadToMemory(self, *args)
-    def lastErrorText(self): return _chilkat.CkUpload_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkUpload_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkUpload_lastErrorHtml(self)
-    def hostname(self): return _chilkat.CkUpload_hostname(self)
-    def path(self): return _chilkat.CkUpload_path(self)
-    def responseHeader(self): return _chilkat.CkUpload_responseHeader(self)
-    def version(self): return _chilkat.CkUpload_version(self)
-CkUpload_swigregister = _chilkat.CkUpload_swigregister
-CkUpload_swigregister(CkUpload)
-
-class CkKeyContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkKeyContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkKeyContainer, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkKeyContainer()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkKeyContainer
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkKeyContainer_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkKeyContainer_put_Utf8(self, *args)
-    def get_IsOpen(self): return _chilkat.CkKeyContainer_get_IsOpen(self)
-    def get_IsMachineKeyset(self): return _chilkat.CkKeyContainer_get_IsMachineKeyset(self)
-    def get_ContainerName(self, *args): return _chilkat.CkKeyContainer_get_ContainerName(self, *args)
-    def GenerateUuid(self, *args): return _chilkat.CkKeyContainer_GenerateUuid(self, *args)
-    def CreateContainer(self, *args): return _chilkat.CkKeyContainer_CreateContainer(self, *args)
-    def OpenContainer(self, *args): return _chilkat.CkKeyContainer_OpenContainer(self, *args)
-    def DeleteContainer(self): return _chilkat.CkKeyContainer_DeleteContainer(self)
-    def CloseContainer(self): return _chilkat.CkKeyContainer_CloseContainer(self)
-    def GenerateKeyPair(self, *args): return _chilkat.CkKeyContainer_GenerateKeyPair(self, *args)
-    def GetPrivateKey(self, *args): return _chilkat.CkKeyContainer_GetPrivateKey(self, *args)
-    def GetPublicKey(self, *args): return _chilkat.CkKeyContainer_GetPublicKey(self, *args)
-    def ImportPublicKey(self, *args): return _chilkat.CkKeyContainer_ImportPublicKey(self, *args)
-    def ImportPrivateKey(self, *args): return _chilkat.CkKeyContainer_ImportPrivateKey(self, *args)
-    def FetchContainerNames(self, *args): return _chilkat.CkKeyContainer_FetchContainerNames(self, *args)
-    def GetNumContainers(self, *args): return _chilkat.CkKeyContainer_GetNumContainers(self, *args)
-    def GetContainerName(self, *args): return _chilkat.CkKeyContainer_GetContainerName(self, *args)
-    def getContainerName(self, *args): return _chilkat.CkKeyContainer_getContainerName(self, *args)
-    def containerName(self): return _chilkat.CkKeyContainer_containerName(self)
-    def generateUuid(self): return _chilkat.CkKeyContainer_generateUuid(self)
-    def SaveLastError(self, *args): return _chilkat.CkKeyContainer_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkKeyContainer_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkKeyContainer_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkKeyContainer_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkKeyContainer_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkKeyContainer_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkKeyContainer_lastErrorHtml(self)
-CkKeyContainer_swigregister = _chilkat.CkKeyContainer_swigregister
-CkKeyContainer_swigregister(CkKeyContainer)
-
-class CkPublicKey(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkPublicKey, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkPublicKey, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkPublicKey()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkPublicKey
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkPublicKey_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkPublicKey_put_Utf8(self, *args)
-    def LoadPkcs1Pem(self, *args): return _chilkat.CkPublicKey_LoadPkcs1Pem(self, *args)
-    def LoadRsaDerFile(self, *args): return _chilkat.CkPublicKey_LoadRsaDerFile(self, *args)
-    def LoadOpenSslDerFile(self, *args): return _chilkat.CkPublicKey_LoadOpenSslDerFile(self, *args)
-    def LoadOpenSslPemFile(self, *args): return _chilkat.CkPublicKey_LoadOpenSslPemFile(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkPublicKey_LoadXmlFile(self, *args)
-    def LoadOpenSslPem(self, *args): return _chilkat.CkPublicKey_LoadOpenSslPem(self, *args)
-    def LoadOpenSslDer(self, *args): return _chilkat.CkPublicKey_LoadOpenSslDer(self, *args)
-    def LoadRsaDer(self, *args): return _chilkat.CkPublicKey_LoadRsaDer(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkPublicKey_LoadXml(self, *args)
-    def SaveRsaDerFile(self, *args): return _chilkat.CkPublicKey_SaveRsaDerFile(self, *args)
-    def SaveOpenSslDerFile(self, *args): return _chilkat.CkPublicKey_SaveOpenSslDerFile(self, *args)
-    def SaveOpenSslPemFile(self, *args): return _chilkat.CkPublicKey_SaveOpenSslPemFile(self, *args)
-    def SaveXmlFile(self, *args): return _chilkat.CkPublicKey_SaveXmlFile(self, *args)
-    def GetRsaDer(self, *args): return _chilkat.CkPublicKey_GetRsaDer(self, *args)
-    def GetOpenSslDer(self, *args): return _chilkat.CkPublicKey_GetOpenSslDer(self, *args)
-    def GetOpenSslPem(self, *args): return _chilkat.CkPublicKey_GetOpenSslPem(self, *args)
-    def GetXml(self, *args): return _chilkat.CkPublicKey_GetXml(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkPublicKey_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkPublicKey_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkPublicKey_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkPublicKey_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkPublicKey_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkPublicKey_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkPublicKey_lastErrorHtml(self)
-    def getOpenSslPem(self): return _chilkat.CkPublicKey_getOpenSslPem(self)
-    def getXml(self): return _chilkat.CkPublicKey_getXml(self)
-CkPublicKey_swigregister = _chilkat.CkPublicKey_swigregister
-CkPublicKey_swigregister(CkPublicKey)
-
-class CkPrivateKey(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkPrivateKey, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkPrivateKey, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkPrivateKey()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkPrivateKey
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkPrivateKey_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkPrivateKey_put_Utf8(self, *args)
-    def LoadEncryptedPem(self, *args): return _chilkat.CkPrivateKey_LoadEncryptedPem(self, *args)
-    def LoadEncryptedPemFile(self, *args): return _chilkat.CkPrivateKey_LoadEncryptedPemFile(self, *args)
-    def LoadPkcs8Encrypted(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8Encrypted(self, *args)
-    def LoadPkcs8EncryptedFile(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8EncryptedFile(self, *args)
-    def GetPkcs8Encrypted(self, *args): return _chilkat.CkPrivateKey_GetPkcs8Encrypted(self, *args)
-    def GetPkcs8EncryptedPem(self, *args): return _chilkat.CkPrivateKey_GetPkcs8EncryptedPem(self, *args)
-    def getPkcs8EncryptedPem(self, *args): return _chilkat.CkPrivateKey_getPkcs8EncryptedPem(self, *args)
-    def SavePkcs8EncryptedFile(self, *args): return _chilkat.CkPrivateKey_SavePkcs8EncryptedFile(self, *args)
-    def SavePkcs8EncryptedPemFile(self, *args): return _chilkat.CkPrivateKey_SavePkcs8EncryptedPemFile(self, *args)
-    def LoadPvkFile(self, *args): return _chilkat.CkPrivateKey_LoadPvkFile(self, *args)
-    def LoadPvk(self, *args): return _chilkat.CkPrivateKey_LoadPvk(self, *args)
-    def LoadRsaDerFile(self, *args): return _chilkat.CkPrivateKey_LoadRsaDerFile(self, *args)
-    def LoadPkcs8File(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8File(self, *args)
-    def LoadPemFile(self, *args): return _chilkat.CkPrivateKey_LoadPemFile(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkPrivateKey_LoadXmlFile(self, *args)
-    def LoadPem(self, *args): return _chilkat.CkPrivateKey_LoadPem(self, *args)
-    def LoadRsaDer(self, *args): return _chilkat.CkPrivateKey_LoadRsaDer(self, *args)
-    def LoadPkcs8(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkPrivateKey_LoadXml(self, *args)
-    def SaveRsaDerFile(self, *args): return _chilkat.CkPrivateKey_SaveRsaDerFile(self, *args)
-    def SavePkcs8File(self, *args): return _chilkat.CkPrivateKey_SavePkcs8File(self, *args)
-    def SaveRsaPemFile(self, *args): return _chilkat.CkPrivateKey_SaveRsaPemFile(self, *args)
-    def SavePkcs8PemFile(self, *args): return _chilkat.CkPrivateKey_SavePkcs8PemFile(self, *args)
-    def SaveXmlFile(self, *args): return _chilkat.CkPrivateKey_SaveXmlFile(self, *args)
-    def GetRsaDer(self, *args): return _chilkat.CkPrivateKey_GetRsaDer(self, *args)
-    def GetPkcs8(self, *args): return _chilkat.CkPrivateKey_GetPkcs8(self, *args)
-    def GetRsaPem(self, *args): return _chilkat.CkPrivateKey_GetRsaPem(self, *args)
-    def GetPkcs8Pem(self, *args): return _chilkat.CkPrivateKey_GetPkcs8Pem(self, *args)
-    def GetXml(self, *args): return _chilkat.CkPrivateKey_GetXml(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkPrivateKey_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkPrivateKey_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkPrivateKey_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkPrivateKey_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkPrivateKey_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkPrivateKey_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkPrivateKey_lastErrorHtml(self)
-    def getRsaPem(self): return _chilkat.CkPrivateKey_getRsaPem(self)
-    def getPkcs8Pem(self): return _chilkat.CkPrivateKey_getPkcs8Pem(self)
-    def getXml(self): return _chilkat.CkPrivateKey_getXml(self)
-CkPrivateKey_swigregister = _chilkat.CkPrivateKey_swigregister
-CkPrivateKey_swigregister(CkPrivateKey)
-
-class CkByteData(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkByteData, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkByteData, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkByteData()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkByteData
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkByteData_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkByteData_put_Utf8(self, *args)
-    def getRange(self, *args): return _chilkat.CkByteData_getRange(self, *args)
-    def getRangeStr(self, *args): return _chilkat.CkByteData_getRangeStr(self, *args)
-    def to_s(self): return _chilkat.CkByteData_to_s(self)
-    def appendInt(self, *args): return _chilkat.CkByteData_appendInt(self, *args)
-    def appendShort(self, *args): return _chilkat.CkByteData_appendShort(self, *args)
-    def getEncodedRange(self, *args): return _chilkat.CkByteData_getEncodedRange(self, *args)
-    def appendRange(self, *args): return _chilkat.CkByteData_appendRange(self, *args)
-    def ensureBuffer(self, *args): return _chilkat.CkByteData_ensureBuffer(self, *args)
-    def findBytes2(self, *args): return _chilkat.CkByteData_findBytes2(self, *args)
-    def findBytes(self, *args): return _chilkat.CkByteData_findBytes(self, *args)
-    def beginsWith2(self, *args): return _chilkat.CkByteData_beginsWith2(self, *args)
-    def beginsWith(self, *args): return _chilkat.CkByteData_beginsWith(self, *args)
-    def removeChunk(self, *args): return _chilkat.CkByteData_removeChunk(self, *args)
-    def byteSwap4321(self): return _chilkat.CkByteData_byteSwap4321(self)
-    def pad(self, *args): return _chilkat.CkByteData_pad(self, *args)
-    def unpad(self, *args): return _chilkat.CkByteData_unpad(self, *args)
-    def is7bit(self): return _chilkat.CkByteData_is7bit(self)
-    def clear(self): return _chilkat.CkByteData_clear(self)
-    def getSize(self): return _chilkat.CkByteData_getSize(self)
-    def appendEncoded(self, *args): return _chilkat.CkByteData_appendEncoded(self, *args)
-    def encode(self, *args): return _chilkat.CkByteData_encode(self, *args)
-    def getData(self): return _chilkat.CkByteData_getData(self)
-    def getBytes(self): return _chilkat.CkByteData_getBytes(self)
-    def getEncoded(self, *args): return _chilkat.CkByteData_getEncoded(self, *args)
-    def append(self, *args): return _chilkat.CkByteData_append(self, *args)
-    def appendStr(self, *args): return _chilkat.CkByteData_appendStr(self, *args)
-    def appendChar(self, *args): return _chilkat.CkByteData_appendChar(self, *args)
-    def getByte(self, *args): return _chilkat.CkByteData_getByte(self, *args)
-    def getChar(self, *args): return _chilkat.CkByteData_getChar(self, *args)
-    def getUInt(self, *args): return _chilkat.CkByteData_getUInt(self, *args)
-    def getInt(self, *args): return _chilkat.CkByteData_getInt(self, *args)
-    def getUShort(self, *args): return _chilkat.CkByteData_getUShort(self, *args)
-    def getShort(self, *args): return _chilkat.CkByteData_getShort(self, *args)
-    def loadFile(self, *args): return _chilkat.CkByteData_loadFile(self, *args)
-    def saveFile(self, *args): return _chilkat.CkByteData_saveFile(self, *args)
-    def appendFile(self, *args): return _chilkat.CkByteData_appendFile(self, *args)
-    def shorten(self, *args): return _chilkat.CkByteData_shorten(self, *args)
-CkByteData_swigregister = _chilkat.CkByteData_swigregister
-CkByteData_swigregister(CkByteData)
-
-class CkSocket(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSocket, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSocket, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSocket()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSocket
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSocket_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSocket_put_Utf8(self, *args)
-    def DnsLookup(self, *args): return _chilkat.CkSocket_DnsLookup(self, *args)
-    def dnsLookup(self, *args): return _chilkat.CkSocket_dnsLookup(self, *args)
-    def GetMyCert(self): return _chilkat.CkSocket_GetMyCert(self)
-    def GetSslServerCert(self): return _chilkat.CkSocket_GetSslServerCert(self)
-    def ReceiveToCRLF(self, *args): return _chilkat.CkSocket_ReceiveToCRLF(self, *args)
-    def receiveToCRLF(self): return _chilkat.CkSocket_receiveToCRLF(self)
-    def get_SessionLog(self, *args): return _chilkat.CkSocket_get_SessionLog(self, *args)
-    def sessionLog(self): return _chilkat.CkSocket_sessionLog(self)
-    def get_KeepSessionLog(self): return _chilkat.CkSocket_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkSocket_put_KeepSessionLog(self, *args)
-    def get_SessionLogEncoding(self, *args): return _chilkat.CkSocket_get_SessionLogEncoding(self, *args)
-    def sessionLogEncoding(self): return _chilkat.CkSocket_sessionLogEncoding(self)
-    def put_SessionLogEncoding(self, *args): return _chilkat.CkSocket_put_SessionLogEncoding(self, *args)
-    def ReceiveUntilByte(self, *args): return _chilkat.CkSocket_ReceiveUntilByte(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkSocket_ClearSessionLog(self)
-    def ReceiveStringUntilByte(self, *args): return _chilkat.CkSocket_ReceiveStringUntilByte(self, *args)
-    def receiveStringUntilByte(self, *args): return _chilkat.CkSocket_receiveStringUntilByte(self, *args)
-    def ReceiveStringMaxN(self, *args): return _chilkat.CkSocket_ReceiveStringMaxN(self, *args)
-    def receiveStringMaxN(self, *args): return _chilkat.CkSocket_receiveStringMaxN(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkSocket_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkSocket_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkSocket_put_SslProtocol(self, *args)
-    def SetSslClientCert(self, *args): return _chilkat.CkSocket_SetSslClientCert(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkSocket_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkSocket_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkSocket_put_ClientIpAddress(self, *args)
-    def SendCount(self, *args): return _chilkat.CkSocket_SendCount(self, *args)
-    def ReceiveCount(self): return _chilkat.CkSocket_ReceiveCount(self)
-    def get_LastMethodFailed(self): return _chilkat.CkSocket_get_LastMethodFailed(self)
-    def ConvertToSsl(self): return _chilkat.CkSocket_ConvertToSsl(self)
-    def ConvertFromSsl(self): return _chilkat.CkSocket_ConvertFromSsl(self)
-    def get_SoSndBuf(self): return _chilkat.CkSocket_get_SoSndBuf(self)
-    def put_SoSndBuf(self, *args): return _chilkat.CkSocket_put_SoSndBuf(self, *args)
-    def get_SoRcvBuf(self): return _chilkat.CkSocket_get_SoRcvBuf(self)
-    def put_SoRcvBuf(self, *args): return _chilkat.CkSocket_put_SoRcvBuf(self, *args)
-    def get_ClientPort(self): return _chilkat.CkSocket_get_ClientPort(self)
-    def put_ClientPort(self, *args): return _chilkat.CkSocket_put_ClientPort(self, *args)
-    def get_LocalIpAddress(self, *args): return _chilkat.CkSocket_get_LocalIpAddress(self, *args)
-    def localIpAddress(self): return _chilkat.CkSocket_localIpAddress(self)
-    def get_LocalPort(self): return _chilkat.CkSocket_get_LocalPort(self)
-    def get_SocksPort(self): return _chilkat.CkSocket_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSocket_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSocket_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSocket_put_SocksVersion(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSocket_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSocket_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSocket_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSocket_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSocket_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSocket_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkSocket_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSocket_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSocket_put_SocksHostname(self, *args)
-    def CheckWriteable(self, *args): return _chilkat.CkSocket_CheckWriteable(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkSocket_SetSslClientCertPfx(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSocket_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSocket_put_TcpNoDelay(self, *args)
-    def get_BigEndian(self): return _chilkat.CkSocket_get_BigEndian(self)
-    def put_BigEndian(self, *args): return _chilkat.CkSocket_put_BigEndian(self, *args)
-    def PollDataAvailable(self): return _chilkat.CkSocket_PollDataAvailable(self)
-    def get_VerboseLogging(self): return _chilkat.CkSocket_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSocket_put_VerboseLogging(self, *args)
-    def TakeSocket(self, *args): return _chilkat.CkSocket_TakeSocket(self, *args)
-    def SelectForReading(self, *args): return _chilkat.CkSocket_SelectForReading(self, *args)
-    def SelectForWriting(self, *args): return _chilkat.CkSocket_SelectForWriting(self, *args)
-    def get_SelectorIndex(self): return _chilkat.CkSocket_get_SelectorIndex(self)
-    def put_SelectorIndex(self, *args): return _chilkat.CkSocket_put_SelectorIndex(self, *args)
-    def get_SelectorReadIndex(self): return _chilkat.CkSocket_get_SelectorReadIndex(self)
-    def put_SelectorReadIndex(self, *args): return _chilkat.CkSocket_put_SelectorReadIndex(self, *args)
-    def get_SelectorWriteIndex(self): return _chilkat.CkSocket_get_SelectorWriteIndex(self)
-    def put_SelectorWriteIndex(self, *args): return _chilkat.CkSocket_put_SelectorWriteIndex(self, *args)
-    def get_NumSocketsInSet(self): return _chilkat.CkSocket_get_NumSocketsInSet(self)
-    def get_UserData(self, *args): return _chilkat.CkSocket_get_UserData(self, *args)
-    def userData(self): return _chilkat.CkSocket_userData(self)
-    def put_UserData(self, *args): return _chilkat.CkSocket_put_UserData(self, *args)
-    def StartTiming(self): return _chilkat.CkSocket_StartTiming(self)
-    def get_ElapsedSeconds(self): return _chilkat.CkSocket_get_ElapsedSeconds(self)
-    def ReceiveBytesToFile(self, *args): return _chilkat.CkSocket_ReceiveBytesToFile(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSocket_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSocket_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSocket_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSocket_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSocket_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSocket_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSocket_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSocket_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSocket_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSocket_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSocket_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSocket_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSocket_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSocket_put_HttpProxyPort(self, *args)
-    def get_NumSslAcceptableClientCAs(self): return _chilkat.CkSocket_get_NumSslAcceptableClientCAs(self)
-    def GetSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_GetSslAcceptableClientCaDn(self, *args)
-    def getSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_getSslAcceptableClientCaDn(self, *args)
-    def AddSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_AddSslAcceptableClientCaDn(self, *args)
-    def get_ReceivedCount(self): return _chilkat.CkSocket_get_ReceivedCount(self)
-    def put_ReceivedCount(self, *args): return _chilkat.CkSocket_put_ReceivedCount(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkSocket_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkSocket_IsUnlocked(self)
-    def AsyncSendBytes(self, *args): return _chilkat.CkSocket_AsyncSendBytes(self, *args)
-    def AsyncSendString(self, *args): return _chilkat.CkSocket_AsyncSendString(self, *args)
-    def get_AsyncSendFinished(self): return _chilkat.CkSocket_get_AsyncSendFinished(self)
-    def AsyncSendAbort(self): return _chilkat.CkSocket_AsyncSendAbort(self)
-    def get_AsyncSendLog(self, *args): return _chilkat.CkSocket_get_AsyncSendLog(self, *args)
-    def get_AsyncSendSuccess(self): return _chilkat.CkSocket_get_AsyncSendSuccess(self)
-    def AsyncReceiveBytes(self): return _chilkat.CkSocket_AsyncReceiveBytes(self)
-    def AsyncReceiveBytesN(self, *args): return _chilkat.CkSocket_AsyncReceiveBytesN(self, *args)
-    def AsyncReceiveString(self): return _chilkat.CkSocket_AsyncReceiveString(self)
-    def AsyncReceiveToCRLF(self): return _chilkat.CkSocket_AsyncReceiveToCRLF(self)
-    def AsyncReceiveUntilMatch(self, *args): return _chilkat.CkSocket_AsyncReceiveUntilMatch(self, *args)
-    def get_AsyncReceiveFinished(self): return _chilkat.CkSocket_get_AsyncReceiveFinished(self)
-    def AsyncReceiveAbort(self): return _chilkat.CkSocket_AsyncReceiveAbort(self)
-    def get_AsyncReceiveLog(self, *args): return _chilkat.CkSocket_get_AsyncReceiveLog(self, *args)
-    def get_AsyncReceiveSuccess(self): return _chilkat.CkSocket_get_AsyncReceiveSuccess(self)
-    def get_AsyncReceivedString(self, *args): return _chilkat.CkSocket_get_AsyncReceivedString(self, *args)
-    def get_AsyncReceivedBytes(self, *args): return _chilkat.CkSocket_get_AsyncReceivedBytes(self, *args)
-    def asyncReceivedString(self): return _chilkat.CkSocket_asyncReceivedString(self)
-    def asyncReceiveLog(self): return _chilkat.CkSocket_asyncReceiveLog(self)
-    def asyncSendLog(self): return _chilkat.CkSocket_asyncSendLog(self)
-    def SleepMs(self, *args): return _chilkat.CkSocket_SleepMs(self, *args)
-    def Close(self, *args): return _chilkat.CkSocket_Close(self, *args)
-    def get_ObjectId(self): return _chilkat.CkSocket_get_ObjectId(self)
-    def SaveLastError(self, *args): return _chilkat.CkSocket_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSocket_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSocket_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSocket_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkSocket_get_Version(self, *args)
-    def AsyncDnsStart(self, *args): return _chilkat.CkSocket_AsyncDnsStart(self, *args)
-    def get_AsyncDnsFinished(self): return _chilkat.CkSocket_get_AsyncDnsFinished(self)
-    def get_AsyncDnsResult(self, *args): return _chilkat.CkSocket_get_AsyncDnsResult(self, *args)
-    def AsyncDnsAbort(self): return _chilkat.CkSocket_AsyncDnsAbort(self)
-    def get_AsyncDnsLog(self, *args): return _chilkat.CkSocket_get_AsyncDnsLog(self, *args)
-    def get_AsyncDnsSuccess(self): return _chilkat.CkSocket_get_AsyncDnsSuccess(self)
-    def AsyncConnectStart(self, *args): return _chilkat.CkSocket_AsyncConnectStart(self, *args)
-    def get_AsyncConnectFinished(self): return _chilkat.CkSocket_get_AsyncConnectFinished(self)
-    def AsyncConnectAbort(self): return _chilkat.CkSocket_AsyncConnectAbort(self)
-    def get_AsyncConnectLog(self, *args): return _chilkat.CkSocket_get_AsyncConnectLog(self, *args)
-    def get_AsyncConnectSuccess(self): return _chilkat.CkSocket_get_AsyncConnectSuccess(self)
-    def get_MyIpAddress(self, *args): return _chilkat.CkSocket_get_MyIpAddress(self, *args)
-    def BindAndListen(self, *args): return _chilkat.CkSocket_BindAndListen(self, *args)
-    def Connect(self, *args): return _chilkat.CkSocket_Connect(self, *args)
-    def AcceptNextConnection(self, *args): return _chilkat.CkSocket_AcceptNextConnection(self, *args)
-    def get_Ssl(self): return _chilkat.CkSocket_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkSocket_put_Ssl(self, *args)
-    def InitSslServer(self, *args): return _chilkat.CkSocket_InitSslServer(self, *args)
-    def get_ConnectFailReason(self): return _chilkat.CkSocket_get_ConnectFailReason(self)
-    def get_HeartbeatMs(self): return _chilkat.CkSocket_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkSocket_put_HeartbeatMs(self, *args)
-    def get_MaxSendIdleMs(self): return _chilkat.CkSocket_get_MaxSendIdleMs(self)
-    def put_MaxSendIdleMs(self, *args): return _chilkat.CkSocket_put_MaxSendIdleMs(self, *args)
-    def get_MaxReadIdleMs(self): return _chilkat.CkSocket_get_MaxReadIdleMs(self)
-    def put_MaxReadIdleMs(self, *args): return _chilkat.CkSocket_put_MaxReadIdleMs(self, *args)
-    def get_StringCharset(self, *args): return _chilkat.CkSocket_get_StringCharset(self, *args)
-    def put_StringCharset(self, *args): return _chilkat.CkSocket_put_StringCharset(self, *args)
-    def get_DebugDnsDelayMs(self): return _chilkat.CkSocket_get_DebugDnsDelayMs(self)
-    def put_DebugDnsDelayMs(self, *args): return _chilkat.CkSocket_put_DebugDnsDelayMs(self, *args)
-    def get_DebugConnectDelayMs(self): return _chilkat.CkSocket_get_DebugConnectDelayMs(self)
-    def put_DebugConnectDelayMs(self, *args): return _chilkat.CkSocket_put_DebugConnectDelayMs(self, *args)
-    def get_IsConnected(self): return _chilkat.CkSocket_get_IsConnected(self)
-    def get_RemotePort(self): return _chilkat.CkSocket_get_RemotePort(self)
-    def get_RemoteIpAddress(self, *args): return _chilkat.CkSocket_get_RemoteIpAddress(self, *args)
-    def AsyncAcceptStart(self, *args): return _chilkat.CkSocket_AsyncAcceptStart(self, *args)
-    def get_AsyncAcceptFinished(self): return _chilkat.CkSocket_get_AsyncAcceptFinished(self)
-    def AsyncAcceptAbort(self): return _chilkat.CkSocket_AsyncAcceptAbort(self)
-    def get_AsyncAcceptLog(self, *args): return _chilkat.CkSocket_get_AsyncAcceptLog(self, *args)
-    def get_AsyncAcceptSuccess(self): return _chilkat.CkSocket_get_AsyncAcceptSuccess(self)
-    def AsyncAcceptSocket(self): return _chilkat.CkSocket_AsyncAcceptSocket(self)
-    def BuildHttpGetRequest(self, *args): return _chilkat.CkSocket_BuildHttpGetRequest(self, *args)
-    def get_SendPacketSize(self): return _chilkat.CkSocket_get_SendPacketSize(self)
-    def put_SendPacketSize(self, *args): return _chilkat.CkSocket_put_SendPacketSize(self, *args)
-    def get_ReceivePacketSize(self): return _chilkat.CkSocket_get_ReceivePacketSize(self)
-    def put_ReceivePacketSize(self, *args): return _chilkat.CkSocket_put_ReceivePacketSize(self, *args)
-    def SendString(self, *args): return _chilkat.CkSocket_SendString(self, *args)
-    def SendBytes(self, *args): return _chilkat.CkSocket_SendBytes(self, *args)
-    def ReceiveString(self, *args): return _chilkat.CkSocket_ReceiveString(self, *args)
-    def ReceiveUntilMatch(self, *args): return _chilkat.CkSocket_ReceiveUntilMatch(self, *args)
-    def ReceiveBytes(self, *args): return _chilkat.CkSocket_ReceiveBytes(self, *args)
-    def ReceiveBytesN(self, *args): return _chilkat.CkSocket_ReceiveBytesN(self, *args)
-    def stringCharset(self): return _chilkat.CkSocket_stringCharset(self)
-    def remoteIpAddress(self): return _chilkat.CkSocket_remoteIpAddress(self)
-    def asyncAcceptLog(self): return _chilkat.CkSocket_asyncAcceptLog(self)
-    def buildHttpGetRequest(self, *args): return _chilkat.CkSocket_buildHttpGetRequest(self, *args)
-    def receiveString(self): return _chilkat.CkSocket_receiveString(self)
-    def receiveUntilMatch(self, *args): return _chilkat.CkSocket_receiveUntilMatch(self, *args)
-    def lastErrorText(self): return _chilkat.CkSocket_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSocket_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSocket_lastErrorHtml(self)
-    def asyncDnsResult(self): return _chilkat.CkSocket_asyncDnsResult(self)
-    def asyncDnsLog(self): return _chilkat.CkSocket_asyncDnsLog(self)
-    def asyncConnectLog(self): return _chilkat.CkSocket_asyncConnectLog(self)
-    def myIpAddress(self): return _chilkat.CkSocket_myIpAddress(self)
-    def version(self): return _chilkat.CkSocket_version(self)
-CkSocket_swigregister = _chilkat.CkSocket_swigregister
-CkSocket_swigregister(CkSocket)
-
-class CkOmaDrm(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkOmaDrm, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkOmaDrm, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkOmaDrm()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkOmaDrm
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkOmaDrm_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkOmaDrm_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkOmaDrm_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkOmaDrm_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkOmaDrm_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkOmaDrm_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkOmaDrm_LastErrorText(self, *args)
-    def LoadDcfFile(self, *args): return _chilkat.CkOmaDrm_LoadDcfFile(self, *args)
-    def LoadDcfData(self, *args): return _chilkat.CkOmaDrm_LoadDcfData(self, *args)
-    def get_Base64Key(self, *args): return _chilkat.CkOmaDrm_get_Base64Key(self, *args)
-    def put_Base64Key(self, *args): return _chilkat.CkOmaDrm_put_Base64Key(self, *args)
-    def get_DrmContentVersion(self): return _chilkat.CkOmaDrm_get_DrmContentVersion(self)
-    def get_ContentType(self, *args): return _chilkat.CkOmaDrm_get_ContentType(self, *args)
-    def put_ContentType(self, *args): return _chilkat.CkOmaDrm_put_ContentType(self, *args)
-    def get_ContentUri(self, *args): return _chilkat.CkOmaDrm_get_ContentUri(self, *args)
-    def put_ContentUri(self, *args): return _chilkat.CkOmaDrm_put_ContentUri(self, *args)
-    def get_Headers(self, *args): return _chilkat.CkOmaDrm_get_Headers(self, *args)
-    def put_Headers(self, *args): return _chilkat.CkOmaDrm_put_Headers(self, *args)
-    def get_IV(self, *args): return _chilkat.CkOmaDrm_get_IV(self, *args)
-    def put_IV(self, *args): return _chilkat.CkOmaDrm_put_IV(self, *args)
-    def get_EncryptedData(self, *args): return _chilkat.CkOmaDrm_get_EncryptedData(self, *args)
-    def get_DecryptedData(self, *args): return _chilkat.CkOmaDrm_get_DecryptedData(self, *args)
-    def SaveDecrypted(self, *args): return _chilkat.CkOmaDrm_SaveDecrypted(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkOmaDrm_GetHeaderField(self, *args)
-    def LoadUnencryptedData(self, *args): return _chilkat.CkOmaDrm_LoadUnencryptedData(self, *args)
-    def LoadUnencryptedFile(self, *args): return _chilkat.CkOmaDrm_LoadUnencryptedFile(self, *args)
-    def SetEncodedIV(self, *args): return _chilkat.CkOmaDrm_SetEncodedIV(self, *args)
-    def CreateDcfFile(self, *args): return _chilkat.CkOmaDrm_CreateDcfFile(self, *args)
-    def lastErrorText(self): return _chilkat.CkOmaDrm_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkOmaDrm_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkOmaDrm_lastErrorHtml(self)
-    def base64Key(self): return _chilkat.CkOmaDrm_base64Key(self)
-    def contentType(self): return _chilkat.CkOmaDrm_contentType(self)
-    def contentUri(self): return _chilkat.CkOmaDrm_contentUri(self)
-    def headers(self): return _chilkat.CkOmaDrm_headers(self)
-    def getHeaderField(self, *args): return _chilkat.CkOmaDrm_getHeaderField(self, *args)
-CkOmaDrm_swigregister = _chilkat.CkOmaDrm_swigregister
-CkOmaDrm_swigregister(CkOmaDrm)
-
-class CkXmp(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkXmp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkXmp, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkXmp()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkXmp
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkXmp_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkXmp_put_Utf8(self, *args)
-    def lastErrorText(self): return _chilkat.CkXmp_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkXmp_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkXmp_lastErrorHtml(self)
-    def getSimpleStr(self, *args): return _chilkat.CkXmp_getSimpleStr(self, *args)
-    def getStructValue(self, *args): return _chilkat.CkXmp_getStructValue(self, *args)
-    def simpleStr(self, *args): return _chilkat.CkXmp_simpleStr(self, *args)
-    def structValue(self, *args): return _chilkat.CkXmp_structValue(self, *args)
-    def version(self): return _chilkat.CkXmp_version(self)
-    def dateToString(self, *args): return _chilkat.CkXmp_dateToString(self, *args)
-    def LoadFromBuffer(self, *args): return _chilkat.CkXmp_LoadFromBuffer(self, *args)
-    def SaveToBuffer(self, *args): return _chilkat.CkXmp_SaveToBuffer(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkXmp_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkXmp_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkXmp_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkXmp_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkXmp_UnlockComponent(self, *args)
-    def get_Version(self, *args): return _chilkat.CkXmp_get_Version(self, *args)
-    def get_NumEmbedded(self): return _chilkat.CkXmp_get_NumEmbedded(self)
-    def LoadAppFile(self, *args): return _chilkat.CkXmp_LoadAppFile(self, *args)
-    def SaveAppFile(self, *args): return _chilkat.CkXmp_SaveAppFile(self, *args)
-    def GetEmbedded(self, *args): return _chilkat.CkXmp_GetEmbedded(self, *args)
-    def GetSimpleStr(self, *args): return _chilkat.CkXmp_GetSimpleStr(self, *args)
-    def GetSimpleInt(self, *args): return _chilkat.CkXmp_GetSimpleInt(self, *args)
-    def GetSimpleDate(self, *args): return _chilkat.CkXmp_GetSimpleDate(self, *args)
-    def AddSimpleStr(self, *args): return _chilkat.CkXmp_AddSimpleStr(self, *args)
-    def AddSimpleInt(self, *args): return _chilkat.CkXmp_AddSimpleInt(self, *args)
-    def AddSimpleDate(self, *args): return _chilkat.CkXmp_AddSimpleDate(self, *args)
-    def AddNsMapping(self, *args): return _chilkat.CkXmp_AddNsMapping(self, *args)
-    def RemoveNsMapping(self, *args): return _chilkat.CkXmp_RemoveNsMapping(self, *args)
-    def NewXmp(self, *args): return _chilkat.CkXmp_NewXmp(self, *args)
-    def StringToDate(self, *args): return _chilkat.CkXmp_StringToDate(self, *args)
-    def DateToString(self, *args): return _chilkat.CkXmp_DateToString(self, *args)
-    def RemoveSimple(self, *args): return _chilkat.CkXmp_RemoveSimple(self, *args)
-    def Append(self, *args): return _chilkat.CkXmp_Append(self, *args)
-    def RemoveAllEmbedded(self): return _chilkat.CkXmp_RemoveAllEmbedded(self)
-    def RemoveEmbedded(self, *args): return _chilkat.CkXmp_RemoveEmbedded(self, *args)
-    def get_StructInnerDescrip(self): return _chilkat.CkXmp_get_StructInnerDescrip(self)
-    def put_StructInnerDescrip(self, *args): return _chilkat.CkXmp_put_StructInnerDescrip(self, *args)
-    def GetArray(self, *args): return _chilkat.CkXmp_GetArray(self, *args)
-    def RemoveArray(self, *args): return _chilkat.CkXmp_RemoveArray(self, *args)
-    def AddArray(self, *args): return _chilkat.CkXmp_AddArray(self, *args)
-    def GetStructValue(self, *args): return _chilkat.CkXmp_GetStructValue(self, *args)
-    def GetStructPropNames(self, *args): return _chilkat.CkXmp_GetStructPropNames(self, *args)
-    def RemoveStruct(self, *args): return _chilkat.CkXmp_RemoveStruct(self, *args)
-    def RemoveStructProp(self, *args): return _chilkat.CkXmp_RemoveStructProp(self, *args)
-    def AddStructProp(self, *args): return _chilkat.CkXmp_AddStructProp(self, *args)
-CkXmp_swigregister = _chilkat.CkXmp_swigregister
-CkXmp_swigregister(CkXmp)
-
-class CkStringArray(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkStringArray, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkStringArray, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkStringArray()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkStringArray
-    __del__ = lambda self : None;
-    def strAt(self, *args): return _chilkat.CkStringArray_strAt(self, *args)
-    def getString(self, *args): return _chilkat.CkStringArray_getString(self, *args)
-    def serialize(self): return _chilkat.CkStringArray_serialize(self)
-    def pop(self): return _chilkat.CkStringArray_pop(self)
-    def lastStr(self): return _chilkat.CkStringArray_lastStr(self)
-    def LoadFromText(self, *args): return _chilkat.CkStringArray_LoadFromText(self, *args)
-    def SaveNthToFile(self, *args): return _chilkat.CkStringArray_SaveNthToFile(self, *args)
-    def SaveToText(self, *args): return _chilkat.CkStringArray_SaveToText(self, *args)
-    def saveToText(self): return _chilkat.CkStringArray_saveToText(self)
-    def FindFirstMatch(self, *args): return _chilkat.CkStringArray_FindFirstMatch(self, *args)
-    def Union(self, *args): return _chilkat.CkStringArray_Union(self, *args)
-    def GetStringLen(self, *args): return _chilkat.CkStringArray_GetStringLen(self, *args)
-    def get_Utf8(self): return _chilkat.CkStringArray_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkStringArray_put_Utf8(self, *args)
-    def SplitAndAppend(self, *args): return _chilkat.CkStringArray_SplitAndAppend(self, *args)
-    def Append(self, *args): return _chilkat.CkStringArray_Append(self, *args)
-    def get_Count(self): return _chilkat.CkStringArray_get_Count(self)
-    def LoadFromFile(self, *args): return _chilkat.CkStringArray_LoadFromFile(self, *args)
-    def SaveToFile(self, *args): return _chilkat.CkStringArray_SaveToFile(self, *args)
-    def Pop(self, *args): return _chilkat.CkStringArray_Pop(self, *args)
-    def LastString(self, *args): return _chilkat.CkStringArray_LastString(self, *args)
-    def RemoveAt(self, *args): return _chilkat.CkStringArray_RemoveAt(self, *args)
-    def InsertAt(self, *args): return _chilkat.CkStringArray_InsertAt(self, *args)
-    def Find(self, *args): return _chilkat.CkStringArray_Find(self, *args)
-    def Prepend(self, *args): return _chilkat.CkStringArray_Prepend(self, *args)
-    def get_Crlf(self): return _chilkat.CkStringArray_get_Crlf(self)
-    def put_Crlf(self, *args): return _chilkat.CkStringArray_put_Crlf(self, *args)
-    def get_Trim(self): return _chilkat.CkStringArray_get_Trim(self)
-    def put_Trim(self, *args): return _chilkat.CkStringArray_put_Trim(self, *args)
-    def get_Unique(self): return _chilkat.CkStringArray_get_Unique(self)
-    def put_Unique(self, *args): return _chilkat.CkStringArray_put_Unique(self, *args)
-    def Serialize(self, *args): return _chilkat.CkStringArray_Serialize(self, *args)
-    def AppendSerialized(self, *args): return _chilkat.CkStringArray_AppendSerialized(self, *args)
-    def GetString(self, *args): return _chilkat.CkStringArray_GetString(self, *args)
-    def Remove(self, *args): return _chilkat.CkStringArray_Remove(self, *args)
-    def Contains(self, *args): return _chilkat.CkStringArray_Contains(self, *args)
-    def Clear(self): return _chilkat.CkStringArray_Clear(self)
-    def Sort(self, *args): return _chilkat.CkStringArray_Sort(self, *args)
-CkStringArray_swigregister = _chilkat.CkStringArray_swigregister
-CkStringArray_swigregister(CkStringArray)
-
-class CkZipCrc(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkZipCrc, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkZipCrc, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkZipCrc()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkZipCrc
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkZipCrc_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkZipCrc_put_Utf8(self, *args)
-    def ToHex(self, *args): return _chilkat.CkZipCrc_ToHex(self, *args)
-    def FileCrc(self, *args): return _chilkat.CkZipCrc_FileCrc(self, *args)
-    def CalculateCrc(self, *args): return _chilkat.CkZipCrc_CalculateCrc(self, *args)
-    def MoreData(self, *args): return _chilkat.CkZipCrc_MoreData(self, *args)
-    def EndStream(self): return _chilkat.CkZipCrc_EndStream(self)
-    def BeginStream(self): return _chilkat.CkZipCrc_BeginStream(self)
-    def toHex(self, *args): return _chilkat.CkZipCrc_toHex(self, *args)
-CkZipCrc_swigregister = _chilkat.CkZipCrc_swigregister
-CkZipCrc_swigregister(CkZipCrc)
-
-class CkZip(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkZip, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkZip, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkZip()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkZip
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkZip_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkZip_put_Utf8(self, *args)
-    def get_ExeWaitForSetup(self): return _chilkat.CkZip_get_ExeWaitForSetup(self)
-    def put_ExeWaitForSetup(self, *args): return _chilkat.CkZip_put_ExeWaitForSetup(self, *args)
-    def get_FileCount(self): return _chilkat.CkZip_get_FileCount(self)
-    def get_HasZipFormatErrors(self): return _chilkat.CkZip_get_HasZipFormatErrors(self)
-    def get_TextFlag(self): return _chilkat.CkZip_get_TextFlag(self)
-    def put_TextFlag(self, *args): return _chilkat.CkZip_put_TextFlag(self, *args)
-    def ExtractInto(self, *args): return _chilkat.CkZip_ExtractInto(self, *args)
-    def get_CaseSensitive(self): return _chilkat.CkZip_get_CaseSensitive(self)
-    def put_CaseSensitive(self, *args): return _chilkat.CkZip_put_CaseSensitive(self, *args)
-    def VerifyPassword(self): return _chilkat.CkZip_VerifyPassword(self)
-    def WriteExeToMemory(self, *args): return _chilkat.CkZip_WriteExeToMemory(self, *args)
-    def get_OverwriteExisting(self): return _chilkat.CkZip_get_OverwriteExisting(self)
-    def put_OverwriteExisting(self, *args): return _chilkat.CkZip_put_OverwriteExisting(self, *args)
-    def AddNoCompressExtension(self, *args): return _chilkat.CkZip_AddNoCompressExtension(self, *args)
-    def RemoveNoCompressExtension(self, *args): return _chilkat.CkZip_RemoveNoCompressExtension(self, *args)
-    def IsNoCompressExtension(self, *args): return _chilkat.CkZip_IsNoCompressExtension(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkZip_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkZip_put_VerboseLogging(self, *args)
-    def get_IgnoreAccessDenied(self): return _chilkat.CkZip_get_IgnoreAccessDenied(self)
-    def put_IgnoreAccessDenied(self, *args): return _chilkat.CkZip_put_IgnoreAccessDenied(self, *args)
-    def get_ClearReadOnlyAttr(self): return _chilkat.CkZip_get_ClearReadOnlyAttr(self)
-    def put_ClearReadOnlyAttr(self, *args): return _chilkat.CkZip_put_ClearReadOnlyAttr(self, *args)
-    def lastErrorText(self): return _chilkat.CkZip_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkZip_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkZip_lastErrorHtml(self)
-    def QuickAppend(self, *args): return _chilkat.CkZip_QuickAppend(self, *args)
-    def SetExeConfigParam(self, *args): return _chilkat.CkZip_SetExeConfigParam(self, *args)
-    def GetExeConfigParam(self, *args): return _chilkat.CkZip_GetExeConfigParam(self, *args)
-    def getExeConfigParam(self, *args): return _chilkat.CkZip_getExeConfigParam(self, *args)
-    def get_ExeXmlConfig(self, *args): return _chilkat.CkZip_get_ExeXmlConfig(self, *args)
-    def put_ExeXmlConfig(self, *args): return _chilkat.CkZip_put_ExeXmlConfig(self, *args)
-    def exeXmlConfig(self): return _chilkat.CkZip_exeXmlConfig(self)
-    def get_ExeSourceUrl(self, *args): return _chilkat.CkZip_get_ExeSourceUrl(self, *args)
-    def put_ExeSourceUrl(self, *args): return _chilkat.CkZip_put_ExeSourceUrl(self, *args)
-    def exeSourceUrl(self): return _chilkat.CkZip_exeSourceUrl(self)
-    def get_ExeDefaultDir(self, *args): return _chilkat.CkZip_get_ExeDefaultDir(self, *args)
-    def put_ExeDefaultDir(self, *args): return _chilkat.CkZip_put_ExeDefaultDir(self, *args)
-    def put_ExeFinishNotifier(self, *args): return _chilkat.CkZip_put_ExeFinishNotifier(self, *args)
-    def get_ExeFinishNotifier(self): return _chilkat.CkZip_get_ExeFinishNotifier(self)
-    def put_ExeSilentProgress(self, *args): return _chilkat.CkZip_put_ExeSilentProgress(self, *args)
-    def get_ExeSilentProgress(self): return _chilkat.CkZip_get_ExeSilentProgress(self)
-    def version(self): return _chilkat.CkZip_version(self)
-    def tempDir(self): return _chilkat.CkZip_tempDir(self)
-    def appendFromDir(self): return _chilkat.CkZip_appendFromDir(self)
-    def proxy(self): return _chilkat.CkZip_proxy(self)
-    def autoRun(self): return _chilkat.CkZip_autoRun(self)
-    def autoRunParams(self): return _chilkat.CkZip_autoRunParams(self)
-    def exeTitle(self): return _chilkat.CkZip_exeTitle(self)
-    def exeUnzipCaption(self): return _chilkat.CkZip_exeUnzipCaption(self)
-    def exeUnzipDir(self): return _chilkat.CkZip_exeUnzipDir(self)
-    def exeDefaultDir(self): return _chilkat.CkZip_exeDefaultDir(self)
-    def exeIconFile(self): return _chilkat.CkZip_exeIconFile(self)
-    def fileName(self): return _chilkat.CkZip_fileName(self)
-    def pathPrefix(self): return _chilkat.CkZip_pathPrefix(self)
-    def getDirectoryAsXML(self): return _chilkat.CkZip_getDirectoryAsXML(self)
-    def get_PasswordProtect(self): return _chilkat.CkZip_get_PasswordProtect(self)
-    def put_PasswordProtect(self, *args): return _chilkat.CkZip_put_PasswordProtect(self, *args)
-    def get_Encryption(self): return _chilkat.CkZip_get_Encryption(self)
-    def put_Encryption(self, *args): return _chilkat.CkZip_put_Encryption(self, *args)
-    def get_OemCodePage(self): return _chilkat.CkZip_get_OemCodePage(self)
-    def put_OemCodePage(self, *args): return _chilkat.CkZip_put_OemCodePage(self, *args)
-    def get_EncryptKeyLength(self): return _chilkat.CkZip_get_EncryptKeyLength(self)
-    def put_EncryptKeyLength(self, *args): return _chilkat.CkZip_put_EncryptKeyLength(self, *args)
-    def get_Version(self, *args): return _chilkat.CkZip_get_Version(self, *args)
-    def get_TempDir(self, *args): return _chilkat.CkZip_get_TempDir(self, *args)
-    def put_TempDir(self, *args): return _chilkat.CkZip_put_TempDir(self, *args)
-    def get_AppendFromDir(self, *args): return _chilkat.CkZip_get_AppendFromDir(self, *args)
-    def put_AppendFromDir(self, *args): return _chilkat.CkZip_put_AppendFromDir(self, *args)
-    def get_Proxy(self, *args): return _chilkat.CkZip_get_Proxy(self, *args)
-    def put_Proxy(self, *args): return _chilkat.CkZip_put_Proxy(self, *args)
-    def get_DecryptPassword(self, *args): return _chilkat.CkZip_get_DecryptPassword(self, *args)
-    def put_DecryptPassword(self, *args): return _chilkat.CkZip_put_DecryptPassword(self, *args)
-    def get_EncryptPassword(self, *args): return _chilkat.CkZip_get_EncryptPassword(self, *args)
-    def put_EncryptPassword(self, *args): return _chilkat.CkZip_put_EncryptPassword(self, *args)
-    def encryptPassword(self): return _chilkat.CkZip_encryptPassword(self)
-    def decryptPassword(self): return _chilkat.CkZip_decryptPassword(self)
-    def get_AutoRun(self, *args): return _chilkat.CkZip_get_AutoRun(self, *args)
-    def put_AutoRun(self, *args): return _chilkat.CkZip_put_AutoRun(self, *args)
-    def get_AutoTemp(self): return _chilkat.CkZip_get_AutoTemp(self)
-    def put_AutoTemp(self, *args): return _chilkat.CkZip_put_AutoTemp(self, *args)
-    def get_ExeNoInterface(self): return _chilkat.CkZip_get_ExeNoInterface(self)
-    def put_ExeNoInterface(self, *args): return _chilkat.CkZip_put_ExeNoInterface(self, *args)
-    def get_AutoRunParams(self, *args): return _chilkat.CkZip_get_AutoRunParams(self, *args)
-    def put_AutoRunParams(self, *args): return _chilkat.CkZip_put_AutoRunParams(self, *args)
-    def get_ExeTitle(self, *args): return _chilkat.CkZip_get_ExeTitle(self, *args)
-    def put_ExeTitle(self, *args): return _chilkat.CkZip_put_ExeTitle(self, *args)
-    def get_ExeUnzipCaption(self, *args): return _chilkat.CkZip_get_ExeUnzipCaption(self, *args)
-    def put_ExeUnzipCaption(self, *args): return _chilkat.CkZip_put_ExeUnzipCaption(self, *args)
-    def get_ExeUnzipDir(self, *args): return _chilkat.CkZip_get_ExeUnzipDir(self, *args)
-    def put_ExeUnzipDir(self, *args): return _chilkat.CkZip_put_ExeUnzipDir(self, *args)
-    def get_ExeIconFile(self, *args): return _chilkat.CkZip_get_ExeIconFile(self, *args)
-    def put_ExeIconFile(self, *args): return _chilkat.CkZip_put_ExeIconFile(self, *args)
-    def get_ClearArchiveAttribute(self): return _chilkat.CkZip_get_ClearArchiveAttribute(self)
-    def put_ClearArchiveAttribute(self, *args): return _chilkat.CkZip_put_ClearArchiveAttribute(self, *args)
-    def get_NumEntries(self): return _chilkat.CkZip_get_NumEntries(self)
-    def get_FileName(self, *args): return _chilkat.CkZip_get_FileName(self, *args)
-    def put_FileName(self, *args): return _chilkat.CkZip_put_FileName(self, *args)
-    def get_Comment(self, *args): return _chilkat.CkZip_get_Comment(self, *args)
-    def put_Comment(self, *args): return _chilkat.CkZip_put_Comment(self, *args)
-    def get_PathPrefix(self, *args): return _chilkat.CkZip_get_PathPrefix(self, *args)
-    def put_PathPrefix(self, *args): return _chilkat.CkZip_put_PathPrefix(self, *args)
-    def get_DiscardPaths(self): return _chilkat.CkZip_get_DiscardPaths(self)
-    def put_DiscardPaths(self, *args): return _chilkat.CkZip_put_DiscardPaths(self, *args)
-    def FirstEntry(self): return _chilkat.CkZip_FirstEntry(self)
-    def ExcludeDir(self, *args): return _chilkat.CkZip_ExcludeDir(self, *args)
-    def IsPasswordProtected(self, *args): return _chilkat.CkZip_IsPasswordProtected(self, *args)
-    def OpenFromMemory(self, *args): return _chilkat.CkZip_OpenFromMemory(self, *args)
-    def OpenEmbedded(self, *args): return _chilkat.CkZip_OpenEmbedded(self, *args)
-    def AddEmbedded(self, *args): return _chilkat.CkZip_AddEmbedded(self, *args)
-    def AddEmbeddedFromMemory(self, *args): return _chilkat.CkZip_AddEmbeddedFromMemory(self, *args)
-    def ReplaceEmbedded(self, *args): return _chilkat.CkZip_ReplaceEmbedded(self, *args)
-    def RemoveEmbedded(self, *args): return _chilkat.CkZip_RemoveEmbedded(self, *args)
-    def SetPassword(self, *args): return _chilkat.CkZip_SetPassword(self, *args)
-    def SetExclusions(self, *args): return _chilkat.CkZip_SetExclusions(self, *args)
-    def GetExclusions(self): return _chilkat.CkZip_GetExclusions(self)
-    def FirstMatchingEntry(self, *args): return _chilkat.CkZip_FirstMatchingEntry(self, *args)
-    def GetDirectoryAsXML(self, *args): return _chilkat.CkZip_GetDirectoryAsXML(self, *args)
-    def ExtractMatching(self, *args): return _chilkat.CkZip_ExtractMatching(self, *args)
-    def GetEntryByID(self, *args): return _chilkat.CkZip_GetEntryByID(self, *args)
-    def WriteZip(self): return _chilkat.CkZip_WriteZip(self)
-    def WriteZipAndClose(self): return _chilkat.CkZip_WriteZipAndClose(self)
-    def OpenZip(self, *args): return _chilkat.CkZip_OpenZip(self, *args)
-    def OpenFromWeb(self, *args): return _chilkat.CkZip_OpenFromWeb(self, *args)
-    def NewZip(self, *args): return _chilkat.CkZip_NewZip(self, *args)
-    def GetEntryByName(self, *args): return _chilkat.CkZip_GetEntryByName(self, *args)
-    def GetEntryByIndex(self, *args): return _chilkat.CkZip_GetEntryByIndex(self, *args)
-    def Extract(self, *args): return _chilkat.CkZip_Extract(self, *args)
-    def ExtractNewer(self, *args): return _chilkat.CkZip_ExtractNewer(self, *args)
-    def AppendZip(self, *args): return _chilkat.CkZip_AppendZip(self, *args)
-    def AppendOneFileOrDir(self, *args): return _chilkat.CkZip_AppendOneFileOrDir(self, *args)
-    def AppendFiles(self, *args): return _chilkat.CkZip_AppendFiles(self, *args)
-    def AppendFilesEx(self, *args): return _chilkat.CkZip_AppendFilesEx(self, *args)
-    def AppendMultiple(self, *args): return _chilkat.CkZip_AppendMultiple(self, *args)
-    def AppendData(self, *args): return _chilkat.CkZip_AppendData(self, *args)
-    def AppendString(self, *args): return _chilkat.CkZip_AppendString(self, *args)
-    def AppendString2(self, *args): return _chilkat.CkZip_AppendString2(self, *args)
-    def AppendNew(self, *args): return _chilkat.CkZip_AppendNew(self, *args)
-    def AppendNewDir(self, *args): return _chilkat.CkZip_AppendNewDir(self, *args)
-    def InsertNew(self, *args): return _chilkat.CkZip_InsertNew(self, *args)
-    def AppendCompressed(self, *args): return _chilkat.CkZip_AppendCompressed(self, *args)
-    def DeleteEntry(self, *args): return _chilkat.CkZip_DeleteEntry(self, *args)
-    def AppendBase64(self, *args): return _chilkat.CkZip_AppendBase64(self, *args)
-    def AppendHex(self, *args): return _chilkat.CkZip_AppendHex(self, *args)
-    def WriteExe(self, *args): return _chilkat.CkZip_WriteExe(self, *args)
-    def WriteToMemory(self, *args): return _chilkat.CkZip_WriteToMemory(self, *args)
-    def CloseZip(self): return _chilkat.CkZip_CloseZip(self)
-    def UnlockComponent(self, *args): return _chilkat.CkZip_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkZip_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkZip_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkZip_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkZip_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkZip_LastErrorText(self, *args)
-    def Unzip(self, *args): return _chilkat.CkZip_Unzip(self, *args)
-    def UnzipNewer(self, *args): return _chilkat.CkZip_UnzipNewer(self, *args)
-    def UnzipInto(self, *args): return _chilkat.CkZip_UnzipInto(self, *args)
-    def UnzipMatching(self, *args): return _chilkat.CkZip_UnzipMatching(self, *args)
-    def UnzipMatchingInto(self, *args): return _chilkat.CkZip_UnzipMatchingInto(self, *args)
-    def SetCompressionLevel(self, *args): return _chilkat.CkZip_SetCompressionLevel(self, *args)
-    def WriteExe2(self, *args): return _chilkat.CkZip_WriteExe2(self, *args)
-CkZip_swigregister = _chilkat.CkZip_swigregister
-CkZip_swigregister(CkZip)
-
-class CkZipEntry(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkZipEntry, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkZipEntry, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkZipEntry()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkZipEntry
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkZipEntry_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkZipEntry_put_Utf8(self, *args)
-    def lastErrorText(self): return _chilkat.CkZipEntry_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkZipEntry_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkZipEntry_lastErrorHtml(self)
-    def fileName(self): return _chilkat.CkZipEntry_fileName(self)
-    def comment(self): return _chilkat.CkZipEntry_comment(self)
-    def inflateToString(self, *args): return _chilkat.CkZipEntry_inflateToString(self, *args)
-    def inflateToString2(self): return _chilkat.CkZipEntry_inflateToString2(self)
-    def copyToBase64(self): return _chilkat.CkZipEntry_copyToBase64(self)
-    def copyToHex(self): return _chilkat.CkZipEntry_copyToHex(self)
-    def get_FileName(self, *args): return _chilkat.CkZipEntry_get_FileName(self, *args)
-    def put_FileName(self, *args): return _chilkat.CkZipEntry_put_FileName(self, *args)
-    def get_UncompressedLength(self): return _chilkat.CkZipEntry_get_UncompressedLength(self)
-    def get_CompressionLevel(self): return _chilkat.CkZipEntry_get_CompressionLevel(self)
-    def put_CompressionLevel(self, *args): return _chilkat.CkZipEntry_put_CompressionLevel(self, *args)
-    def get_CompressionMethod(self): return _chilkat.CkZipEntry_get_CompressionMethod(self)
-    def put_CompressionMethod(self, *args): return _chilkat.CkZipEntry_put_CompressionMethod(self, *args)
-    def get_CompressedLength(self): return _chilkat.CkZipEntry_get_CompressedLength(self)
-    def get_Comment(self, *args): return _chilkat.CkZipEntry_get_Comment(self, *args)
-    def put_Comment(self, *args): return _chilkat.CkZipEntry_put_Comment(self, *args)
-    def get_EntryType(self): return _chilkat.CkZipEntry_get_EntryType(self)
-    def get_FileDateTime(self, *args): return _chilkat.CkZipEntry_get_FileDateTime(self, *args)
-    def put_FileDateTime(self, *args): return _chilkat.CkZipEntry_put_FileDateTime(self, *args)
-    def get_IsDirectory(self): return _chilkat.CkZipEntry_get_IsDirectory(self)
-    def get_EntryID(self): return _chilkat.CkZipEntry_get_EntryID(self)
-    def Extract(self, *args): return _chilkat.CkZipEntry_Extract(self, *args)
-    def ExtractInto(self, *args): return _chilkat.CkZipEntry_ExtractInto(self, *args)
-    def InflateToString(self, *args): return _chilkat.CkZipEntry_InflateToString(self, *args)
-    def InflateToString2(self, *args): return _chilkat.CkZipEntry_InflateToString2(self, *args)
-    def Inflate(self, *args): return _chilkat.CkZipEntry_Inflate(self, *args)
-    def ReplaceData(self, *args): return _chilkat.CkZipEntry_ReplaceData(self, *args)
-    def AppendData(self, *args): return _chilkat.CkZipEntry_AppendData(self, *args)
-    def CopyToBase64(self, *args): return _chilkat.CkZipEntry_CopyToBase64(self, *args)
-    def CopyToHex(self, *args): return _chilkat.CkZipEntry_CopyToHex(self, *args)
-    def Copy(self, *args): return _chilkat.CkZipEntry_Copy(self, *args)
-    def NextEntry(self): return _chilkat.CkZipEntry_NextEntry(self)
-    def SaveLastError(self, *args): return _chilkat.CkZipEntry_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkZipEntry_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkZipEntry_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkZipEntry_LastErrorText(self, *args)
-CkZipEntry_swigregister = _chilkat.CkZipEntry_swigregister
-CkZipEntry_swigregister(CkZipEntry)
-
-class CkFileAccess(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkFileAccess, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkFileAccess, name)
-    __repr__ = _swig_repr
-    def get_Utf8(self): return _chilkat.CkFileAccess_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkFileAccess_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkFileAccess_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkFileAccess_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkFileAccess_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkFileAccess_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkFileAccess_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkFileAccess_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkFileAccess_lastErrorHtml(self)
-    def ReadEntireTextFile(self, *args): return _chilkat.CkFileAccess_ReadEntireTextFile(self, *args)
-    def readEntireTextFile(self, *args): return _chilkat.CkFileAccess_readEntireTextFile(self, *args)
-    def get_CurrentDir(self, *args): return _chilkat.CkFileAccess_get_CurrentDir(self, *args)
-    def currentDir(self): return _chilkat.CkFileAccess_currentDir(self)
-    def get_EndOfFile(self): return _chilkat.CkFileAccess_get_EndOfFile(self)
-    def SetCurrentDir(self, *args): return _chilkat.CkFileAccess_SetCurrentDir(self, *args)
-    def AppendAnsi(self, *args): return _chilkat.CkFileAccess_AppendAnsi(self, *args)
-    def AppendText(self, *args): return _chilkat.CkFileAccess_AppendText(self, *args)
-    def AppendUnicodeBOM(self): return _chilkat.CkFileAccess_AppendUnicodeBOM(self)
-    def AppendUtf8BOM(self): return _chilkat.CkFileAccess_AppendUtf8BOM(self)
-    def DirAutoCreate(self, *args): return _chilkat.CkFileAccess_DirAutoCreate(self, *args)
-    def DirCreate(self, *args): return _chilkat.CkFileAccess_DirCreate(self, *args)
-    def DirDelete(self, *args): return _chilkat.CkFileAccess_DirDelete(self, *args)
-    def DirEnsureExists(self, *args): return _chilkat.CkFileAccess_DirEnsureExists(self, *args)
-    def FileClose(self): return _chilkat.CkFileAccess_FileClose(self)
-    def FileCopy(self, *args): return _chilkat.CkFileAccess_FileCopy(self, *args)
-    def FileDelete(self, *args): return _chilkat.CkFileAccess_FileDelete(self, *args)
-    def FileExists(self, *args): return _chilkat.CkFileAccess_FileExists(self, *args)
-    def FileOpen(self, *args): return _chilkat.CkFileAccess_FileOpen(self, *args)
-    def FileRead(self, *args): return _chilkat.CkFileAccess_FileRead(self, *args)
-    def FileRename(self, *args): return _chilkat.CkFileAccess_FileRename(self, *args)
-    def FileSeek(self, *args): return _chilkat.CkFileAccess_FileSeek(self, *args)
-    def FileSize(self, *args): return _chilkat.CkFileAccess_FileSize(self, *args)
-    def FileWrite(self, *args): return _chilkat.CkFileAccess_FileWrite(self, *args)
-    def GetTempFilename(self, *args): return _chilkat.CkFileAccess_GetTempFilename(self, *args)
-    def getTempFilename(self, *args): return _chilkat.CkFileAccess_getTempFilename(self, *args)
-    def ReadEntireFile(self, *args): return _chilkat.CkFileAccess_ReadEntireFile(self, *args)
-    def TreeDelete(self, *args): return _chilkat.CkFileAccess_TreeDelete(self, *args)
-    def WriteEntireFile(self, *args): return _chilkat.CkFileAccess_WriteEntireFile(self, *args)
-    def WriteEntireTextFile(self, *args): return _chilkat.CkFileAccess_WriteEntireTextFile(self, *args)
-    def SplitFile(self, *args): return _chilkat.CkFileAccess_SplitFile(self, *args)
-    def ReassembleFile(self, *args): return _chilkat.CkFileAccess_ReassembleFile(self, *args)
-    def ReadBinaryToEncoded(self, *args): return _chilkat.CkFileAccess_ReadBinaryToEncoded(self, *args)
-    def readBinaryToEncoded(self, *args): return _chilkat.CkFileAccess_readBinaryToEncoded(self, *args)
-    def __init__(self): 
-        this = _chilkat.new_CkFileAccess()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkFileAccess
-    __del__ = lambda self : None;
-CkFileAccess_swigregister = _chilkat.CkFileAccess_swigregister
-CkFileAccess_swigregister(CkFileAccess)
-
-class CkRsa(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRsa, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRsa, name)
-    __repr__ = _swig_repr
-    def get_Utf8(self): return _chilkat.CkRsa_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRsa_put_Utf8(self, *args)
-    def get_LittleEndian(self): return _chilkat.CkRsa_get_LittleEndian(self)
-    def put_LittleEndian(self, *args): return _chilkat.CkRsa_put_LittleEndian(self, *args)
-    def get_Version(self, *args): return _chilkat.CkRsa_get_Version(self, *args)
-    def version(self): return _chilkat.CkRsa_version(self)
-    def OpenSslVerifyBytes(self, *args): return _chilkat.CkRsa_OpenSslVerifyBytes(self, *args)
-    def OpenSslSignBytes(self, *args): return _chilkat.CkRsa_OpenSslSignBytes(self, *args)
-    def OpenSslSignBytesENC(self, *args): return _chilkat.CkRsa_OpenSslSignBytesENC(self, *args)
-    def openSslSignBytesENC(self, *args): return _chilkat.CkRsa_openSslSignBytesENC(self, *args)
-    def OpenSslSignString(self, *args): return _chilkat.CkRsa_OpenSslSignString(self, *args)
-    def OpenSslSignStringENC(self, *args): return _chilkat.CkRsa_OpenSslSignStringENC(self, *args)
-    def openSslSignStringENC(self, *args): return _chilkat.CkRsa_openSslSignStringENC(self, *args)
-    def OpenSslVerifyBytesENC(self, *args): return _chilkat.CkRsa_OpenSslVerifyBytesENC(self, *args)
-    def OpenSslVerifyString(self, *args): return _chilkat.CkRsa_OpenSslVerifyString(self, *args)
-    def openSslVerifyString(self, *args): return _chilkat.CkRsa_openSslVerifyString(self, *args)
-    def OpenSslVerifyStringENC(self, *args): return _chilkat.CkRsa_OpenSslVerifyStringENC(self, *args)
-    def openSslVerifyStringENC(self, *args): return _chilkat.CkRsa_openSslVerifyStringENC(self, *args)
-    def VerifyPrivateKey(self, *args): return _chilkat.CkRsa_VerifyPrivateKey(self, *args)
-    def VerifyHash(self, *args): return _chilkat.CkRsa_VerifyHash(self, *args)
-    def VerifyHashENC(self, *args): return _chilkat.CkRsa_VerifyHashENC(self, *args)
-    def SignHash(self, *args): return _chilkat.CkRsa_SignHash(self, *args)
-    def SignHashENC(self, *args): return _chilkat.CkRsa_SignHashENC(self, *args)
-    def signHashENC(self, *args): return _chilkat.CkRsa_signHashENC(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkRsa_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkRsa_put_VerboseLogging(self, *args)
-    def get_NoUnpad(self): return _chilkat.CkRsa_get_NoUnpad(self)
-    def put_NoUnpad(self, *args): return _chilkat.CkRsa_put_NoUnpad(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkRsa_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkRsa_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRsa_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRsa_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRsa_LastErrorText(self, *args)
-    def VerifyStringENC(self, *args): return _chilkat.CkRsa_VerifyStringENC(self, *args)
-    def VerifyString(self, *args): return _chilkat.CkRsa_VerifyString(self, *args)
-    def VerifyBytesENC(self, *args): return _chilkat.CkRsa_VerifyBytesENC(self, *args)
-    def VerifyBytes(self, *args): return _chilkat.CkRsa_VerifyBytes(self, *args)
-    def signStringENC(self, *args): return _chilkat.CkRsa_signStringENC(self, *args)
-    def signBytesENC(self, *args): return _chilkat.CkRsa_signBytesENC(self, *args)
-    def SignStringENC(self, *args): return _chilkat.CkRsa_SignStringENC(self, *args)
-    def SignBytesENC(self, *args): return _chilkat.CkRsa_SignBytesENC(self, *args)
-    def SignString(self, *args): return _chilkat.CkRsa_SignString(self, *args)
-    def SignBytes(self, *args): return _chilkat.CkRsa_SignBytes(self, *args)
-    def DecryptStringENC(self, *args): return _chilkat.CkRsa_DecryptStringENC(self, *args)
-    def DecryptString(self, *args): return _chilkat.CkRsa_DecryptString(self, *args)
-    def DecryptBytesENC(self, *args): return _chilkat.CkRsa_DecryptBytesENC(self, *args)
-    def DecryptBytes(self, *args): return _chilkat.CkRsa_DecryptBytes(self, *args)
-    def EncryptStringENC(self, *args): return _chilkat.CkRsa_EncryptStringENC(self, *args)
-    def EncryptBytesENC(self, *args): return _chilkat.CkRsa_EncryptBytesENC(self, *args)
-    def EncryptString(self, *args): return _chilkat.CkRsa_EncryptString(self, *args)
-    def EncryptBytes(self, *args): return _chilkat.CkRsa_EncryptBytes(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkRsa_get_EncodingMode(self, *args)
-    def put_EncodingMode(self, *args): return _chilkat.CkRsa_put_EncodingMode(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkRsa_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkRsa_put_Charset(self, *args)
-    def GenerateKey(self, *args): return _chilkat.CkRsa_GenerateKey(self, *args)
-    def ExportPublicKey(self, *args): return _chilkat.CkRsa_ExportPublicKey(self, *args)
-    def ExportPrivateKey(self, *args): return _chilkat.CkRsa_ExportPrivateKey(self, *args)
-    def ImportPublicKey(self, *args): return _chilkat.CkRsa_ImportPublicKey(self, *args)
-    def ImportPrivateKey(self, *args): return _chilkat.CkRsa_ImportPrivateKey(self, *args)
-    def SnkToXml(self, *args): return _chilkat.CkRsa_SnkToXml(self, *args)
-    def get_NumBits(self): return _chilkat.CkRsa_get_NumBits(self)
-    def get_OaepPadding(self): return _chilkat.CkRsa_get_OaepPadding(self)
-    def put_OaepPadding(self, *args): return _chilkat.CkRsa_put_OaepPadding(self, *args)
-    def lastErrorText(self): return _chilkat.CkRsa_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRsa_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRsa_lastErrorHtml(self)
-    def decryptStringENC(self, *args): return _chilkat.CkRsa_decryptStringENC(self, *args)
-    def decryptString(self, *args): return _chilkat.CkRsa_decryptString(self, *args)
-    def encryptStringENC(self, *args): return _chilkat.CkRsa_encryptStringENC(self, *args)
-    def encryptBytesENC(self, *args): return _chilkat.CkRsa_encryptBytesENC(self, *args)
-    def encodingMode(self): return _chilkat.CkRsa_encodingMode(self)
-    def charset(self): return _chilkat.CkRsa_charset(self)
-    def exportPublicKey(self): return _chilkat.CkRsa_exportPublicKey(self)
-    def exportPrivateKey(self): return _chilkat.CkRsa_exportPrivateKey(self)
-    def snkToXml(self, *args): return _chilkat.CkRsa_snkToXml(self, *args)
-    def __init__(self): 
-        this = _chilkat.new_CkRsa()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRsa
-    __del__ = lambda self : None;
-CkRsa_swigregister = _chilkat.CkRsa_swigregister
-CkRsa_swigregister(CkRsa)
-
-class CkEmail(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkEmail, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkEmail, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkEmail()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkEmail
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkEmail_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkEmail_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkEmail_lastErrorHtml(self)
-    def AddDataAttachment2(self, *args): return _chilkat.CkEmail_AddDataAttachment2(self, *args)
-    def AppendToBody(self, *args): return _chilkat.CkEmail_AppendToBody(self, *args)
-    def GetAltHeaderField(self, *args): return _chilkat.CkEmail_GetAltHeaderField(self, *args)
-    def getAltHeaderField(self, *args): return _chilkat.CkEmail_getAltHeaderField(self, *args)
-    def GetDeliveryStatusInfo(self, *args): return _chilkat.CkEmail_GetDeliveryStatusInfo(self, *args)
-    def getDeliveryStatusInfo(self, *args): return _chilkat.CkEmail_getDeliveryStatusInfo(self, *args)
-    def GetAttachedMessageFilename(self, *args): return _chilkat.CkEmail_GetAttachedMessageFilename(self, *args)
-    def getAttachedMessageFilename(self, *args): return _chilkat.CkEmail_getAttachedMessageFilename(self, *args)
-    def LoadXmlString(self, *args): return _chilkat.CkEmail_LoadXmlString(self, *args)
-    def SetAttachmentCharset(self, *args): return _chilkat.CkEmail_SetAttachmentCharset(self, *args)
-    def SetFromMimeObject(self, *args): return _chilkat.CkEmail_SetFromMimeObject(self, *args)
-    def AspUnpack(self, *args): return _chilkat.CkEmail_AspUnpack(self, *args)
-    def AspUnpack2(self, *args): return _chilkat.CkEmail_AspUnpack2(self, *args)
-    def GetImapUid(self): return _chilkat.CkEmail_GetImapUid(self)
-    def HasHeaderMatching(self, *args): return _chilkat.CkEmail_HasHeaderMatching(self, *args)
-    def get_Language(self, *args): return _chilkat.CkEmail_get_Language(self, *args)
-    def language(self): return _chilkat.CkEmail_language(self)
-    def GetDsnFinalRecipients(self): return _chilkat.CkEmail_GetDsnFinalRecipients(self)
-    def GetRelatedContentLocation(self, *args): return _chilkat.CkEmail_GetRelatedContentLocation(self, *args)
-    def getRelatedContentLocation(self, *args): return _chilkat.CkEmail_getRelatedContentLocation(self, *args)
-    def GetMimeBinary(self, *args): return _chilkat.CkEmail_GetMimeBinary(self, *args)
-    def AttachMessage(self, *args): return _chilkat.CkEmail_AttachMessage(self, *args)
-    def ComputeGlobalKey(self, *args): return _chilkat.CkEmail_ComputeGlobalKey(self, *args)
-    def computeGlobalKey(self, *args): return _chilkat.CkEmail_computeGlobalKey(self, *args)
-    def get_NumDaysOld(self): return _chilkat.CkEmail_get_NumDaysOld(self)
-    def get_PreferredCharset(self, *args): return _chilkat.CkEmail_get_PreferredCharset(self, *args)
-    def preferredCharset(self): return _chilkat.CkEmail_preferredCharset(self)
-    def put_PreferredCharset(self, *args): return _chilkat.CkEmail_put_PreferredCharset(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkEmail_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkEmail_put_VerboseLogging(self, *args)
-    def AddRelatedHeader(self, *args): return _chilkat.CkEmail_AddRelatedHeader(self, *args)
-    def ClearEncryptCerts(self): return _chilkat.CkEmail_ClearEncryptCerts(self)
-    def AddEncryptCert(self, *args): return _chilkat.CkEmail_AddEncryptCert(self, *args)
-    def UnpackHtml(self, *args): return _chilkat.CkEmail_UnpackHtml(self, *args)
-    def SetFromMimeBytes(self, *args): return _chilkat.CkEmail_SetFromMimeBytes(self, *args)
-    def SetAttachmentDisposition(self, *args): return _chilkat.CkEmail_SetAttachmentDisposition(self, *args)
-    def RemoveHtmlAlternative(self): return _chilkat.CkEmail_RemoveHtmlAlternative(self)
-    def RemovePlainTextAlternative(self): return _chilkat.CkEmail_RemovePlainTextAlternative(self)
-    def AddHeaderField2(self, *args): return _chilkat.CkEmail_AddHeaderField2(self, *args)
-    def get_PrependHeaders(self): return _chilkat.CkEmail_get_PrependHeaders(self)
-    def put_PrependHeaders(self, *args): return _chilkat.CkEmail_put_PrependHeaders(self, *args)
-    def CreateDsn(self, *args): return _chilkat.CkEmail_CreateDsn(self, *args)
-    def CreateMdn(self, *args): return _chilkat.CkEmail_CreateMdn(self, *args)
-    def get_SigningHashAlg(self, *args): return _chilkat.CkEmail_get_SigningHashAlg(self, *args)
-    def signingHashAlg(self): return _chilkat.CkEmail_signingHashAlg(self)
-    def put_SigningHashAlg(self, *args): return _chilkat.CkEmail_put_SigningHashAlg(self, *args)
-    def get_Pkcs7CryptAlg(self, *args): return _chilkat.CkEmail_get_Pkcs7CryptAlg(self, *args)
-    def pkcs7CryptAlg(self): return _chilkat.CkEmail_pkcs7CryptAlg(self)
-    def put_Pkcs7CryptAlg(self, *args): return _chilkat.CkEmail_put_Pkcs7CryptAlg(self, *args)
-    def get_Pkcs7KeyLength(self): return _chilkat.CkEmail_get_Pkcs7KeyLength(self)
-    def put_Pkcs7KeyLength(self, *args): return _chilkat.CkEmail_put_Pkcs7KeyLength(self, *args)
-    def SetTextBody(self, *args): return _chilkat.CkEmail_SetTextBody(self, *args)
-    def getRelatedStringCrLf(self, *args): return _chilkat.CkEmail_getRelatedStringCrLf(self, *args)
-    def getRelatedContentID(self, *args): return _chilkat.CkEmail_getRelatedContentID(self, *args)
-    def getRelatedFilename(self, *args): return _chilkat.CkEmail_getRelatedFilename(self, *args)
-    def getRelatedString(self, *args): return _chilkat.CkEmail_getRelatedString(self, *args)
-    def getAlternativeBody(self, *args): return _chilkat.CkEmail_getAlternativeBody(self, *args)
-    def getAlternativeContentType(self, *args): return _chilkat.CkEmail_getAlternativeContentType(self, *args)
-    def getHtmlBody(self): return _chilkat.CkEmail_getHtmlBody(self)
-    def getPlainTextBody(self): return _chilkat.CkEmail_getPlainTextBody(self)
-    def getHeaderFieldName(self, *args): return _chilkat.CkEmail_getHeaderFieldName(self, *args)
-    def getHeaderFieldValue(self, *args): return _chilkat.CkEmail_getHeaderFieldValue(self, *args)
-    def getAttachmentStringCrLf(self, *args): return _chilkat.CkEmail_getAttachmentStringCrLf(self, *args)
-    def getAttachmentContentID(self, *args): return _chilkat.CkEmail_getAttachmentContentID(self, *args)
-    def getAttachmentContentType(self, *args): return _chilkat.CkEmail_getAttachmentContentType(self, *args)
-    def getAttachmentHeader(self, *args): return _chilkat.CkEmail_getAttachmentHeader(self, *args)
-    def getAttachmentString(self, *args): return _chilkat.CkEmail_getAttachmentString(self, *args)
-    def getAttachmentFilename(self, *args): return _chilkat.CkEmail_getAttachmentFilename(self, *args)
-    def getHeaderField(self, *args): return _chilkat.CkEmail_getHeaderField(self, *args)
-    def getBcc(self, *args): return _chilkat.CkEmail_getBcc(self, *args)
-    def getCC(self, *args): return _chilkat.CkEmail_getCC(self, *args)
-    def getTo(self, *args): return _chilkat.CkEmail_getTo(self, *args)
-    def getBccAddr(self, *args): return _chilkat.CkEmail_getBccAddr(self, *args)
-    def getCcAddr(self, *args): return _chilkat.CkEmail_getCcAddr(self, *args)
-    def getToAddr(self, *args): return _chilkat.CkEmail_getToAddr(self, *args)
-    def getBccName(self, *args): return _chilkat.CkEmail_getBccName(self, *args)
-    def getCcName(self, *args): return _chilkat.CkEmail_getCcName(self, *args)
-    def getToName(self, *args): return _chilkat.CkEmail_getToName(self, *args)
-    def getMime(self): return _chilkat.CkEmail_getMime(self)
-    def getXml(self): return _chilkat.CkEmail_getXml(self)
-    def uidl(self): return _chilkat.CkEmail_uidl(self)
-    def charset(self): return _chilkat.CkEmail_charset(self)
-    def encryptedBy(self): return _chilkat.CkEmail_encryptedBy(self)
-    def signedBy(self): return _chilkat.CkEmail_signedBy(self)
-    def fromAddress(self): return _chilkat.CkEmail_fromAddress(self)
-    def fromName(self): return _chilkat.CkEmail_fromName(self)
-    def mailer(self): return _chilkat.CkEmail_mailer(self)
-    def header(self): return _chilkat.CkEmail_header(self)
-    def ck_from(self): return _chilkat.CkEmail_ck_from(self)
-    def subject(self): return _chilkat.CkEmail_subject(self)
-    def replyTo(self): return _chilkat.CkEmail_replyTo(self)
-    def bounceAddress(self): return _chilkat.CkEmail_bounceAddress(self)
-    def body(self): return _chilkat.CkEmail_body(self)
-    def qEncodeString(self, *args): return _chilkat.CkEmail_qEncodeString(self, *args)
-    def bEncodeString(self, *args): return _chilkat.CkEmail_bEncodeString(self, *args)
-    def addFileAttachment(self, *args): return _chilkat.CkEmail_addFileAttachment(self, *args)
-    def addRelatedFile(self, *args): return _chilkat.CkEmail_addRelatedFile(self, *args)
-    def addRelatedString(self, *args): return _chilkat.CkEmail_addRelatedString(self, *args)
-    def getReplaceString2(self, *args): return _chilkat.CkEmail_getReplaceString2(self, *args)
-    def getReplaceString(self, *args): return _chilkat.CkEmail_getReplaceString(self, *args)
-    def getReplacePattern(self, *args): return _chilkat.CkEmail_getReplacePattern(self, *args)
-    def generateFilename(self): return _chilkat.CkEmail_generateFilename(self)
-    def fileDistList(self): return _chilkat.CkEmail_fileDistList(self)
-    def createTempMht(self, *args): return _chilkat.CkEmail_createTempMht(self, *args)
-    def qEncodeBytes(self, *args): return _chilkat.CkEmail_qEncodeBytes(self, *args)
-    def bEncodeBytes(self, *args): return _chilkat.CkEmail_bEncodeBytes(self, *args)
-    def GetRelatedContentType(self, *args): return _chilkat.CkEmail_GetRelatedContentType(self, *args)
-    def getRelatedContentType(self, *args): return _chilkat.CkEmail_getRelatedContentType(self, *args)
-    def AddRelatedString2(self, *args): return _chilkat.CkEmail_AddRelatedString2(self, *args)
-    def AddRelatedFile2(self, *args): return _chilkat.CkEmail_AddRelatedFile2(self, *args)
-    def AddRelatedData2(self, *args): return _chilkat.CkEmail_AddRelatedData2(self, *args)
-    def AddStringAttachment(self, *args): return _chilkat.CkEmail_AddStringAttachment(self, *args)
-    def AddStringAttachment2(self, *args): return _chilkat.CkEmail_AddStringAttachment2(self, *args)
-    def AddRelatedString(self, *args): return _chilkat.CkEmail_AddRelatedString(self, *args)
-    def SetFromMimeText(self, *args): return _chilkat.CkEmail_SetFromMimeText(self, *args)
-    def SetFromMimeText2(self, *args): return _chilkat.CkEmail_SetFromMimeText2(self, *args)
-    def LoadEml(self, *args): return _chilkat.CkEmail_LoadEml(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkEmail_LoadXml(self, *args)
-    def SetFromXmlText(self, *args): return _chilkat.CkEmail_SetFromXmlText(self, *args)
-    def ZipAttachments(self, *args): return _chilkat.CkEmail_ZipAttachments(self, *args)
-    def UnzipAttachments(self): return _chilkat.CkEmail_UnzipAttachments(self)
-    def AesEncrypt(self, *args): return _chilkat.CkEmail_AesEncrypt(self, *args)
-    def AesDecrypt(self, *args): return _chilkat.CkEmail_AesDecrypt(self, *args)
-    def Clone(self): return _chilkat.CkEmail_Clone(self)
-    def CreateForward(self): return _chilkat.CkEmail_CreateForward(self)
-    def CreateReply(self): return _chilkat.CkEmail_CreateReply(self)
-    def SetCSP(self, *args): return _chilkat.CkEmail_SetCSP(self, *args)
-    def GetSignedByCert(self): return _chilkat.CkEmail_GetSignedByCert(self)
-    def GetEncryptedByCert(self): return _chilkat.CkEmail_GetEncryptedByCert(self)
-    def GetEncryptCert(self): return _chilkat.CkEmail_GetEncryptCert(self)
-    def GetSigningCert(self): return _chilkat.CkEmail_GetSigningCert(self)
-    def SetEncryptCert(self, *args): return _chilkat.CkEmail_SetEncryptCert(self, *args)
-    def SetSigningCert(self, *args): return _chilkat.CkEmail_SetSigningCert(self, *args)
-    def SetSigningCert2(self, *args): return _chilkat.CkEmail_SetSigningCert2(self, *args)
-    def GetFileContent(self, *args): return _chilkat.CkEmail_GetFileContent(self, *args)
-    def GetRelatedStringCrLf(self, *args): return _chilkat.CkEmail_GetRelatedStringCrLf(self, *args)
-    def GetRelatedContentID(self, *args): return _chilkat.CkEmail_GetRelatedContentID(self, *args)
-    def GetRelatedFilename(self, *args): return _chilkat.CkEmail_GetRelatedFilename(self, *args)
-    def GetRelatedString(self, *args): return _chilkat.CkEmail_GetRelatedString(self, *args)
-    def GetRelatedData(self, *args): return _chilkat.CkEmail_GetRelatedData(self, *args)
-    def AddHeaderField(self, *args): return _chilkat.CkEmail_AddHeaderField(self, *args)
-    def RemoveHeaderField(self, *args): return _chilkat.CkEmail_RemoveHeaderField(self, *args)
-    def SetHtmlBody(self, *args): return _chilkat.CkEmail_SetHtmlBody(self, *args)
-    def SaveRelatedItem(self, *args): return _chilkat.CkEmail_SaveRelatedItem(self, *args)
-    def DropRelatedItem(self, *args): return _chilkat.CkEmail_DropRelatedItem(self, *args)
-    def DropRelatedItems(self): return _chilkat.CkEmail_DropRelatedItems(self)
-    def AddRelatedFile(self, *args): return _chilkat.CkEmail_AddRelatedFile(self, *args)
-    def AddRelatedData(self, *args): return _chilkat.CkEmail_AddRelatedData(self, *args)
-    def AddHtmlAlternativeBody(self, *args): return _chilkat.CkEmail_AddHtmlAlternativeBody(self, *args)
-    def AddPlainTextAlternativeBody(self, *args): return _chilkat.CkEmail_AddPlainTextAlternativeBody(self, *args)
-    def GetAlternativeBody(self, *args): return _chilkat.CkEmail_GetAlternativeBody(self, *args)
-    def GetAlternativeContentType(self, *args): return _chilkat.CkEmail_GetAlternativeContentType(self, *args)
-    def GetHtmlBody(self, *args): return _chilkat.CkEmail_GetHtmlBody(self, *args)
-    def GetPlainTextBody(self, *args): return _chilkat.CkEmail_GetPlainTextBody(self, *args)
-    def get_NumHeaderFields(self): return _chilkat.CkEmail_get_NumHeaderFields(self)
-    def GetHeaderFieldName(self, *args): return _chilkat.CkEmail_GetHeaderFieldName(self, *args)
-    def GetHeaderFieldValue(self, *args): return _chilkat.CkEmail_GetHeaderFieldValue(self, *args)
-    def GetAttachmentStringCrLf(self, *args): return _chilkat.CkEmail_GetAttachmentStringCrLf(self, *args)
-    def GetAttachmentContentID(self, *args): return _chilkat.CkEmail_GetAttachmentContentID(self, *args)
-    def GetAttachmentContentType(self, *args): return _chilkat.CkEmail_GetAttachmentContentType(self, *args)
-    def GetAttachmentHeader(self, *args): return _chilkat.CkEmail_GetAttachmentHeader(self, *args)
-    def GetAttachmentSize(self, *args): return _chilkat.CkEmail_GetAttachmentSize(self, *args)
-    def GetAttachmentString(self, *args): return _chilkat.CkEmail_GetAttachmentString(self, *args)
-    def SaveAllAttachments(self, *args): return _chilkat.CkEmail_SaveAllAttachments(self, *args)
-    def SaveAttachedFile(self, *args): return _chilkat.CkEmail_SaveAttachedFile(self, *args)
-    def GetAttachmentData(self, *args): return _chilkat.CkEmail_GetAttachmentData(self, *args)
-    def DropSingleAttachment(self, *args): return _chilkat.CkEmail_DropSingleAttachment(self, *args)
-    def SetAttachmentFilename(self, *args): return _chilkat.CkEmail_SetAttachmentFilename(self, *args)
-    def GetAttachmentFilename(self, *args): return _chilkat.CkEmail_GetAttachmentFilename(self, *args)
-    def AddAttachmentHeader(self, *args): return _chilkat.CkEmail_AddAttachmentHeader(self, *args)
-    def DropAttachments(self): return _chilkat.CkEmail_DropAttachments(self)
-    def AddFileAttachment(self, *args): return _chilkat.CkEmail_AddFileAttachment(self, *args)
-    def AddFileAttachment2(self, *args): return _chilkat.CkEmail_AddFileAttachment2(self, *args)
-    def AddDataAttachment(self, *args): return _chilkat.CkEmail_AddDataAttachment(self, *args)
-    def get_NumReplacePatterns(self): return _chilkat.CkEmail_get_NumReplacePatterns(self)
-    def GetReplaceString2(self, *args): return _chilkat.CkEmail_GetReplaceString2(self, *args)
-    def GetReplaceString(self, *args): return _chilkat.CkEmail_GetReplaceString(self, *args)
-    def GetReplacePattern(self, *args): return _chilkat.CkEmail_GetReplacePattern(self, *args)
-    def SetReplacePattern(self, *args): return _chilkat.CkEmail_SetReplacePattern(self, *args)
-    def GenerateFilename(self, *args): return _chilkat.CkEmail_GenerateFilename(self, *args)
-    def AddMultipleBcc(self, *args): return _chilkat.CkEmail_AddMultipleBcc(self, *args)
-    def AddMultipleCC(self, *args): return _chilkat.CkEmail_AddMultipleCC(self, *args)
-    def AddMultipleTo(self, *args): return _chilkat.CkEmail_AddMultipleTo(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkEmail_GetHeaderField(self, *args)
-    def GetBcc(self, *args): return _chilkat.CkEmail_GetBcc(self, *args)
-    def GetCC(self, *args): return _chilkat.CkEmail_GetCC(self, *args)
-    def GetTo(self, *args): return _chilkat.CkEmail_GetTo(self, *args)
-    def GetBccAddr(self, *args): return _chilkat.CkEmail_GetBccAddr(self, *args)
-    def GetCcAddr(self, *args): return _chilkat.CkEmail_GetCcAddr(self, *args)
-    def GetToAddr(self, *args): return _chilkat.CkEmail_GetToAddr(self, *args)
-    def GetBccName(self, *args): return _chilkat.CkEmail_GetBccName(self, *args)
-    def GetCcName(self, *args): return _chilkat.CkEmail_GetCcName(self, *args)
-    def GetToName(self, *args): return _chilkat.CkEmail_GetToName(self, *args)
-    def ClearBcc(self): return _chilkat.CkEmail_ClearBcc(self)
-    def ClearCC(self): return _chilkat.CkEmail_ClearCC(self)
-    def ClearTo(self): return _chilkat.CkEmail_ClearTo(self)
-    def AddBcc(self, *args): return _chilkat.CkEmail_AddBcc(self, *args)
-    def AddCC(self, *args): return _chilkat.CkEmail_AddCC(self, *args)
-    def AddTo(self, *args): return _chilkat.CkEmail_AddTo(self, *args)
-    def GetMime(self, *args): return _chilkat.CkEmail_GetMime(self, *args)
-    def GetXml(self, *args): return _chilkat.CkEmail_GetXml(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkEmail_SaveXml(self, *args)
-    def SaveEml(self, *args): return _chilkat.CkEmail_SaveEml(self, *args)
-    def get_Uidl(self, *args): return _chilkat.CkEmail_get_Uidl(self, *args)
-    def get_ReturnReceipt(self): return _chilkat.CkEmail_get_ReturnReceipt(self)
-    def put_ReturnReceipt(self, *args): return _chilkat.CkEmail_put_ReturnReceipt(self, *args)
-    def get_Size(self): return _chilkat.CkEmail_get_Size(self)
-    def get_NumAlternatives(self): return _chilkat.CkEmail_get_NumAlternatives(self)
-    def get_NumRelatedItems(self): return _chilkat.CkEmail_get_NumRelatedItems(self)
-    def get_SendEncrypted(self): return _chilkat.CkEmail_get_SendEncrypted(self)
-    def put_SendEncrypted(self, *args): return _chilkat.CkEmail_put_SendEncrypted(self, *args)
-    def get_FileDistList(self, *args): return _chilkat.CkEmail_get_FileDistList(self, *args)
-    def put_FileDistList(self, *args): return _chilkat.CkEmail_put_FileDistList(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkEmail_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkEmail_put_Charset(self, *args)
-    def get_OverwriteExisting(self): return _chilkat.CkEmail_get_OverwriteExisting(self)
-    def put_OverwriteExisting(self, *args): return _chilkat.CkEmail_put_OverwriteExisting(self, *args)
-    def get_SendSigned(self): return _chilkat.CkEmail_get_SendSigned(self)
-    def put_SendSigned(self, *args): return _chilkat.CkEmail_put_SendSigned(self, *args)
-    def get_EncryptedBy(self, *args): return _chilkat.CkEmail_get_EncryptedBy(self, *args)
-    def get_Decrypted(self): return _chilkat.CkEmail_get_Decrypted(self)
-    def get_SignaturesValid(self): return _chilkat.CkEmail_get_SignaturesValid(self)
-    def get_SignedBy(self, *args): return _chilkat.CkEmail_get_SignedBy(self, *args)
-    def get_ReceivedSigned(self): return _chilkat.CkEmail_get_ReceivedSigned(self)
-    def get_ReceivedEncrypted(self): return _chilkat.CkEmail_get_ReceivedEncrypted(self)
-    def get_NumAttachments(self): return _chilkat.CkEmail_get_NumAttachments(self)
-    def get_FromAddress(self, *args): return _chilkat.CkEmail_get_FromAddress(self, *args)
-    def put_FromAddress(self, *args): return _chilkat.CkEmail_put_FromAddress(self, *args)
-    def get_FromName(self, *args): return _chilkat.CkEmail_get_FromName(self, *args)
-    def put_FromName(self, *args): return _chilkat.CkEmail_put_FromName(self, *args)
-    def get_LocalDate(self, *args): return _chilkat.CkEmail_get_LocalDate(self, *args)
-    def get_EmailDate(self, *args): return _chilkat.CkEmail_get_EmailDate(self, *args)
-    def put_LocalDate(self, *args): return _chilkat.CkEmail_put_LocalDate(self, *args)
-    def put_EmailDate(self, *args): return _chilkat.CkEmail_put_EmailDate(self, *args)
-    def get_Mailer(self, *args): return _chilkat.CkEmail_get_Mailer(self, *args)
-    def put_Mailer(self, *args): return _chilkat.CkEmail_put_Mailer(self, *args)
-    def get_Header(self, *args): return _chilkat.CkEmail_get_Header(self, *args)
-    def get_NumBcc(self): return _chilkat.CkEmail_get_NumBcc(self)
-    def get_NumCC(self): return _chilkat.CkEmail_get_NumCC(self)
-    def get_NumTo(self): return _chilkat.CkEmail_get_NumTo(self)
-    def get_From(self, *args): return _chilkat.CkEmail_get_From(self, *args)
-    def put_From(self, *args): return _chilkat.CkEmail_put_From(self, *args)
-    def get_Subject(self, *args): return _chilkat.CkEmail_get_Subject(self, *args)
-    def put_Subject(self, *args): return _chilkat.CkEmail_put_Subject(self, *args)
-    def get_ReplyTo(self, *args): return _chilkat.CkEmail_get_ReplyTo(self, *args)
-    def put_ReplyTo(self, *args): return _chilkat.CkEmail_put_ReplyTo(self, *args)
-    def get_BounceAddress(self, *args): return _chilkat.CkEmail_get_BounceAddress(self, *args)
-    def put_BounceAddress(self, *args): return _chilkat.CkEmail_put_BounceAddress(self, *args)
-    def get_Body(self, *args): return _chilkat.CkEmail_get_Body(self, *args)
-    def put_Body(self, *args): return _chilkat.CkEmail_put_Body(self, *args)
-    def UidlEquals(self, *args): return _chilkat.CkEmail_UidlEquals(self, *args)
-    def CreateTempMht(self, *args): return _chilkat.CkEmail_CreateTempMht(self, *args)
-    def GetMimeObject(self): return _chilkat.CkEmail_GetMimeObject(self)
-    def SaveLastError(self, *args): return _chilkat.CkEmail_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkEmail_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkEmail_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkEmail_LastErrorText(self, *args)
-    def SetMbPlainTextBody(self, *args): return _chilkat.CkEmail_SetMbPlainTextBody(self, *args)
-    def SetMbHtmlBody(self, *args): return _chilkat.CkEmail_SetMbHtmlBody(self, *args)
-    def GetMbPlainTextBody(self, *args): return _chilkat.CkEmail_GetMbPlainTextBody(self, *args)
-    def GetMbHtmlBody(self, *args): return _chilkat.CkEmail_GetMbHtmlBody(self, *args)
-    def GetMbHeaderField(self, *args): return _chilkat.CkEmail_GetMbHeaderField(self, *args)
-    def GetMbHeaderField2(self, *args): return _chilkat.CkEmail_GetMbHeaderField2(self, *args)
-    def QEncodeBytes(self, *args): return _chilkat.CkEmail_QEncodeBytes(self, *args)
-    def BEncodeBytes(self, *args): return _chilkat.CkEmail_BEncodeBytes(self, *args)
-    def QEncodeString(self, *args): return _chilkat.CkEmail_QEncodeString(self, *args)
-    def BEncodeString(self, *args): return _chilkat.CkEmail_BEncodeString(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkEmail_UnlockComponent(self, *args)
-    def get_NumAttachedMessages(self): return _chilkat.CkEmail_get_NumAttachedMessages(self)
-    def GetAttachedMessage(self, *args): return _chilkat.CkEmail_GetAttachedMessage(self, *args)
-    def RemoveAttachedMessages(self): return _chilkat.CkEmail_RemoveAttachedMessages(self)
-    def RemoveAttachedMessage(self, *args): return _chilkat.CkEmail_RemoveAttachedMessage(self, *args)
-    def GetLinkedDomains(self, *args): return _chilkat.CkEmail_GetLinkedDomains(self, *args)
-    def UnSpamify(self): return _chilkat.CkEmail_UnSpamify(self)
-    def IsMultipartReport(self): return _chilkat.CkEmail_IsMultipartReport(self)
-    def HasHtmlBody(self): return _chilkat.CkEmail_HasHtmlBody(self)
-    def HasPlainTextBody(self): return _chilkat.CkEmail_HasPlainTextBody(self)
-    def RemoveAttachmentPaths(self): return _chilkat.CkEmail_RemoveAttachmentPaths(self)
-    def get_Utf8(self): return _chilkat.CkEmail_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkEmail_put_Utf8(self, *args)
-CkEmail_swigregister = _chilkat.CkEmail_swigregister
-CkEmail_swigregister(CkEmail)
-
-class CkCSP(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCSP, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCSP, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCSP()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCSP
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCSP_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCSP_put_Utf8(self, *args)
-    def lastErrorText(self): return _chilkat.CkCSP_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCSP_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCSP_lastErrorHtml(self)
-    def get_MachineKeyset(self): return _chilkat.CkCSP_get_MachineKeyset(self)
-    def put_MachineKeyset(self, *args): return _chilkat.CkCSP_put_MachineKeyset(self, *args)
-    def hashAlgorithm(self): return _chilkat.CkCSP_hashAlgorithm(self)
-    def encryptAlgorithm(self): return _chilkat.CkCSP_encryptAlgorithm(self)
-    def getKeyContainerName(self, *args): return _chilkat.CkCSP_getKeyContainerName(self, *args)
-    def getSignatureAlgorithm(self, *args): return _chilkat.CkCSP_getSignatureAlgorithm(self, *args)
-    def getKeyExchangeAlgorithm(self, *args): return _chilkat.CkCSP_getKeyExchangeAlgorithm(self, *args)
-    def getHashAlgorithm(self, *args): return _chilkat.CkCSP_getHashAlgorithm(self, *args)
-    def getEncryptionAlgorithm(self, *args): return _chilkat.CkCSP_getEncryptionAlgorithm(self, *args)
-    def keyContainerName(self): return _chilkat.CkCSP_keyContainerName(self)
-    def providerName(self): return _chilkat.CkCSP_providerName(self)
-    def SetProviderMicrosoftBase(self): return _chilkat.CkCSP_SetProviderMicrosoftBase(self)
-    def SetProviderMicrosoftStrong(self): return _chilkat.CkCSP_SetProviderMicrosoftStrong(self)
-    def SetProviderMicrosoftEnhanced(self): return _chilkat.CkCSP_SetProviderMicrosoftEnhanced(self)
-    def SetProviderMicrosoftRsaAes(self): return _chilkat.CkCSP_SetProviderMicrosoftRsaAes(self)
-    def get_ProviderType(self): return _chilkat.CkCSP_get_ProviderType(self)
-    def GetKeyContainerNames(self): return _chilkat.CkCSP_GetKeyContainerNames(self)
-    def SetHashAlgorithm(self, *args): return _chilkat.CkCSP_SetHashAlgorithm(self, *args)
-    def HasHashAlgorithm(self, *args): return _chilkat.CkCSP_HasHashAlgorithm(self, *args)
-    def SetEncryptAlgorithm(self, *args): return _chilkat.CkCSP_SetEncryptAlgorithm(self, *args)
-    def HasEncryptAlgorithm(self, *args): return _chilkat.CkCSP_HasEncryptAlgorithm(self, *args)
-    def get_HashAlgorithmID(self): return _chilkat.CkCSP_get_HashAlgorithmID(self)
-    def get_EncryptAlgorithmID(self): return _chilkat.CkCSP_get_EncryptAlgorithmID(self)
-    def get_HashNumBits(self): return _chilkat.CkCSP_get_HashNumBits(self)
-    def get_EncryptNumBits(self): return _chilkat.CkCSP_get_EncryptNumBits(self)
-    def get_HashAlgorithm(self, *args): return _chilkat.CkCSP_get_HashAlgorithm(self, *args)
-    def get_EncryptAlgorithm(self, *args): return _chilkat.CkCSP_get_EncryptAlgorithm(self, *args)
-    def GetKeyContainerName(self, *args): return _chilkat.CkCSP_GetKeyContainerName(self, *args)
-    def get_NumKeyContainers(self): return _chilkat.CkCSP_get_NumKeyContainers(self)
-    def GetSignatureNumBits(self, *args): return _chilkat.CkCSP_GetSignatureNumBits(self, *args)
-    def GetSignatureAlgorithm(self, *args): return _chilkat.CkCSP_GetSignatureAlgorithm(self, *args)
-    def GetKeyExchangeNumBits(self, *args): return _chilkat.CkCSP_GetKeyExchangeNumBits(self, *args)
-    def GetKeyExchangeAlgorithm(self, *args): return _chilkat.CkCSP_GetKeyExchangeAlgorithm(self, *args)
-    def GetHashNumBits(self, *args): return _chilkat.CkCSP_GetHashNumBits(self, *args)
-    def GetHashAlgorithm(self, *args): return _chilkat.CkCSP_GetHashAlgorithm(self, *args)
-    def GetEncryptionNumBits(self, *args): return _chilkat.CkCSP_GetEncryptionNumBits(self, *args)
-    def GetEncryptionAlgorithm(self, *args): return _chilkat.CkCSP_GetEncryptionAlgorithm(self, *args)
-    def get_KeyContainerName(self, *args): return _chilkat.CkCSP_get_KeyContainerName(self, *args)
-    def put_KeyContainerName(self, *args): return _chilkat.CkCSP_put_KeyContainerName(self, *args)
-    def get_ProviderName(self, *args): return _chilkat.CkCSP_get_ProviderName(self, *args)
-    def put_ProviderName(self, *args): return _chilkat.CkCSP_put_ProviderName(self, *args)
-    def get_NumKeyExchangeAlgorithms(self): return _chilkat.CkCSP_get_NumKeyExchangeAlgorithms(self)
-    def get_NumSignatureAlgorithms(self): return _chilkat.CkCSP_get_NumSignatureAlgorithms(self)
-    def get_NumEncryptAlgorithms(self): return _chilkat.CkCSP_get_NumEncryptAlgorithms(self)
-    def get_NumHashAlgorithms(self): return _chilkat.CkCSP_get_NumHashAlgorithms(self)
-    def SaveLastError(self, *args): return _chilkat.CkCSP_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCSP_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCSP_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCSP_LastErrorText(self, *args)
-CkCSP_swigregister = _chilkat.CkCSP_swigregister
-CkCSP_swigregister(CkCSP)
-
-class CkCert(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCert, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCert, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCert()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCert
-    __del__ = lambda self : None;
-    def CheckRevoked(self): return _chilkat.CkCert_CheckRevoked(self)
-    def get_Sha1Thumbprint(self, *args): return _chilkat.CkCert_get_Sha1Thumbprint(self, *args)
-    def ExportCertXml(self, *args): return _chilkat.CkCert_ExportCertXml(self, *args)
-    def exportCertXml(self): return _chilkat.CkCert_exportCertXml(self)
-    def get_VerboseLogging(self): return _chilkat.CkCert_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkCert_put_VerboseLogging(self, *args)
-    def get_CertVersion(self): return _chilkat.CkCert_get_CertVersion(self)
-    def SetPrivateKey(self, *args): return _chilkat.CkCert_SetPrivateKey(self, *args)
-    def get_OcspUrl(self, *args): return _chilkat.CkCert_get_OcspUrl(self, *args)
-    def ocspUrl(self): return _chilkat.CkCert_ocspUrl(self)
-    def FindIssuer(self): return _chilkat.CkCert_FindIssuer(self)
-    def LoadByIssuerAndSerialNumber(self, *args): return _chilkat.CkCert_LoadByIssuerAndSerialNumber(self, *args)
-    def get_SelfSigned(self): return _chilkat.CkCert_get_SelfSigned(self)
-    def SetPrivateKeyPem(self, *args): return _chilkat.CkCert_SetPrivateKeyPem(self, *args)
-    def GetPrivateKeyPem(self, *args): return _chilkat.CkCert_GetPrivateKeyPem(self, *args)
-    def getPrivateKeyPem(self): return _chilkat.CkCert_getPrivateKeyPem(self)
-    def getEncoded(self): return _chilkat.CkCert_getEncoded(self)
-    def issuerE(self): return _chilkat.CkCert_issuerE(self)
-    def issuerC(self): return _chilkat.CkCert_issuerC(self)
-    def issuerS(self): return _chilkat.CkCert_issuerS(self)
-    def issuerL(self): return _chilkat.CkCert_issuerL(self)
-    def issuerO(self): return _chilkat.CkCert_issuerO(self)
-    def issuerOU(self): return _chilkat.CkCert_issuerOU(self)
-    def issuerCN(self): return _chilkat.CkCert_issuerCN(self)
-    def issuerDN(self): return _chilkat.CkCert_issuerDN(self)
-    def subjectE(self): return _chilkat.CkCert_subjectE(self)
-    def subjectC(self): return _chilkat.CkCert_subjectC(self)
-    def subjectS(self): return _chilkat.CkCert_subjectS(self)
-    def subjectL(self): return _chilkat.CkCert_subjectL(self)
-    def subjectO(self): return _chilkat.CkCert_subjectO(self)
-    def subjectOU(self): return _chilkat.CkCert_subjectOU(self)
-    def subjectCN(self): return _chilkat.CkCert_subjectCN(self)
-    def subjectDN(self): return _chilkat.CkCert_subjectDN(self)
-    def sha1Thumbprint(self): return _chilkat.CkCert_sha1Thumbprint(self)
-    def rfc822Name(self): return _chilkat.CkCert_rfc822Name(self)
-    def serialNumber(self): return _chilkat.CkCert_serialNumber(self)
-    def version(self): return _chilkat.CkCert_version(self)
-    def lastErrorText(self): return _chilkat.CkCert_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCert_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCert_lastErrorHtml(self)
-    def get_IntendedKeyUsage(self): return _chilkat.CkCert_get_IntendedKeyUsage(self)
-    def LoadPfxFile(self, *args): return _chilkat.CkCert_LoadPfxFile(self, *args)
-    def LoadPfxData(self, *args): return _chilkat.CkCert_LoadPfxData(self, *args)
-    def LoadPfxData2(self, *args): return _chilkat.CkCert_LoadPfxData2(self, *args)
-    def ExportToPfxFile(self, *args): return _chilkat.CkCert_ExportToPfxFile(self, *args)
-    def get_Utf8(self): return _chilkat.CkCert_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCert_put_Utf8(self, *args)
-    def LoadFromFile(self, *args): return _chilkat.CkCert_LoadFromFile(self, *args)
-    def LoadFromBase64(self, *args): return _chilkat.CkCert_LoadFromBase64(self, *args)
-    def LoadFromBinary(self, *args): return _chilkat.CkCert_LoadFromBinary(self, *args)
-    def SetFromEncoded(self, *args): return _chilkat.CkCert_SetFromEncoded(self, *args)
-    def GetEncoded(self, *args): return _chilkat.CkCert_GetEncoded(self, *args)
-    def get_IsRoot(self): return _chilkat.CkCert_get_IsRoot(self)
-    def get_IssuerE(self, *args): return _chilkat.CkCert_get_IssuerE(self, *args)
-    def get_IssuerC(self, *args): return _chilkat.CkCert_get_IssuerC(self, *args)
-    def get_IssuerS(self, *args): return _chilkat.CkCert_get_IssuerS(self, *args)
-    def get_IssuerL(self, *args): return _chilkat.CkCert_get_IssuerL(self, *args)
-    def get_IssuerO(self, *args): return _chilkat.CkCert_get_IssuerO(self, *args)
-    def get_IssuerOU(self, *args): return _chilkat.CkCert_get_IssuerOU(self, *args)
-    def get_IssuerCN(self, *args): return _chilkat.CkCert_get_IssuerCN(self, *args)
-    def get_IssuerDN(self, *args): return _chilkat.CkCert_get_IssuerDN(self, *args)
-    def get_SubjectE(self, *args): return _chilkat.CkCert_get_SubjectE(self, *args)
-    def get_SubjectC(self, *args): return _chilkat.CkCert_get_SubjectC(self, *args)
-    def get_SubjectS(self, *args): return _chilkat.CkCert_get_SubjectS(self, *args)
-    def get_SubjectL(self, *args): return _chilkat.CkCert_get_SubjectL(self, *args)
-    def get_SubjectO(self, *args): return _chilkat.CkCert_get_SubjectO(self, *args)
-    def get_SubjectOU(self, *args): return _chilkat.CkCert_get_SubjectOU(self, *args)
-    def get_SubjectCN(self, *args): return _chilkat.CkCert_get_SubjectCN(self, *args)
-    def get_SubjectDN(self, *args): return _chilkat.CkCert_get_SubjectDN(self, *args)
-    def get_SignatureVerified(self): return _chilkat.CkCert_get_SignatureVerified(self)
-    def get_TrustedRoot(self): return _chilkat.CkCert_get_TrustedRoot(self)
-    def get_Revoked(self): return _chilkat.CkCert_get_Revoked(self)
-    def get_Expired(self): return _chilkat.CkCert_get_Expired(self)
-    def HasPrivateKey(self): return _chilkat.CkCert_HasPrivateKey(self)
-    def SaveToFile(self, *args): return _chilkat.CkCert_SaveToFile(self, *args)
-    def get_Rfc822Name(self, *args): return _chilkat.CkCert_get_Rfc822Name(self, *args)
-    def get_ValidTo(self, *args): return _chilkat.CkCert_get_ValidTo(self, *args)
-    def get_ValidFrom(self, *args): return _chilkat.CkCert_get_ValidFrom(self, *args)
-    def get_SerialNumber(self, *args): return _chilkat.CkCert_get_SerialNumber(self, *args)
-    def get_ForTimeStamping(self): return _chilkat.CkCert_get_ForTimeStamping(self)
-    def get_ForCodeSigning(self): return _chilkat.CkCert_get_ForCodeSigning(self)
-    def get_ForClientAuthentication(self): return _chilkat.CkCert_get_ForClientAuthentication(self)
-    def get_ForServerAuthentication(self): return _chilkat.CkCert_get_ForServerAuthentication(self)
-    def get_ForSecureEmail(self): return _chilkat.CkCert_get_ForSecureEmail(self)
-    def get_Version(self, *args): return _chilkat.CkCert_get_Version(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCert_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCert_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCert_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCert_LastErrorText(self, *args)
-    def get_HasKeyContainer(self): return _chilkat.CkCert_get_HasKeyContainer(self)
-    def get_KeyContainerName(self, *args): return _chilkat.CkCert_get_KeyContainerName(self, *args)
-    def keyContainerName(self): return _chilkat.CkCert_keyContainerName(self)
-    def get_CspName(self, *args): return _chilkat.CkCert_get_CspName(self, *args)
-    def cspName(self): return _chilkat.CkCert_cspName(self)
-    def get_MachineKeyset(self): return _chilkat.CkCert_get_MachineKeyset(self)
-    def get_Silent(self): return _chilkat.CkCert_get_Silent(self)
-    def LoadByEmailAddress(self, *args): return _chilkat.CkCert_LoadByEmailAddress(self, *args)
-    def LoadByCommonName(self, *args): return _chilkat.CkCert_LoadByCommonName(self, *args)
-    def ExportCertPem(self, *args): return _chilkat.CkCert_ExportCertPem(self, *args)
-    def ExportCertPemFile(self, *args): return _chilkat.CkCert_ExportCertPemFile(self, *args)
-    def ExportCertDer(self, *args): return _chilkat.CkCert_ExportCertDer(self, *args)
-    def ExportCertDerFile(self, *args): return _chilkat.CkCert_ExportCertDerFile(self, *args)
-    def PemFileToDerFile(self, *args): return _chilkat.CkCert_PemFileToDerFile(self, *args)
-    def ExportPublicKey(self): return _chilkat.CkCert_ExportPublicKey(self)
-    def ExportPrivateKey(self): return _chilkat.CkCert_ExportPrivateKey(self)
-    def LinkPrivateKey(self, *args): return _chilkat.CkCert_LinkPrivateKey(self, *args)
-    def exportCertPem(self): return _chilkat.CkCert_exportCertPem(self)
-CkCert_swigregister = _chilkat.CkCert_swigregister
-CkCert_swigregister(CkCert)
-
-class CkCertStore(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCertStore, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCertStore, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCertStore()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCertStore
-    __del__ = lambda self : None;
-    def CreateFileStore(self, *args): return _chilkat.CkCertStore_CreateFileStore(self, *args)
-    def CreateMemoryStore(self): return _chilkat.CkCertStore_CreateMemoryStore(self)
-    def CreateRegistryStore(self, *args): return _chilkat.CkCertStore_CreateRegistryStore(self, *args)
-    def FindCertByRfc822Name(self, *args): return _chilkat.CkCertStore_FindCertByRfc822Name(self, *args)
-    def OpenChilkatStore(self, *args): return _chilkat.CkCertStore_OpenChilkatStore(self, *args)
-    def OpenCurrentUserStore(self, *args): return _chilkat.CkCertStore_OpenCurrentUserStore(self, *args)
-    def OpenFileStore(self, *args): return _chilkat.CkCertStore_OpenFileStore(self, *args)
-    def OpenOutlookStore(self, *args): return _chilkat.CkCertStore_OpenOutlookStore(self, *args)
-    def OpenRegistryStore(self, *args): return _chilkat.CkCertStore_OpenRegistryStore(self, *args)
-    def FindCertBySha1Thumbprint(self, *args): return _chilkat.CkCertStore_FindCertBySha1Thumbprint(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkCertStore_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkCertStore_put_VerboseLogging(self, *args)
-    def lastErrorText(self): return _chilkat.CkCertStore_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCertStore_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCertStore_lastErrorHtml(self)
-    def version(self): return _chilkat.CkCertStore_version(self)
-    def get_Utf8(self): return _chilkat.CkCertStore_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCertStore_put_Utf8(self, *args)
-    def LoadPfxFile(self, *args): return _chilkat.CkCertStore_LoadPfxFile(self, *args)
-    def LoadPfxData(self, *args): return _chilkat.CkCertStore_LoadPfxData(self, *args)
-    def LoadPfxData2(self, *args): return _chilkat.CkCertStore_LoadPfxData2(self, *args)
-    def FindCertBySerial(self, *args): return _chilkat.CkCertStore_FindCertBySerial(self, *args)
-    def FindCertBySubjectE(self, *args): return _chilkat.CkCertStore_FindCertBySubjectE(self, *args)
-    def FindCertBySubjectO(self, *args): return _chilkat.CkCertStore_FindCertBySubjectO(self, *args)
-    def FindCertBySubjectCN(self, *args): return _chilkat.CkCertStore_FindCertBySubjectCN(self, *args)
-    def FindCertBySubject(self, *args): return _chilkat.CkCertStore_FindCertBySubject(self, *args)
-    def GetEmailCert(self, *args): return _chilkat.CkCertStore_GetEmailCert(self, *args)
-    def FindCertForEmail(self, *args): return _chilkat.CkCertStore_FindCertForEmail(self, *args)
-    def GetCertificate(self, *args): return _chilkat.CkCertStore_GetCertificate(self, *args)
-    def get_NumEmailCerts(self): return _chilkat.CkCertStore_get_NumEmailCerts(self)
-    def RemoveCertificate(self, *args): return _chilkat.CkCertStore_RemoveCertificate(self, *args)
-    def AddCertificate(self, *args): return _chilkat.CkCertStore_AddCertificate(self, *args)
-    def get_NumCertificates(self): return _chilkat.CkCertStore_get_NumCertificates(self)
-    def get_Version(self, *args): return _chilkat.CkCertStore_get_Version(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCertStore_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCertStore_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCertStore_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCertStore_LastErrorText(self, *args)
-CkCertStore_swigregister = _chilkat.CkCertStore_swigregister
-CkCertStore_swigregister(CkCertStore)
-
-class CkCreateCS(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCreateCS, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCreateCS, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCreateCS()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCreateCS
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkCreateCS_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCreateCS_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCreateCS_lastErrorHtml(self)
-    def get_Utf8(self): return _chilkat.CkCreateCS_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCreateCS_put_Utf8(self, *args)
-    def get_ReadOnly(self): return _chilkat.CkCreateCS_get_ReadOnly(self)
-    def put_ReadOnly(self, *args): return _chilkat.CkCreateCS_put_ReadOnly(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCreateCS_get_Version(self, *args)
-    def CreateRegistryStore(self, *args): return _chilkat.CkCreateCS_CreateRegistryStore(self, *args)
-    def OpenRegistryStore(self, *args): return _chilkat.CkCreateCS_OpenRegistryStore(self, *args)
-    def CreateFileStore(self, *args): return _chilkat.CkCreateCS_CreateFileStore(self, *args)
-    def OpenFileStore(self, *args): return _chilkat.CkCreateCS_OpenFileStore(self, *args)
-    def CreateMemoryStore(self): return _chilkat.CkCreateCS_CreateMemoryStore(self)
-    def OpenChilkatStore(self): return _chilkat.CkCreateCS_OpenChilkatStore(self)
-    def OpenOutlookStore(self): return _chilkat.CkCreateCS_OpenOutlookStore(self)
-    def OpenLocalSystemStore(self): return _chilkat.CkCreateCS_OpenLocalSystemStore(self)
-    def OpenCurrentUserStore(self): return _chilkat.CkCreateCS_OpenCurrentUserStore(self)
-    def SaveLastError(self, *args): return _chilkat.CkCreateCS_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCreateCS_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCreateCS_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCreateCS_LastErrorText(self, *args)
-CkCreateCS_swigregister = _chilkat.CkCreateCS_swigregister
-CkCreateCS_swigregister(CkCreateCS)
-
-class CkMime(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMime, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMime, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMime()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMime
-    __del__ = lambda self : None;
-    def Convert8Bit(self): return _chilkat.CkMime_Convert8Bit(self)
-    def get_UseMmDescription(self): return _chilkat.CkMime_get_UseMmDescription(self)
-    def put_UseMmDescription(self, *args): return _chilkat.CkMime_put_UseMmDescription(self, *args)
-    def GetMimeBytes(self, *args): return _chilkat.CkMime_GetMimeBytes(self, *args)
-    def ExtractPartsToFiles(self, *args): return _chilkat.CkMime_ExtractPartsToFiles(self, *args)
-    def AsnBodyToXml(self, *args): return _chilkat.CkMime_AsnBodyToXml(self, *args)
-    def asnBodyToXml(self): return _chilkat.CkMime_asnBodyToXml(self)
-    def get_CurrentDateTime(self, *args): return _chilkat.CkMime_get_CurrentDateTime(self, *args)
-    def currentDateTime(self): return _chilkat.CkMime_currentDateTime(self)
-    def EncryptN(self): return _chilkat.CkMime_EncryptN(self)
-    def AddEncryptCert(self, *args): return _chilkat.CkMime_AddEncryptCert(self, *args)
-    def ClearEncryptCerts(self): return _chilkat.CkMime_ClearEncryptCerts(self)
-    def SetBody(self, *args): return _chilkat.CkMime_SetBody(self, *args)
-    def UrlEncodeBody(self, *args): return _chilkat.CkMime_UrlEncodeBody(self, *args)
-    def AddContentLength(self): return _chilkat.CkMime_AddContentLength(self)
-    def get_VerboseLogging(self): return _chilkat.CkMime_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkMime_put_VerboseLogging(self, *args)
-    def DecryptUsingPfxData(self, *args): return _chilkat.CkMime_DecryptUsingPfxData(self, *args)
-    def DecryptUsingPfxFile(self, *args): return _chilkat.CkMime_DecryptUsingPfxFile(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkMime_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkMime_AddPfxSourceFile(self, *args)
-    def get_Pkcs7CryptAlg(self, *args): return _chilkat.CkMime_get_Pkcs7CryptAlg(self, *args)
-    def pkcs7CryptAlg(self): return _chilkat.CkMime_pkcs7CryptAlg(self)
-    def put_Pkcs7CryptAlg(self, *args): return _chilkat.CkMime_put_Pkcs7CryptAlg(self, *args)
-    def get_Pkcs7KeyLength(self): return _chilkat.CkMime_get_Pkcs7KeyLength(self)
-    def put_Pkcs7KeyLength(self, *args): return _chilkat.CkMime_put_Pkcs7KeyLength(self, *args)
-    def get_SigningHashAlg(self, *args): return _chilkat.CkMime_get_SigningHashAlg(self, *args)
-    def signingHashAlg(self): return _chilkat.CkMime_signingHashAlg(self)
-    def put_SigningHashAlg(self, *args): return _chilkat.CkMime_put_SigningHashAlg(self, *args)
-    def GetHeaderFieldAttribute(self, *args): return _chilkat.CkMime_GetHeaderFieldAttribute(self, *args)
-    def getHeaderFieldAttribute(self, *args): return _chilkat.CkMime_getHeaderFieldAttribute(self, *args)
-    def HasSignatureSigningTime(self, *args): return _chilkat.CkMime_HasSignatureSigningTime(self, *args)
-    def GetSignatureSigningTime(self, *args): return _chilkat.CkMime_GetSignatureSigningTime(self, *args)
-    def RemoveHeaderField(self, *args): return _chilkat.CkMime_RemoveHeaderField(self, *args)
-    def entireHead(self): return _chilkat.CkMime_entireHead(self)
-    def entireBody(self): return _chilkat.CkMime_entireBody(self)
-    def xml(self): return _chilkat.CkMime_xml(self)
-    def mime(self): return _chilkat.CkMime_mime(self)
-    def bodyEncoded(self): return _chilkat.CkMime_bodyEncoded(self)
-    def bodyDecoded(self): return _chilkat.CkMime_bodyDecoded(self)
-    def charset(self): return _chilkat.CkMime_charset(self)
-    def disposition(self): return _chilkat.CkMime_disposition(self)
-    def encoding(self): return _chilkat.CkMime_encoding(self)
-    def contentType(self): return _chilkat.CkMime_contentType(self)
-    def filename(self): return _chilkat.CkMime_filename(self)
-    def name(self): return _chilkat.CkMime_name(self)
-    def boundary(self): return _chilkat.CkMime_boundary(self)
-    def micalg(self): return _chilkat.CkMime_micalg(self)
-    def protocol(self): return _chilkat.CkMime_protocol(self)
-    def header(self, *args): return _chilkat.CkMime_header(self, *args)
-    def headerName(self, *args): return _chilkat.CkMime_headerName(self, *args)
-    def headerValue(self, *args): return _chilkat.CkMime_headerValue(self, *args)
-    def getHeaderField(self, *args): return _chilkat.CkMime_getHeaderField(self, *args)
-    def getHeaderFieldName(self, *args): return _chilkat.CkMime_getHeaderFieldName(self, *args)
-    def getHeaderFieldValue(self, *args): return _chilkat.CkMime_getHeaderFieldValue(self, *args)
-    def getEntireHead(self): return _chilkat.CkMime_getEntireHead(self)
-    def getEntireBody(self): return _chilkat.CkMime_getEntireBody(self)
-    def getXml(self): return _chilkat.CkMime_getXml(self)
-    def getMime(self): return _chilkat.CkMime_getMime(self)
-    def getBodyEncoded(self): return _chilkat.CkMime_getBodyEncoded(self)
-    def getBodyDecoded(self): return _chilkat.CkMime_getBodyDecoded(self)
-    def lastErrorText(self): return _chilkat.CkMime_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkMime_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkMime_lastErrorHtml(self)
-    def get_Utf8(self): return _chilkat.CkMime_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMime_put_Utf8(self, *args)
-    def get_Version(self, *args): return _chilkat.CkMime_get_Version(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkMime_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkMime_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkMime_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkMime_LastErrorText(self, *args)
-    def AddDetachedSignaturePk(self, *args): return _chilkat.CkMime_AddDetachedSignaturePk(self, *args)
-    def AddDetachedSignaturePk2(self, *args): return _chilkat.CkMime_AddDetachedSignaturePk2(self, *args)
-    def ConvertToSignedPk(self, *args): return _chilkat.CkMime_ConvertToSignedPk(self, *args)
-    def Decrypt(self): return _chilkat.CkMime_Decrypt(self)
-    def Decrypt2(self, *args): return _chilkat.CkMime_Decrypt2(self, *args)
-    def Verify(self): return _chilkat.CkMime_Verify(self)
-    def ConvertToMultipartMixed(self): return _chilkat.CkMime_ConvertToMultipartMixed(self)
-    def ConvertToMultipartAlt(self): return _chilkat.CkMime_ConvertToMultipartAlt(self)
-    def SetBodyFromPlainText(self, *args): return _chilkat.CkMime_SetBodyFromPlainText(self, *args)
-    def SetHeaderField(self, *args): return _chilkat.CkMime_SetHeaderField(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkMime_GetHeaderField(self, *args)
-    def GetHeaderFieldName(self, *args): return _chilkat.CkMime_GetHeaderFieldName(self, *args)
-    def GetHeaderFieldValue(self, *args): return _chilkat.CkMime_GetHeaderFieldValue(self, *args)
-    def AddDetachedSignature2(self, *args): return _chilkat.CkMime_AddDetachedSignature2(self, *args)
-    def AddHeaderField(self, *args): return _chilkat.CkMime_AddHeaderField(self, *args)
-    def SetVerifyCert(self, *args): return _chilkat.CkMime_SetVerifyCert(self, *args)
-    def LoadMimeFile(self, *args): return _chilkat.CkMime_LoadMimeFile(self, *args)
-    def LoadMime(self, *args): return _chilkat.CkMime_LoadMime(self, *args)
-    def SaveMime(self, *args): return _chilkat.CkMime_SaveMime(self, *args)
-    def ToEmailObject(self): return _chilkat.CkMime_ToEmailObject(self)
-    def get_NumParts(self): return _chilkat.CkMime_get_NumParts(self)
-    def GetPart(self, *args): return _chilkat.CkMime_GetPart(self, *args)
-    def get_Protocol(self, *args): return _chilkat.CkMime_get_Protocol(self, *args)
-    def put_Protocol(self, *args): return _chilkat.CkMime_put_Protocol(self, *args)
-    def get_Micalg(self, *args): return _chilkat.CkMime_get_Micalg(self, *args)
-    def put_Micalg(self, *args): return _chilkat.CkMime_put_Micalg(self, *args)
-    def get_Boundary(self, *args): return _chilkat.CkMime_get_Boundary(self, *args)
-    def put_Boundary(self, *args): return _chilkat.CkMime_put_Boundary(self, *args)
-    def get_Name(self, *args): return _chilkat.CkMime_get_Name(self, *args)
-    def put_Name(self, *args): return _chilkat.CkMime_put_Name(self, *args)
-    def get_Filename(self, *args): return _chilkat.CkMime_get_Filename(self, *args)
-    def put_Filename(self, *args): return _chilkat.CkMime_put_Filename(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkMime_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkMime_put_Charset(self, *args)
-    def get_Disposition(self, *args): return _chilkat.CkMime_get_Disposition(self, *args)
-    def put_Disposition(self, *args): return _chilkat.CkMime_put_Disposition(self, *args)
-    def get_Encoding(self, *args): return _chilkat.CkMime_get_Encoding(self, *args)
-    def put_Encoding(self, *args): return _chilkat.CkMime_put_Encoding(self, *args)
-    def get_ContentType(self, *args): return _chilkat.CkMime_get_ContentType(self, *args)
-    def put_ContentType(self, *args): return _chilkat.CkMime_put_ContentType(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkMime_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkMime_IsUnlocked(self)
-    def get_NumHeaderFields(self): return _chilkat.CkMime_get_NumHeaderFields(self)
-    def get_NumSignerCerts(self): return _chilkat.CkMime_get_NumSignerCerts(self)
-    def get_NumEncryptCerts(self): return _chilkat.CkMime_get_NumEncryptCerts(self)
-    def get_UnwrapExtras(self): return _chilkat.CkMime_get_UnwrapExtras(self)
-    def put_UnwrapExtras(self, *args): return _chilkat.CkMime_put_UnwrapExtras(self, *args)
-    def SetCSP(self, *args): return _chilkat.CkMime_SetCSP(self, *args)
-    def AppendPart(self, *args): return _chilkat.CkMime_AppendPart(self, *args)
-    def AppendPartFromFile(self, *args): return _chilkat.CkMime_AppendPartFromFile(self, *args)
-    def NewMultipartMixed(self): return _chilkat.CkMime_NewMultipartMixed(self)
-    def NewMultipartRelated(self): return _chilkat.CkMime_NewMultipartRelated(self)
-    def NewMultipartAlternative(self): return _chilkat.CkMime_NewMultipartAlternative(self)
-    def NewMessageRfc822(self, *args): return _chilkat.CkMime_NewMessageRfc822(self, *args)
-    def SaveBody(self, *args): return _chilkat.CkMime_SaveBody(self, *args)
-    def IsMultipart(self): return _chilkat.CkMime_IsMultipart(self)
-    def IsPlainText(self): return _chilkat.CkMime_IsPlainText(self)
-    def IsHtml(self): return _chilkat.CkMime_IsHtml(self)
-    def IsXml(self): return _chilkat.CkMime_IsXml(self)
-    def IsSigned(self): return _chilkat.CkMime_IsSigned(self)
-    def IsEncrypted(self): return _chilkat.CkMime_IsEncrypted(self)
-    def IsMultipartMixed(self): return _chilkat.CkMime_IsMultipartMixed(self)
-    def IsMultipartAlternative(self): return _chilkat.CkMime_IsMultipartAlternative(self)
-    def IsMultipartRelated(self): return _chilkat.CkMime_IsMultipartRelated(self)
-    def IsAttachment(self): return _chilkat.CkMime_IsAttachment(self)
-    def IsText(self): return _chilkat.CkMime_IsText(self)
-    def IsApplicationData(self): return _chilkat.CkMime_IsApplicationData(self)
-    def IsImage(self): return _chilkat.CkMime_IsImage(self)
-    def IsAudio(self): return _chilkat.CkMime_IsAudio(self)
-    def IsVideo(self): return _chilkat.CkMime_IsVideo(self)
-    def GetBodyBinary(self, *args): return _chilkat.CkMime_GetBodyBinary(self, *args)
-    def GetBodyEncoded(self, *args): return _chilkat.CkMime_GetBodyEncoded(self, *args)
-    def GetBodyDecoded(self, *args): return _chilkat.CkMime_GetBodyDecoded(self, *args)
-    def SetBodyFromEncoded(self, *args): return _chilkat.CkMime_SetBodyFromEncoded(self, *args)
-    def SetBodyFromHtml(self, *args): return _chilkat.CkMime_SetBodyFromHtml(self, *args)
-    def SetBodyFromXml(self, *args): return _chilkat.CkMime_SetBodyFromXml(self, *args)
-    def SetBodyFromBinary(self, *args): return _chilkat.CkMime_SetBodyFromBinary(self, *args)
-    def SetBodyFromFile(self, *args): return _chilkat.CkMime_SetBodyFromFile(self, *args)
-    def Encrypt(self, *args): return _chilkat.CkMime_Encrypt(self, *args)
-    def ConvertToSigned(self, *args): return _chilkat.CkMime_ConvertToSigned(self, *args)
-    def AddDetachedSignature(self, *args): return _chilkat.CkMime_AddDetachedSignature(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkMime_SaveXml(self, *args)
-    def GetMime(self, *args): return _chilkat.CkMime_GetMime(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkMime_LoadXml(self, *args)
-    def GetXml(self, *args): return _chilkat.CkMime_GetXml(self, *args)
-    def GetEncryptCert(self, *args): return _chilkat.CkMime_GetEncryptCert(self, *args)
-    def GetSignerCert(self, *args): return _chilkat.CkMime_GetSignerCert(self, *args)
-    def UnwrapSecurity(self): return _chilkat.CkMime_UnwrapSecurity(self)
-    def LoadXmlFile(self, *args): return _chilkat.CkMime_LoadXmlFile(self, *args)
-    def GetEntireHead(self, *args): return _chilkat.CkMime_GetEntireHead(self, *args)
-    def GetEntireBody(self, *args): return _chilkat.CkMime_GetEntireBody(self, *args)
-    def RemovePart(self, *args): return _chilkat.CkMime_RemovePart(self, *args)
-    def ContainsEncryptedParts(self): return _chilkat.CkMime_ContainsEncryptedParts(self)
-    def ContainsSignedParts(self): return _chilkat.CkMime_ContainsSignedParts(self)
-CkMime_swigregister = _chilkat.CkMime_swigregister
-CkMime_swigregister(CkMime)
-
-class CkEmailBundle(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkEmailBundle, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkEmailBundle, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkEmailBundle()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkEmailBundle
-    __del__ = lambda self : None;
-    def FindByHeader(self, *args): return _chilkat.CkEmailBundle_FindByHeader(self, *args)
-    def RemoveEmailByIndex(self, *args): return _chilkat.CkEmailBundle_RemoveEmailByIndex(self, *args)
-    def lastErrorText(self): return _chilkat.CkEmailBundle_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkEmailBundle_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkEmailBundle_lastErrorHtml(self)
-    def getXml(self): return _chilkat.CkEmailBundle_getXml(self)
-    def get_Utf8(self): return _chilkat.CkEmailBundle_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkEmailBundle_put_Utf8(self, *args)
-    def GetUidls(self): return _chilkat.CkEmailBundle_GetUidls(self)
-    def RemoveEmail(self, *args): return _chilkat.CkEmailBundle_RemoveEmail(self, *args)
-    def GetEmail(self, *args): return _chilkat.CkEmailBundle_GetEmail(self, *args)
-    def AddEmail(self, *args): return _chilkat.CkEmailBundle_AddEmail(self, *args)
-    def get_MessageCount(self): return _chilkat.CkEmailBundle_get_MessageCount(self)
-    def GetXml(self, *args): return _chilkat.CkEmailBundle_GetXml(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkEmailBundle_SaveXml(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkEmailBundle_LoadXml(self, *args)
-    def LoadXmlString(self, *args): return _chilkat.CkEmailBundle_LoadXmlString(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkEmailBundle_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkEmailBundle_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkEmailBundle_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkEmailBundle_LastErrorText(self, *args)
-    def SortBySubject(self, *args): return _chilkat.CkEmailBundle_SortBySubject(self, *args)
-    def SortBySender(self, *args): return _chilkat.CkEmailBundle_SortBySender(self, *args)
-    def SortByRecipient(self, *args): return _chilkat.CkEmailBundle_SortByRecipient(self, *args)
-    def SortByDate(self, *args): return _chilkat.CkEmailBundle_SortByDate(self, *args)
-CkEmailBundle_swigregister = _chilkat.CkEmailBundle_swigregister
-CkEmailBundle_swigregister(CkEmailBundle)
-
-class CkMailMan(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMailMan, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMailMan, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMailMan()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMailMan
-    __del__ = lambda self : None;
-    def GetSizeByUidl(self, *args): return _chilkat.CkMailMan_GetSizeByUidl(self, *args)
-    def SendMimeToList(self, *args): return _chilkat.CkMailMan_SendMimeToList(self, *args)
-    def SendToDistributionList(self, *args): return _chilkat.CkMailMan_SendToDistributionList(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkMailMan_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkMailMan_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkMailMan_put_ClientIpAddress(self, *args)
-    def get_Pop3SessionId(self): return _chilkat.CkMailMan_get_Pop3SessionId(self)
-    def MxLookupAll(self, *args): return _chilkat.CkMailMan_MxLookupAll(self, *args)
-    def DeleteByMsgnum(self, *args): return _chilkat.CkMailMan_DeleteByMsgnum(self, *args)
-    def FetchByMsgnum(self, *args): return _chilkat.CkMailMan_FetchByMsgnum(self, *args)
-    def FetchMimeByMsgnum(self, *args): return _chilkat.CkMailMan_FetchMimeByMsgnum(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkMailMan_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkMailMan_put_SendBufferSize(self, *args)
-    def SshTunnel(self, *args): return _chilkat.CkMailMan_SshTunnel(self, *args)
-    def SshAuthenticatePw(self, *args): return _chilkat.CkMailMan_SshAuthenticatePw(self, *args)
-    def SshAuthenticatePk(self, *args): return _chilkat.CkMailMan_SshAuthenticatePk(self, *args)
-    def SshCloseTunnel(self, *args): return _chilkat.CkMailMan_SshCloseTunnel(self, *args)
-    def get_IncludeRootCert(self): return _chilkat.CkMailMan_get_IncludeRootCert(self)
-    def put_IncludeRootCert(self, *args): return _chilkat.CkMailMan_put_IncludeRootCert(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkMailMan_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkMailMan_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkMailMan_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkMailMan_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkMailMan_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkMailMan_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkMailMan_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkMailMan_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkMailMan_put_SocksPassword(self, *args)
-    def get_SocksPort(self): return _chilkat.CkMailMan_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkMailMan_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkMailMan_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkMailMan_put_SocksVersion(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkMailMan_SetSslClientCertPfx(self, *args)
-    def SendMimeBytes(self, *args): return _chilkat.CkMailMan_SendMimeBytes(self, *args)
-    def RenderToMimeBytes(self, *args): return _chilkat.CkMailMan_RenderToMimeBytes(self, *args)
-    def SendMimeBytesQ(self, *args): return _chilkat.CkMailMan_SendMimeBytesQ(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkMailMan_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkMailMan_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkMailMan_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkMailMan_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkMailMan_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkMailMan_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkMailMan_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkMailMan_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkMailMan_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkMailMan_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkMailMan_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkMailMan_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkMailMan_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkMailMan_put_HttpProxyPort(self, *args)
-    def get_AutoFix(self): return _chilkat.CkMailMan_get_AutoFix(self)
-    def put_AutoFix(self, *args): return _chilkat.CkMailMan_put_AutoFix(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkMailMan_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkMailMan_put_VerboseLogging(self, *args)
-    def get_Pop3Stls(self): return _chilkat.CkMailMan_get_Pop3Stls(self)
-    def put_Pop3Stls(self, *args): return _chilkat.CkMailMan_put_Pop3Stls(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkMailMan_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkMailMan_AddPfxSourceFile(self, *args)
-    def SmtpSendRawCommand(self, *args): return _chilkat.CkMailMan_SmtpSendRawCommand(self, *args)
-    def smtpSendRawCommand(self, *args): return _chilkat.CkMailMan_smtpSendRawCommand(self, *args)
-    def Pop3SendRawCommand(self, *args): return _chilkat.CkMailMan_Pop3SendRawCommand(self, *args)
-    def pop3SendRawCommand(self, *args): return _chilkat.CkMailMan_pop3SendRawCommand(self, *args)
-    def Pop3EndSessionNoQuit(self): return _chilkat.CkMailMan_Pop3EndSessionNoQuit(self)
-    def lastErrorText(self): return _chilkat.CkMailMan_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkMailMan_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkMailMan_lastErrorHtml(self)
-    def smtpPassword(self): return _chilkat.CkMailMan_smtpPassword(self)
-    def smtpUsername(self): return _chilkat.CkMailMan_smtpUsername(self)
-    def dsnNotify(self): return _chilkat.CkMailMan_dsnNotify(self)
-    def dsnEnvid(self): return _chilkat.CkMailMan_dsnEnvid(self)
-    def dsnRet(self): return _chilkat.CkMailMan_dsnRet(self)
-    def smtpAuthMethod(self): return _chilkat.CkMailMan_smtpAuthMethod(self)
-    def smtpLoginDomain(self): return _chilkat.CkMailMan_smtpLoginDomain(self)
-    def filter(self): return _chilkat.CkMailMan_filter(self)
-    def popPassword(self): return _chilkat.CkMailMan_popPassword(self)
-    def popUsername(self): return _chilkat.CkMailMan_popUsername(self)
-    def mailHost(self): return _chilkat.CkMailMan_mailHost(self)
-    def heloHostname(self): return _chilkat.CkMailMan_heloHostname(self)
-    def lastSendQFilename(self): return _chilkat.CkMailMan_lastSendQFilename(self)
-    def version(self): return _chilkat.CkMailMan_version(self)
-    def smtpHost(self): return _chilkat.CkMailMan_smtpHost(self)
-    def logMailReceivedFilename(self): return _chilkat.CkMailMan_logMailReceivedFilename(self)
-    def logMailSentFilename(self): return _chilkat.CkMailMan_logMailSentFilename(self)
-    def mxLookup(self, *args): return _chilkat.CkMailMan_mxLookup(self, *args)
-    def renderToMime(self, *args): return _chilkat.CkMailMan_renderToMime(self, *args)
-    def getMailboxInfoXml(self): return _chilkat.CkMailMan_getMailboxInfoXml(self)
-    def VerifyRecipients(self, *args): return _chilkat.CkMailMan_VerifyRecipients(self, *args)
-    def SetSslClientCert(self, *args): return _chilkat.CkMailMan_SetSslClientCert(self, *args)
-    def GetPop3SslServerCert(self): return _chilkat.CkMailMan_GetPop3SslServerCert(self)
-    def GetSmtpSslServerCert(self): return _chilkat.CkMailMan_GetSmtpSslServerCert(self)
-    def get_Pop3SslServerCertVerified(self): return _chilkat.CkMailMan_get_Pop3SslServerCertVerified(self)
-    def get_SmtpSslServerCertVerified(self): return _chilkat.CkMailMan_get_SmtpSslServerCertVerified(self)
-    def GetMailboxSize(self): return _chilkat.CkMailMan_GetMailboxSize(self)
-    def GetMailboxCount(self): return _chilkat.CkMailMan_GetMailboxCount(self)
-    def Pop3BeginSession(self): return _chilkat.CkMailMan_Pop3BeginSession(self)
-    def Pop3EndSession(self): return _chilkat.CkMailMan_Pop3EndSession(self)
-    def Pop3Noop(self): return _chilkat.CkMailMan_Pop3Noop(self)
-    def Pop3Reset(self): return _chilkat.CkMailMan_Pop3Reset(self)
-    def get_Pop3SessionLog(self, *args): return _chilkat.CkMailMan_get_Pop3SessionLog(self, *args)
-    def ClearPop3SessionLog(self): return _chilkat.CkMailMan_ClearPop3SessionLog(self)
-    def pop3SessionLog(self): return _chilkat.CkMailMan_pop3SessionLog(self)
-    def GetMailboxInfoXml(self, *args): return _chilkat.CkMailMan_GetMailboxInfoXml(self, *args)
-    def SetDecryptCert2(self, *args): return _chilkat.CkMailMan_SetDecryptCert2(self, *args)
-    def get_SmtpSessionLog(self, *args): return _chilkat.CkMailMan_get_SmtpSessionLog(self, *args)
-    def ClearSmtpSessionLog(self): return _chilkat.CkMailMan_ClearSmtpSessionLog(self)
-    def smtpSessionLog(self): return _chilkat.CkMailMan_smtpSessionLog(self)
-    def get_Utf8(self): return _chilkat.CkMailMan_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMailMan_put_Utf8(self, *args)
-    def OpenSmtpConnection(self): return _chilkat.CkMailMan_OpenSmtpConnection(self)
-    def CloseSmtpConnection(self): return _chilkat.CkMailMan_CloseSmtpConnection(self)
-    def SmtpReset(self): return _chilkat.CkMailMan_SmtpReset(self)
-    def SmtpNoop(self): return _chilkat.CkMailMan_SmtpNoop(self)
-    def get_HeartbeatMs(self): return _chilkat.CkMailMan_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkMailMan_put_HeartbeatMs(self, *args)
-    def get_HeloHostname(self, *args): return _chilkat.CkMailMan_get_HeloHostname(self, *args)
-    def put_HeloHostname(self, *args): return _chilkat.CkMailMan_put_HeloHostname(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkMailMan_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkMailMan_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkMailMan_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkMailMan_LastErrorText(self, *args)
-    def get_SmtpPassword(self, *args): return _chilkat.CkMailMan_get_SmtpPassword(self, *args)
-    def put_SmtpPassword(self, *args): return _chilkat.CkMailMan_put_SmtpPassword(self, *args)
-    def get_SmtpUsername(self, *args): return _chilkat.CkMailMan_get_SmtpUsername(self, *args)
-    def put_SmtpUsername(self, *args): return _chilkat.CkMailMan_put_SmtpUsername(self, *args)
-    def get_DsnNotify(self, *args): return _chilkat.CkMailMan_get_DsnNotify(self, *args)
-    def put_DsnNotify(self, *args): return _chilkat.CkMailMan_put_DsnNotify(self, *args)
-    def get_DsnEnvid(self, *args): return _chilkat.CkMailMan_get_DsnEnvid(self, *args)
-    def put_DsnEnvid(self, *args): return _chilkat.CkMailMan_put_DsnEnvid(self, *args)
-    def get_DsnRet(self, *args): return _chilkat.CkMailMan_get_DsnRet(self, *args)
-    def put_DsnRet(self, *args): return _chilkat.CkMailMan_put_DsnRet(self, *args)
-    def get_LastSmtpStatus(self): return _chilkat.CkMailMan_get_LastSmtpStatus(self)
-    def get_ReadTimeout(self): return _chilkat.CkMailMan_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkMailMan_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkMailMan_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkMailMan_put_ConnectTimeout(self, *args)
-    def get_ResetDateOnLoad(self): return _chilkat.CkMailMan_get_ResetDateOnLoad(self)
-    def put_ResetDateOnLoad(self, *args): return _chilkat.CkMailMan_put_ResetDateOnLoad(self, *args)
-    def get_OpaqueSigning(self): return _chilkat.CkMailMan_get_OpaqueSigning(self)
-    def put_OpaqueSigning(self, *args): return _chilkat.CkMailMan_put_OpaqueSigning(self, *args)
-    def get_AllOrNone(self): return _chilkat.CkMailMan_get_AllOrNone(self)
-    def put_AllOrNone(self, *args): return _chilkat.CkMailMan_put_AllOrNone(self, *args)
-    def get_Pop3SPA(self): return _chilkat.CkMailMan_get_Pop3SPA(self)
-    def put_Pop3SPA(self, *args): return _chilkat.CkMailMan_put_Pop3SPA(self, *args)
-    def get_StartTLS(self): return _chilkat.CkMailMan_get_StartTLS(self)
-    def put_StartTLS(self, *args): return _chilkat.CkMailMan_put_StartTLS(self, *args)
-    def get_EmbedCertChain(self): return _chilkat.CkMailMan_get_EmbedCertChain(self)
-    def put_EmbedCertChain(self, *args): return _chilkat.CkMailMan_put_EmbedCertChain(self, *args)
-    def get_PopSsl(self): return _chilkat.CkMailMan_get_PopSsl(self)
-    def put_PopSsl(self, *args): return _chilkat.CkMailMan_put_PopSsl(self, *args)
-    def get_SmtpSsl(self): return _chilkat.CkMailMan_get_SmtpSsl(self)
-    def put_SmtpSsl(self, *args): return _chilkat.CkMailMan_put_SmtpSsl(self, *args)
-    def get_ImmediateDelete(self): return _chilkat.CkMailMan_get_ImmediateDelete(self)
-    def put_ImmediateDelete(self, *args): return _chilkat.CkMailMan_put_ImmediateDelete(self, *args)
-    def get_SendIndividual(self): return _chilkat.CkMailMan_get_SendIndividual(self)
-    def put_SendIndividual(self, *args): return _chilkat.CkMailMan_put_SendIndividual(self, *args)
-    def get_SmtpAuthMethod(self, *args): return _chilkat.CkMailMan_get_SmtpAuthMethod(self, *args)
-    def put_SmtpAuthMethod(self, *args): return _chilkat.CkMailMan_put_SmtpAuthMethod(self, *args)
-    def get_SmtpLoginDomain(self, *args): return _chilkat.CkMailMan_get_SmtpLoginDomain(self, *args)
-    def put_SmtpLoginDomain(self, *args): return _chilkat.CkMailMan_put_SmtpLoginDomain(self, *args)
-    def get_Filter(self, *args): return _chilkat.CkMailMan_get_Filter(self, *args)
-    def put_Filter(self, *args): return _chilkat.CkMailMan_put_Filter(self, *args)
-    def get_SizeLimit(self): return _chilkat.CkMailMan_get_SizeLimit(self)
-    def put_SizeLimit(self, *args): return _chilkat.CkMailMan_put_SizeLimit(self, *args)
-    def get_MaxCount(self): return _chilkat.CkMailMan_get_MaxCount(self)
-    def put_MaxCount(self, *args): return _chilkat.CkMailMan_put_MaxCount(self, *args)
-    def get_MailPort(self): return _chilkat.CkMailMan_get_MailPort(self)
-    def put_MailPort(self, *args): return _chilkat.CkMailMan_put_MailPort(self, *args)
-    def get_SmtpPort(self): return _chilkat.CkMailMan_get_SmtpPort(self)
-    def put_SmtpPort(self, *args): return _chilkat.CkMailMan_put_SmtpPort(self, *args)
-    def get_PopPassword(self, *args): return _chilkat.CkMailMan_get_PopPassword(self, *args)
-    def put_PopPassword(self, *args): return _chilkat.CkMailMan_put_PopPassword(self, *args)
-    def put_PopPasswordBase64(self, *args): return _chilkat.CkMailMan_put_PopPasswordBase64(self, *args)
-    def get_PopUsername(self, *args): return _chilkat.CkMailMan_get_PopUsername(self, *args)
-    def put_PopUsername(self, *args): return _chilkat.CkMailMan_put_PopUsername(self, *args)
-    def get_MailHost(self, *args): return _chilkat.CkMailMan_get_MailHost(self, *args)
-    def put_MailHost(self, *args): return _chilkat.CkMailMan_put_MailHost(self, *args)
-    def get_LastSendQFilename(self, *args): return _chilkat.CkMailMan_get_LastSendQFilename(self, *args)
-    def get_Version(self, *args): return _chilkat.CkMailMan_get_Version(self, *args)
-    def get_SmtpHost(self, *args): return _chilkat.CkMailMan_get_SmtpHost(self, *args)
-    def put_SmtpHost(self, *args): return _chilkat.CkMailMan_put_SmtpHost(self, *args)
-    def get_AutoGenMessageId(self): return _chilkat.CkMailMan_get_AutoGenMessageId(self)
-    def put_AutoGenMessageId(self, *args): return _chilkat.CkMailMan_put_AutoGenMessageId(self, *args)
-    def get_LogMailReceivedFilename(self, *args): return _chilkat.CkMailMan_get_LogMailReceivedFilename(self, *args)
-    def put_LogMailReceivedFilename(self, *args): return _chilkat.CkMailMan_put_LogMailReceivedFilename(self, *args)
-    def get_LogMailSentFilename(self, *args): return _chilkat.CkMailMan_get_LogMailSentFilename(self, *args)
-    def put_LogMailSentFilename(self, *args): return _chilkat.CkMailMan_put_LogMailSentFilename(self, *args)
-    def ClearBadEmailAddresses(self): return _chilkat.CkMailMan_ClearBadEmailAddresses(self)
-    def GetBadEmailAddresses(self): return _chilkat.CkMailMan_GetBadEmailAddresses(self)
-    def GetUidls(self): return _chilkat.CkMailMan_GetUidls(self)
-    def IsSmtpDsnCapable(self): return _chilkat.CkMailMan_IsSmtpDsnCapable(self)
-    def VerifySmtpLogin(self): return _chilkat.CkMailMan_VerifySmtpLogin(self)
-    def VerifySmtpConnection(self): return _chilkat.CkMailMan_VerifySmtpConnection(self)
-    def VerifyPopLogin(self): return _chilkat.CkMailMan_VerifyPopLogin(self)
-    def VerifyPopConnection(self): return _chilkat.CkMailMan_VerifyPopConnection(self)
-    def FetchMultiple(self, *args): return _chilkat.CkMailMan_FetchMultiple(self, *args)
-    def FetchMultipleMime(self, *args): return _chilkat.CkMailMan_FetchMultipleMime(self, *args)
-    def TransferMultipleMime(self, *args): return _chilkat.CkMailMan_TransferMultipleMime(self, *args)
-    def FetchMultipleHeaders(self, *args): return _chilkat.CkMailMan_FetchMultipleHeaders(self, *args)
-    def DeleteByUidl(self, *args): return _chilkat.CkMailMan_DeleteByUidl(self, *args)
-    def FetchEmail(self, *args): return _chilkat.CkMailMan_FetchEmail(self, *args)
-    def FetchMime(self, *args): return _chilkat.CkMailMan_FetchMime(self, *args)
-    def DeleteMultiple(self, *args): return _chilkat.CkMailMan_DeleteMultiple(self, *args)
-    def DeleteBundle(self, *args): return _chilkat.CkMailMan_DeleteBundle(self, *args)
-    def FetchSingleHeader(self, *args): return _chilkat.CkMailMan_FetchSingleHeader(self, *args)
-    def FetchSingleHeaderByUidl(self, *args): return _chilkat.CkMailMan_FetchSingleHeaderByUidl(self, *args)
-    def GetFullEmail(self, *args): return _chilkat.CkMailMan_GetFullEmail(self, *args)
-    def GetHeaders(self, *args): return _chilkat.CkMailMan_GetHeaders(self, *args)
-    def DeleteEmail(self, *args): return _chilkat.CkMailMan_DeleteEmail(self, *args)
-    def GetAllHeaders(self, *args): return _chilkat.CkMailMan_GetAllHeaders(self, *args)
-    def LoadXmlString(self, *args): return _chilkat.CkMailMan_LoadXmlString(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkMailMan_LoadXmlFile(self, *args)
-    def LoadXmlEmail(self, *args): return _chilkat.CkMailMan_LoadXmlEmail(self, *args)
-    def MxLookup(self, *args): return _chilkat.CkMailMan_MxLookup(self, *args)
-    def LoadXmlEmailString(self, *args): return _chilkat.CkMailMan_LoadXmlEmailString(self, *args)
-    def QuickSend(self, *args): return _chilkat.CkMailMan_QuickSend(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkMailMan_UnlockComponent(self, *args)
-    def CheckMail(self): return _chilkat.CkMailMan_CheckMail(self)
-    def TransferMail(self): return _chilkat.CkMailMan_TransferMail(self)
-    def CopyMail(self): return _chilkat.CkMailMan_CopyMail(self)
-    def SendBundle(self, *args): return _chilkat.CkMailMan_SendBundle(self, *args)
-    def SendEmail(self, *args): return _chilkat.CkMailMan_SendEmail(self, *args)
-    def SendQ(self, *args): return _chilkat.CkMailMan_SendQ(self, *args)
-    def SendQ2(self, *args): return _chilkat.CkMailMan_SendQ2(self, *args)
-    def LoadMbx(self, *args): return _chilkat.CkMailMan_LoadMbx(self, *args)
-    def LoadEml(self, *args): return _chilkat.CkMailMan_LoadEml(self, *args)
-    def LoadMime(self, *args): return _chilkat.CkMailMan_LoadMime(self, *args)
-    def IsUnlocked(self): return _chilkat.CkMailMan_IsUnlocked(self)
-    def RenderToMime(self, *args): return _chilkat.CkMailMan_RenderToMime(self, *args)
-    def SendMime(self, *args): return _chilkat.CkMailMan_SendMime(self, *args)
-    def SendMimeQ(self, *args): return _chilkat.CkMailMan_SendMimeQ(self, *args)
-CkMailMan_swigregister = _chilkat.CkMailMan_swigregister
-CkMailMan_swigregister(CkMailMan)
-
-class CkGzip(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkGzip, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkGzip, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkGzip()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkGzip
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkGzip_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkGzip_put_Utf8(self, *args)
-    def get_Version(self, *args): return _chilkat.CkGzip_get_Version(self, *args)
-    def version(self): return _chilkat.CkGzip_version(self)
-    def CompressFile2(self, *args): return _chilkat.CkGzip_CompressFile2(self, *args)
-    def CompressString(self, *args): return _chilkat.CkGzip_CompressString(self, *args)
-    def CompressStringToFile(self, *args): return _chilkat.CkGzip_CompressStringToFile(self, *args)
-    def ReadFile(self, *args): return _chilkat.CkGzip_ReadFile(self, *args)
-    def UnTarGz(self, *args): return _chilkat.CkGzip_UnTarGz(self, *args)
-    def UncompressFileToString(self, *args): return _chilkat.CkGzip_UncompressFileToString(self, *args)
-    def uncompressFileToString(self, *args): return _chilkat.CkGzip_uncompressFileToString(self, *args)
-    def UncompressString(self, *args): return _chilkat.CkGzip_UncompressString(self, *args)
-    def uncompressString(self, *args): return _chilkat.CkGzip_uncompressString(self, *args)
-    def WriteFile(self, *args): return _chilkat.CkGzip_WriteFile(self, *args)
-    def ExamineFile(self, *args): return _chilkat.CkGzip_ExamineFile(self, *args)
-    def ExamineMemory(self, *args): return _chilkat.CkGzip_ExamineMemory(self, *args)
-    def Decode(self, *args): return _chilkat.CkGzip_Decode(self, *args)
-    def get_UseCurrentDate(self): return _chilkat.CkGzip_get_UseCurrentDate(self)
-    def put_UseCurrentDate(self, *args): return _chilkat.CkGzip_put_UseCurrentDate(self, *args)
-    def XfdlToXml(self, *args): return _chilkat.CkGzip_XfdlToXml(self, *args)
-    def xfdlToXml(self, *args): return _chilkat.CkGzip_xfdlToXml(self, *args)
-    def Encode(self, *args): return _chilkat.CkGzip_Encode(self, *args)
-    def encode(self, *args): return _chilkat.CkGzip_encode(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkGzip_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkGzip_put_VerboseLogging(self, *args)
-    def lastErrorText(self): return _chilkat.CkGzip_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkGzip_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkGzip_lastErrorHtml(self)
-    def comment(self): return _chilkat.CkGzip_comment(self)
-    def filename(self): return _chilkat.CkGzip_filename(self)
-    def DeflateStringENC(self, *args): return _chilkat.CkGzip_DeflateStringENC(self, *args)
-    def InflateStringENC(self, *args): return _chilkat.CkGzip_InflateStringENC(self, *args)
-    def deflateStringENC(self, *args): return _chilkat.CkGzip_deflateStringENC(self, *args)
-    def inflateStringENC(self, *args): return _chilkat.CkGzip_inflateStringENC(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkGzip_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkGzip_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkGzip_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkGzip_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkGzip_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkGzip_IsUnlocked(self)
-    def CompressFile(self, *args): return _chilkat.CkGzip_CompressFile(self, *args)
-    def UncompressFile(self, *args): return _chilkat.CkGzip_UncompressFile(self, *args)
-    def CompressFileToMem(self, *args): return _chilkat.CkGzip_CompressFileToMem(self, *args)
-    def UncompressFileToMem(self, *args): return _chilkat.CkGzip_UncompressFileToMem(self, *args)
-    def CompressMemToFile(self, *args): return _chilkat.CkGzip_CompressMemToFile(self, *args)
-    def UncompressMemToFile(self, *args): return _chilkat.CkGzip_UncompressMemToFile(self, *args)
-    def CompressMemory(self, *args): return _chilkat.CkGzip_CompressMemory(self, *args)
-    def UncompressMemory(self, *args): return _chilkat.CkGzip_UncompressMemory(self, *args)
-    def get_Filename(self, *args): return _chilkat.CkGzip_get_Filename(self, *args)
-    def put_Filename(self, *args): return _chilkat.CkGzip_put_Filename(self, *args)
-    def get_Comment(self, *args): return _chilkat.CkGzip_get_Comment(self, *args)
-    def put_Comment(self, *args): return _chilkat.CkGzip_put_Comment(self, *args)
-    def get_ExtraData(self, *args): return _chilkat.CkGzip_get_ExtraData(self, *args)
-    def put_ExtraData(self, *args): return _chilkat.CkGzip_put_ExtraData(self, *args)
-    def get_LastMod(self, *args): return _chilkat.CkGzip_get_LastMod(self, *args)
-    def put_LastMod(self, *args): return _chilkat.CkGzip_put_LastMod(self, *args)
-CkGzip_swigregister = _chilkat.CkGzip_swigregister
-CkGzip_swigregister(CkGzip)
-
-class CkUnixCompress(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkUnixCompress, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkUnixCompress, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkUnixCompress()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkUnixCompress
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkUnixCompress_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkUnixCompress_put_Utf8(self, *args)
-    def UncompressString(self, *args): return _chilkat.CkUnixCompress_UncompressString(self, *args)
-    def uncompressString(self, *args): return _chilkat.CkUnixCompress_uncompressString(self, *args)
-    def UncompressFileToString(self, *args): return _chilkat.CkUnixCompress_UncompressFileToString(self, *args)
-    def uncompressFileToString(self, *args): return _chilkat.CkUnixCompress_uncompressFileToString(self, *args)
-    def UnTarZ(self, *args): return _chilkat.CkUnixCompress_UnTarZ(self, *args)
-    def CompressStringToFile(self, *args): return _chilkat.CkUnixCompress_CompressStringToFile(self, *args)
-    def CompressString(self, *args): return _chilkat.CkUnixCompress_CompressString(self, *args)
-    def lastErrorText(self): return _chilkat.CkUnixCompress_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkUnixCompress_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkUnixCompress_lastErrorHtml(self)
-    def SaveLastError(self, *args): return _chilkat.CkUnixCompress_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkUnixCompress_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkUnixCompress_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkUnixCompress_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkUnixCompress_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkUnixCompress_IsUnlocked(self)
-    def CompressFile(self, *args): return _chilkat.CkUnixCompress_CompressFile(self, *args)
-    def UncompressFile(self, *args): return _chilkat.CkUnixCompress_UncompressFile(self, *args)
-    def CompressFileToMem(self, *args): return _chilkat.CkUnixCompress_CompressFileToMem(self, *args)
-    def UncompressFileToMem(self, *args): return _chilkat.CkUnixCompress_UncompressFileToMem(self, *args)
-    def CompressMemToFile(self, *args): return _chilkat.CkUnixCompress_CompressMemToFile(self, *args)
-    def UncompressMemToFile(self, *args): return _chilkat.CkUnixCompress_UncompressMemToFile(self, *args)
-    def CompressMemory(self, *args): return _chilkat.CkUnixCompress_CompressMemory(self, *args)
-    def UncompressMemory(self, *args): return _chilkat.CkUnixCompress_UncompressMemory(self, *args)
-CkUnixCompress_swigregister = _chilkat.CkUnixCompress_swigregister
-CkUnixCompress_swigregister(CkUnixCompress)
-
-class CkCrypt2(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCrypt2, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCrypt2, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCrypt2()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCrypt2
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCrypt2_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCrypt2_put_Utf8(self, *args)
-    def get_IncludeCertChain(self): return _chilkat.CkCrypt2_get_IncludeCertChain(self)
-    def put_IncludeCertChain(self, *args): return _chilkat.CkCrypt2_put_IncludeCertChain(self, *args)
-    def GenEncodedSecretKey(self, *args): return _chilkat.CkCrypt2_GenEncodedSecretKey(self, *args)
-    def ReadFile(self, *args): return _chilkat.CkCrypt2_ReadFile(self, *args)
-    def StringToBytes(self, *args): return _chilkat.CkCrypt2_StringToBytes(self, *args)
-    def BytesToString(self, *args): return _chilkat.CkCrypt2_BytesToString(self, *args)
-    def bytesToString(self, *args): return _chilkat.CkCrypt2_bytesToString(self, *args)
-    def TrimEndingWith(self, *args): return _chilkat.CkCrypt2_TrimEndingWith(self, *args)
-    def trimEndingWith(self, *args): return _chilkat.CkCrypt2_trimEndingWith(self, *args)
-    def WriteFile(self, *args): return _chilkat.CkCrypt2_WriteFile(self, *args)
-    def SetDecryptCert(self, *args): return _chilkat.CkCrypt2_SetDecryptCert(self, *args)
-    def EncryptEncoded(self, *args): return _chilkat.CkCrypt2_EncryptEncoded(self, *args)
-    def encryptEncoded(self, *args): return _chilkat.CkCrypt2_encryptEncoded(self, *args)
-    def DecryptEncoded(self, *args): return _chilkat.CkCrypt2_DecryptEncoded(self, *args)
-    def decryptEncoded(self, *args): return _chilkat.CkCrypt2_decryptEncoded(self, *args)
-    def ReEncode(self, *args): return _chilkat.CkCrypt2_ReEncode(self, *args)
-    def reEncode(self, *args): return _chilkat.CkCrypt2_reEncode(self, *args)
-    def RandomizeKey(self): return _chilkat.CkCrypt2_RandomizeKey(self)
-    def AddEncryptCert(self, *args): return _chilkat.CkCrypt2_AddEncryptCert(self, *args)
-    def ClearEncryptCerts(self): return _chilkat.CkCrypt2_ClearEncryptCerts(self)
-    def GenRandomBytesENC(self, *args): return _chilkat.CkCrypt2_GenRandomBytesENC(self, *args)
-    def genRandomBytesENC(self, *args): return _chilkat.CkCrypt2_genRandomBytesENC(self, *args)
-    def Pbkdf1(self, *args): return _chilkat.CkCrypt2_Pbkdf1(self, *args)
-    def pbkdf1(self, *args): return _chilkat.CkCrypt2_pbkdf1(self, *args)
-    def Pbkdf2(self, *args): return _chilkat.CkCrypt2_Pbkdf2(self, *args)
-    def pbkdf2(self, *args): return _chilkat.CkCrypt2_pbkdf2(self, *args)
-    def get_PbesPassword(self, *args): return _chilkat.CkCrypt2_get_PbesPassword(self, *args)
-    def pbesPassword(self): return _chilkat.CkCrypt2_pbesPassword(self)
-    def put_PbesPassword(self, *args): return _chilkat.CkCrypt2_put_PbesPassword(self, *args)
-    def get_Salt(self, *args): return _chilkat.CkCrypt2_get_Salt(self, *args)
-    def put_Salt(self, *args): return _chilkat.CkCrypt2_put_Salt(self, *args)
-    def get_IterationCount(self): return _chilkat.CkCrypt2_get_IterationCount(self)
-    def put_IterationCount(self, *args): return _chilkat.CkCrypt2_put_IterationCount(self, *args)
-    def SetEncodedSalt(self, *args): return _chilkat.CkCrypt2_SetEncodedSalt(self, *args)
-    def GetEncodedSalt(self, *args): return _chilkat.CkCrypt2_GetEncodedSalt(self, *args)
-    def getEncodedSalt(self, *args): return _chilkat.CkCrypt2_getEncodedSalt(self, *args)
-    def get_PbesAlgorithm(self, *args): return _chilkat.CkCrypt2_get_PbesAlgorithm(self, *args)
-    def pbesAlgorithm(self): return _chilkat.CkCrypt2_pbesAlgorithm(self)
-    def put_PbesAlgorithm(self, *args): return _chilkat.CkCrypt2_put_PbesAlgorithm(self, *args)
-    def HashBeginBytes(self, *args): return _chilkat.CkCrypt2_HashBeginBytes(self, *args)
-    def HashBeginString(self, *args): return _chilkat.CkCrypt2_HashBeginString(self, *args)
-    def HashMoreString(self, *args): return _chilkat.CkCrypt2_HashMoreString(self, *args)
-    def HashMoreBytes(self, *args): return _chilkat.CkCrypt2_HashMoreBytes(self, *args)
-    def HashFinal(self, *args): return _chilkat.CkCrypt2_HashFinal(self, *args)
-    def HashFinalENC(self, *args): return _chilkat.CkCrypt2_HashFinalENC(self, *args)
-    def hashFinalENC(self): return _chilkat.CkCrypt2_hashFinalENC(self)
-    def MySqlAesEncrypt(self, *args): return _chilkat.CkCrypt2_MySqlAesEncrypt(self, *args)
-    def mySqlAesEncrypt(self, *args): return _chilkat.CkCrypt2_mySqlAesEncrypt(self, *args)
-    def MySqlAesDecrypt(self, *args): return _chilkat.CkCrypt2_MySqlAesDecrypt(self, *args)
-    def mySqlAesDecrypt(self, *args): return _chilkat.CkCrypt2_mySqlAesDecrypt(self, *args)
-    def EncodeString(self, *args): return _chilkat.CkCrypt2_EncodeString(self, *args)
-    def encodeString(self, *args): return _chilkat.CkCrypt2_encodeString(self, *args)
-    def DecodeString(self, *args): return _chilkat.CkCrypt2_DecodeString(self, *args)
-    def decodeString(self, *args): return _chilkat.CkCrypt2_decodeString(self, *args)
-    def get_UuMode(self, *args): return _chilkat.CkCrypt2_get_UuMode(self, *args)
-    def uuMode(self): return _chilkat.CkCrypt2_uuMode(self)
-    def put_UuMode(self, *args): return _chilkat.CkCrypt2_put_UuMode(self, *args)
-    def get_UuFilename(self, *args): return _chilkat.CkCrypt2_get_UuFilename(self, *args)
-    def uuFilename(self): return _chilkat.CkCrypt2_uuFilename(self)
-    def put_UuFilename(self, *args): return _chilkat.CkCrypt2_put_UuFilename(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkCrypt2_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkCrypt2_put_VerboseLogging(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkCrypt2_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkCrypt2_AddPfxSourceFile(self, *args)
-    def get_Pkcs7CryptAlg(self, *args): return _chilkat.CkCrypt2_get_Pkcs7CryptAlg(self, *args)
-    def pkcs7CryptAlg(self): return _chilkat.CkCrypt2_pkcs7CryptAlg(self)
-    def put_Pkcs7CryptAlg(self, *args): return _chilkat.CkCrypt2_put_Pkcs7CryptAlg(self, *args)
-    def get_FirstChunk(self): return _chilkat.CkCrypt2_get_FirstChunk(self)
-    def put_FirstChunk(self, *args): return _chilkat.CkCrypt2_put_FirstChunk(self, *args)
-    def get_LastChunk(self): return _chilkat.CkCrypt2_get_LastChunk(self)
-    def put_LastChunk(self, *args): return _chilkat.CkCrypt2_put_LastChunk(self, *args)
-    def get_BlockSize(self): return _chilkat.CkCrypt2_get_BlockSize(self)
-    def genEncodedSecretKey(self, *args): return _chilkat.CkCrypt2_genEncodedSecretKey(self, *args)
-    def SetSecretKeyViaPassword(self, *args): return _chilkat.CkCrypt2_SetSecretKeyViaPassword(self, *args)
-    def get_HavalRounds(self): return _chilkat.CkCrypt2_get_HavalRounds(self)
-    def put_HavalRounds(self, *args): return _chilkat.CkCrypt2_put_HavalRounds(self, *args)
-    def get_Rc2EffectiveKeyLength(self): return _chilkat.CkCrypt2_get_Rc2EffectiveKeyLength(self)
-    def put_Rc2EffectiveKeyLength(self, *args): return _chilkat.CkCrypt2_put_Rc2EffectiveKeyLength(self, *args)
-    def CreateDetachedSignature(self, *args): return _chilkat.CkCrypt2_CreateDetachedSignature(self, *args)
-    def VerifyDetachedSignature(self, *args): return _chilkat.CkCrypt2_VerifyDetachedSignature(self, *args)
-    def SetSigningCert2(self, *args): return _chilkat.CkCrypt2_SetSigningCert2(self, *args)
-    def SetDecryptCert2(self, *args): return _chilkat.CkCrypt2_SetDecryptCert2(self, *args)
-    def HashFileENC(self, *args): return _chilkat.CkCrypt2_HashFileENC(self, *args)
-    def HashFile(self, *args): return _chilkat.CkCrypt2_HashFile(self, *args)
-    def hashFileENC(self, *args): return _chilkat.CkCrypt2_hashFileENC(self, *args)
-    def SetHmacKeyBytes(self, *args): return _chilkat.CkCrypt2_SetHmacKeyBytes(self, *args)
-    def SetHmacKeyString(self, *args): return _chilkat.CkCrypt2_SetHmacKeyString(self, *args)
-    def SetHmacKeyEncoded(self, *args): return _chilkat.CkCrypt2_SetHmacKeyEncoded(self, *args)
-    def HmacBytes(self, *args): return _chilkat.CkCrypt2_HmacBytes(self, *args)
-    def HmacString(self, *args): return _chilkat.CkCrypt2_HmacString(self, *args)
-    def HmacBytesENC(self, *args): return _chilkat.CkCrypt2_HmacBytesENC(self, *args)
-    def HmacStringENC(self, *args): return _chilkat.CkCrypt2_HmacStringENC(self, *args)
-    def hmacStringENC(self, *args): return _chilkat.CkCrypt2_hmacStringENC(self, *args)
-    def hmacBytesENC(self, *args): return _chilkat.CkCrypt2_hmacBytesENC(self, *args)
-    def CreateP7S(self, *args): return _chilkat.CkCrypt2_CreateP7S(self, *args)
-    def VerifyP7S(self, *args): return _chilkat.CkCrypt2_VerifyP7S(self, *args)
-    def CreateP7M(self, *args): return _chilkat.CkCrypt2_CreateP7M(self, *args)
-    def VerifyP7M(self, *args): return _chilkat.CkCrypt2_VerifyP7M(self, *args)
-    def OpaqueVerifyStringENC(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyStringENC(self, *args)
-    def OpaqueVerifyString(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyString(self, *args)
-    def OpaqueVerifyBytesENC(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyBytesENC(self, *args)
-    def OpaqueVerifyBytes(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyBytes(self, *args)
-    def OpaqueSignStringENC(self, *args): return _chilkat.CkCrypt2_OpaqueSignStringENC(self, *args)
-    def OpaqueSignBytesENC(self, *args): return _chilkat.CkCrypt2_OpaqueSignBytesENC(self, *args)
-    def OpaqueSignString(self, *args): return _chilkat.CkCrypt2_OpaqueSignString(self, *args)
-    def OpaqueSignBytes(self, *args): return _chilkat.CkCrypt2_OpaqueSignBytes(self, *args)
-    def opaqueSignStringENC(self, *args): return _chilkat.CkCrypt2_opaqueSignStringENC(self, *args)
-    def opaqueSignBytesENC(self, *args): return _chilkat.CkCrypt2_opaqueSignBytesENC(self, *args)
-    def opaqueVerifyStringENC(self, *args): return _chilkat.CkCrypt2_opaqueVerifyStringENC(self, *args)
-    def opaqueVerifyString(self, *args): return _chilkat.CkCrypt2_opaqueVerifyString(self, *args)
-    def signStringENC(self, *args): return _chilkat.CkCrypt2_signStringENC(self, *args)
-    def signBytesENC(self, *args): return _chilkat.CkCrypt2_signBytesENC(self, *args)
-    def inflateStringENC(self, *args): return _chilkat.CkCrypt2_inflateStringENC(self, *args)
-    def inflateString(self, *args): return _chilkat.CkCrypt2_inflateString(self, *args)
-    def compressStringENC(self, *args): return _chilkat.CkCrypt2_compressStringENC(self, *args)
-    def compressBytesENC(self, *args): return _chilkat.CkCrypt2_compressBytesENC(self, *args)
-    def encryptStringENC(self, *args): return _chilkat.CkCrypt2_encryptStringENC(self, *args)
-    def encryptBytesENC(self, *args): return _chilkat.CkCrypt2_encryptBytesENC(self, *args)
-    def decryptString(self, *args): return _chilkat.CkCrypt2_decryptString(self, *args)
-    def decryptStringENC(self, *args): return _chilkat.CkCrypt2_decryptStringENC(self, *args)
-    def hashStringENC(self, *args): return _chilkat.CkCrypt2_hashStringENC(self, *args)
-    def hashBytesENC(self, *args): return _chilkat.CkCrypt2_hashBytesENC(self, *args)
-    def getEncodedKey(self, *args): return _chilkat.CkCrypt2_getEncodedKey(self, *args)
-    def getEncodedIV(self, *args): return _chilkat.CkCrypt2_getEncodedIV(self, *args)
-    def encode(self, *args): return _chilkat.CkCrypt2_encode(self, *args)
-    def encodingMode(self): return _chilkat.CkCrypt2_encodingMode(self)
-    def compressionAlgorithm(self): return _chilkat.CkCrypt2_compressionAlgorithm(self)
-    def cryptAlgorithm(self): return _chilkat.CkCrypt2_cryptAlgorithm(self)
-    def hashAlgorithm(self): return _chilkat.CkCrypt2_hashAlgorithm(self)
-    def charset(self): return _chilkat.CkCrypt2_charset(self)
-    def cipherMode(self): return _chilkat.CkCrypt2_cipherMode(self)
-    def version(self): return _chilkat.CkCrypt2_version(self)
-    def lastErrorText(self): return _chilkat.CkCrypt2_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCrypt2_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCrypt2_lastErrorHtml(self)
-    def SetEncodedKey(self, *args): return _chilkat.CkCrypt2_SetEncodedKey(self, *args)
-    def SetEncodedIV(self, *args): return _chilkat.CkCrypt2_SetEncodedIV(self, *args)
-    def GetEncodedKey(self, *args): return _chilkat.CkCrypt2_GetEncodedKey(self, *args)
-    def GetEncodedIV(self, *args): return _chilkat.CkCrypt2_GetEncodedIV(self, *args)
-    def Encode(self, *args): return _chilkat.CkCrypt2_Encode(self, *args)
-    def Decode(self, *args): return _chilkat.CkCrypt2_Decode(self, *args)
-    def RandomizeIV(self): return _chilkat.CkCrypt2_RandomizeIV(self)
-    def SetCSP(self, *args): return _chilkat.CkCrypt2_SetCSP(self, *args)
-    def GetLastCert(self): return _chilkat.CkCrypt2_GetLastCert(self)
-    def SetEncryptCert(self, *args): return _chilkat.CkCrypt2_SetEncryptCert(self, *args)
-    def SetSigningCert(self, *args): return _chilkat.CkCrypt2_SetSigningCert(self, *args)
-    def SetVerifyCert(self, *args): return _chilkat.CkCrypt2_SetVerifyCert(self, *args)
-    def CkEncryptFile(self, *args): return _chilkat.CkCrypt2_CkEncryptFile(self, *args)
-    def CkDecryptFile(self, *args): return _chilkat.CkCrypt2_CkDecryptFile(self, *args)
-    def VerifyStringENC(self, *args): return _chilkat.CkCrypt2_VerifyStringENC(self, *args)
-    def VerifyString(self, *args): return _chilkat.CkCrypt2_VerifyString(self, *args)
-    def VerifyBytesENC(self, *args): return _chilkat.CkCrypt2_VerifyBytesENC(self, *args)
-    def VerifyBytes(self, *args): return _chilkat.CkCrypt2_VerifyBytes(self, *args)
-    def SignStringENC(self, *args): return _chilkat.CkCrypt2_SignStringENC(self, *args)
-    def SignBytesENC(self, *args): return _chilkat.CkCrypt2_SignBytesENC(self, *args)
-    def SignString(self, *args): return _chilkat.CkCrypt2_SignString(self, *args)
-    def SignBytes(self, *args): return _chilkat.CkCrypt2_SignBytes(self, *args)
-    def InflateStringENC(self, *args): return _chilkat.CkCrypt2_InflateStringENC(self, *args)
-    def InflateString(self, *args): return _chilkat.CkCrypt2_InflateString(self, *args)
-    def InflateBytesENC(self, *args): return _chilkat.CkCrypt2_InflateBytesENC(self, *args)
-    def InflateBytes(self, *args): return _chilkat.CkCrypt2_InflateBytes(self, *args)
-    def CompressStringENC(self, *args): return _chilkat.CkCrypt2_CompressStringENC(self, *args)
-    def CompressBytesENC(self, *args): return _chilkat.CkCrypt2_CompressBytesENC(self, *args)
-    def CompressString(self, *args): return _chilkat.CkCrypt2_CompressString(self, *args)
-    def CompressBytes(self, *args): return _chilkat.CkCrypt2_CompressBytes(self, *args)
-    def get_CompressionAlgorithm(self, *args): return _chilkat.CkCrypt2_get_CompressionAlgorithm(self, *args)
-    def put_CompressionAlgorithm(self, *args): return _chilkat.CkCrypt2_put_CompressionAlgorithm(self, *args)
-    def DecryptStringENC(self, *args): return _chilkat.CkCrypt2_DecryptStringENC(self, *args)
-    def DecryptString(self, *args): return _chilkat.CkCrypt2_DecryptString(self, *args)
-    def DecryptBytesENC(self, *args): return _chilkat.CkCrypt2_DecryptBytesENC(self, *args)
-    def DecryptBytes(self, *args): return _chilkat.CkCrypt2_DecryptBytes(self, *args)
-    def EncryptStringENC(self, *args): return _chilkat.CkCrypt2_EncryptStringENC(self, *args)
-    def EncryptBytesENC(self, *args): return _chilkat.CkCrypt2_EncryptBytesENC(self, *args)
-    def EncryptString(self, *args): return _chilkat.CkCrypt2_EncryptString(self, *args)
-    def EncryptBytes(self, *args): return _chilkat.CkCrypt2_EncryptBytes(self, *args)
-    def HashBytesENC(self, *args): return _chilkat.CkCrypt2_HashBytesENC(self, *args)
-    def HashStringENC(self, *args): return _chilkat.CkCrypt2_HashStringENC(self, *args)
-    def HashBytes(self, *args): return _chilkat.CkCrypt2_HashBytes(self, *args)
-    def HashString(self, *args): return _chilkat.CkCrypt2_HashString(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkCrypt2_get_EncodingMode(self, *args)
-    def put_EncodingMode(self, *args): return _chilkat.CkCrypt2_put_EncodingMode(self, *args)
-    def get_CryptAlgorithm(self, *args): return _chilkat.CkCrypt2_get_CryptAlgorithm(self, *args)
-    def put_CryptAlgorithm(self, *args): return _chilkat.CkCrypt2_put_CryptAlgorithm(self, *args)
-    def get_HashAlgorithm(self, *args): return _chilkat.CkCrypt2_get_HashAlgorithm(self, *args)
-    def put_HashAlgorithm(self, *args): return _chilkat.CkCrypt2_put_HashAlgorithm(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkCrypt2_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkCrypt2_put_Charset(self, *args)
-    def GenerateSecretKey(self, *args): return _chilkat.CkCrypt2_GenerateSecretKey(self, *args)
-    def get_CipherMode(self, *args): return _chilkat.CkCrypt2_get_CipherMode(self, *args)
-    def put_CipherMode(self, *args): return _chilkat.CkCrypt2_put_CipherMode(self, *args)
-    def get_PaddingScheme(self): return _chilkat.CkCrypt2_get_PaddingScheme(self)
-    def put_PaddingScheme(self, *args): return _chilkat.CkCrypt2_put_PaddingScheme(self, *args)
-    def get_KeyLength(self): return _chilkat.CkCrypt2_get_KeyLength(self)
-    def put_KeyLength(self, *args): return _chilkat.CkCrypt2_put_KeyLength(self, *args)
-    def get_IV(self, *args): return _chilkat.CkCrypt2_get_IV(self, *args)
-    def put_IV(self, *args): return _chilkat.CkCrypt2_put_IV(self, *args)
-    def get_SecretKey(self, *args): return _chilkat.CkCrypt2_get_SecretKey(self, *args)
-    def put_SecretKey(self, *args): return _chilkat.CkCrypt2_put_SecretKey(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCrypt2_get_Version(self, *args)
-    def IsUnlocked(self): return _chilkat.CkCrypt2_IsUnlocked(self)
-    def UnlockComponent(self, *args): return _chilkat.CkCrypt2_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCrypt2_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCrypt2_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCrypt2_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCrypt2_LastErrorText(self, *args)
-    def SetSecretKey(self, *args): return _chilkat.CkCrypt2_SetSecretKey(self, *args)
-    def SetIV(self, *args): return _chilkat.CkCrypt2_SetIV(self, *args)
-    def encodeBytes(self, *args): return _chilkat.CkCrypt2_encodeBytes(self, *args)
-CkCrypt2_swigregister = _chilkat.CkCrypt2_swigregister
-CkCrypt2_swigregister(CkCrypt2)
-
-class CkFtp2(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkFtp2, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkFtp2, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkFtp2()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkFtp2
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkFtp2_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkFtp2_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkFtp2_lastErrorHtml(self)
-    def get_AllocateSize(self): return _chilkat.CkFtp2_get_AllocateSize(self)
-    def get_ConnectVerified(self): return _chilkat.CkFtp2_get_ConnectVerified(self)
-    def get_LoginVerified(self): return _chilkat.CkFtp2_get_LoginVerified(self)
-    def get_PartialTransfer(self): return _chilkat.CkFtp2_get_PartialTransfer(self)
-    def SendCommand(self, *args): return _chilkat.CkFtp2_SendCommand(self, *args)
-    def sendCommand(self, *args): return _chilkat.CkFtp2_sendCommand(self, *args)
-    def DirTreeXml(self, *args): return _chilkat.CkFtp2_DirTreeXml(self, *args)
-    def dirTreeXml(self): return _chilkat.CkFtp2_dirTreeXml(self)
-    def get_BandwidthThrottleUp(self): return _chilkat.CkFtp2_get_BandwidthThrottleUp(self)
-    def put_BandwidthThrottleUp(self, *args): return _chilkat.CkFtp2_put_BandwidthThrottleUp(self, *args)
-    def get_BandwidthThrottleDown(self): return _chilkat.CkFtp2_get_BandwidthThrottleDown(self)
-    def put_BandwidthThrottleDown(self, *args): return _chilkat.CkFtp2_put_BandwidthThrottleDown(self, *args)
-    def get_ActivePortRangeStart(self): return _chilkat.CkFtp2_get_ActivePortRangeStart(self)
-    def put_ActivePortRangeStart(self, *args): return _chilkat.CkFtp2_put_ActivePortRangeStart(self, *args)
-    def get_ActivePortRangeEnd(self): return _chilkat.CkFtp2_get_ActivePortRangeEnd(self)
-    def put_ActivePortRangeEnd(self, *args): return _chilkat.CkFtp2_put_ActivePortRangeEnd(self, *args)
-    def ClearDirCache(self): return _chilkat.CkFtp2_ClearDirCache(self)
-    def get_Account(self, *args): return _chilkat.CkFtp2_get_Account(self, *args)
-    def put_Account(self, *args): return _chilkat.CkFtp2_put_Account(self, *args)
-    def account(self): return _chilkat.CkFtp2_account(self)
-    def get_ProxyPort(self): return _chilkat.CkFtp2_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkFtp2_put_ProxyPort(self, *args)
-    def get_RestartNext(self): return _chilkat.CkFtp2_get_RestartNext(self)
-    def put_RestartNext(self, *args): return _chilkat.CkFtp2_put_RestartNext(self, *args)
-    def SetModeZ(self): return _chilkat.CkFtp2_SetModeZ(self)
-    def get_HasModeZ(self): return _chilkat.CkFtp2_get_HasModeZ(self)
-    def get_AutoXcrc(self): return _chilkat.CkFtp2_get_AutoXcrc(self)
-    def put_AutoXcrc(self, *args): return _chilkat.CkFtp2_put_AutoXcrc(self, *args)
-    def get_AutoFeat(self): return _chilkat.CkFtp2_get_AutoFeat(self)
-    def put_AutoFeat(self, *args): return _chilkat.CkFtp2_put_AutoFeat(self, *args)
-    def get_AutoSyst(self): return _chilkat.CkFtp2_get_AutoSyst(self)
-    def put_AutoSyst(self, *args): return _chilkat.CkFtp2_put_AutoSyst(self, *args)
-    def Feat(self, *args): return _chilkat.CkFtp2_Feat(self, *args)
-    def feat(self): return _chilkat.CkFtp2_feat(self)
-    def SetSslClientCert(self, *args): return _chilkat.CkFtp2_SetSslClientCert(self, *args)
-    def dirListingCharset(self): return _chilkat.CkFtp2_dirListingCharset(self)
-    def getFilename(self, *args): return _chilkat.CkFtp2_getFilename(self, *args)
-    def listPattern(self): return _chilkat.CkFtp2_listPattern(self)
-    def password(self): return _chilkat.CkFtp2_password(self)
-    def username(self): return _chilkat.CkFtp2_username(self)
-    def hostname(self): return _chilkat.CkFtp2_hostname(self)
-    def sessionLog(self): return _chilkat.CkFtp2_sessionLog(self)
-    def getXmlDirListing(self, *args): return _chilkat.CkFtp2_getXmlDirListing(self, *args)
-    def getTextDirListing(self, *args): return _chilkat.CkFtp2_getTextDirListing(self, *args)
-    def getRemoteFileTextData(self, *args): return _chilkat.CkFtp2_getRemoteFileTextData(self, *args)
-    def getRemoteFileTextC(self, *args): return _chilkat.CkFtp2_getRemoteFileTextC(self, *args)
-    def version(self): return _chilkat.CkFtp2_version(self)
-    def getCurrentRemoteDir(self): return _chilkat.CkFtp2_getCurrentRemoteDir(self)
-    def proxyHostname(self): return _chilkat.CkFtp2_proxyHostname(self)
-    def syst(self): return _chilkat.CkFtp2_syst(self)
-    def ck_stat(self): return _chilkat.CkFtp2_ck_stat(self)
-    def asyncLog(self): return _chilkat.CkFtp2_asyncLog(self)
-    def get_Utf8(self): return _chilkat.CkFtp2_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkFtp2_put_Utf8(self, *args)
-    def get_SslServerCertVerified(self): return _chilkat.CkFtp2_get_SslServerCertVerified(self)
-    def GetSslServerCert(self): return _chilkat.CkFtp2_GetSslServerCert(self)
-    def get_RequireSslCertVerify(self): return _chilkat.CkFtp2_get_RequireSslCertVerify(self)
-    def put_RequireSslCertVerify(self, *args): return _chilkat.CkFtp2_put_RequireSslCertVerify(self, *args)
-    def SetSslCertRequirement(self, *args): return _chilkat.CkFtp2_SetSslCertRequirement(self, *args)
-    def get_AuthSsl(self): return _chilkat.CkFtp2_get_AuthSsl(self)
-    def put_AuthSsl(self, *args): return _chilkat.CkFtp2_put_AuthSsl(self, *args)
-    def DetermineSettings(self, *args): return _chilkat.CkFtp2_DetermineSettings(self, *args)
-    def determineSettings(self): return _chilkat.CkFtp2_determineSettings(self)
-    def DetermineProxyMethod(self): return _chilkat.CkFtp2_DetermineProxyMethod(self)
-    def get_PassiveUseHostAddr(self): return _chilkat.CkFtp2_get_PassiveUseHostAddr(self)
-    def put_PassiveUseHostAddr(self, *args): return _chilkat.CkFtp2_put_PassiveUseHostAddr(self, *args)
-    def get_CrlfMode(self): return _chilkat.CkFtp2_get_CrlfMode(self)
-    def put_CrlfMode(self, *args): return _chilkat.CkFtp2_put_CrlfMode(self, *args)
-    def get_ConnectFailReason(self): return _chilkat.CkFtp2_get_ConnectFailReason(self)
-    def ClearControlChannel(self): return _chilkat.CkFtp2_ClearControlChannel(self)
-    def SleepMs(self, *args): return _chilkat.CkFtp2_SleepMs(self, *args)
-    def AppendFile(self, *args): return _chilkat.CkFtp2_AppendFile(self, *args)
-    def AppendFileFromBinaryData(self, *args): return _chilkat.CkFtp2_AppendFileFromBinaryData(self, *args)
-    def AppendFileFromTextData(self, *args): return _chilkat.CkFtp2_AppendFileFromTextData(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkFtp2_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkFtp2_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkFtp2_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkFtp2_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkFtp2_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkFtp2_LastErrorText(self, *args)
-    def get_IsConnected(self): return _chilkat.CkFtp2_get_IsConnected(self)
-    def DeleteMatching(self, *args): return _chilkat.CkFtp2_DeleteMatching(self, *args)
-    def MGetFiles(self, *args): return _chilkat.CkFtp2_MGetFiles(self, *args)
-    def MPutFiles(self, *args): return _chilkat.CkFtp2_MPutFiles(self, *args)
-    def PutTree(self, *args): return _chilkat.CkFtp2_PutTree(self, *args)
-    def GetFile(self, *args): return _chilkat.CkFtp2_GetFile(self, *args)
-    def PutFile(self, *args): return _chilkat.CkFtp2_PutFile(self, *args)
-    def PutFileFromBinaryData(self, *args): return _chilkat.CkFtp2_PutFileFromBinaryData(self, *args)
-    def PutFileFromTextData(self, *args): return _chilkat.CkFtp2_PutFileFromTextData(self, *args)
-    def GetRemoteFileBinaryData(self, *args): return _chilkat.CkFtp2_GetRemoteFileBinaryData(self, *args)
-    def GetRemoteFileTextData(self, *args): return _chilkat.CkFtp2_GetRemoteFileTextData(self, *args)
-    def GetRemoteFileTextC(self, *args): return _chilkat.CkFtp2_GetRemoteFileTextC(self, *args)
-    def get_Version(self, *args): return _chilkat.CkFtp2_get_Version(self, *args)
-    def RenameRemoteFile(self, *args): return _chilkat.CkFtp2_RenameRemoteFile(self, *args)
-    def DeleteRemoteFile(self, *args): return _chilkat.CkFtp2_DeleteRemoteFile(self, *args)
-    def RemoveRemoteDir(self, *args): return _chilkat.CkFtp2_RemoveRemoteDir(self, *args)
-    def CreateRemoteDir(self, *args): return _chilkat.CkFtp2_CreateRemoteDir(self, *args)
-    def Disconnect(self): return _chilkat.CkFtp2_Disconnect(self)
-    def Connect(self): return _chilkat.CkFtp2_Connect(self)
-    def GetCurrentRemoteDir(self, *args): return _chilkat.CkFtp2_GetCurrentRemoteDir(self, *args)
-    def ChangeRemoteDir(self, *args): return _chilkat.CkFtp2_ChangeRemoteDir(self, *args)
-    def get_DirListingCharset(self, *args): return _chilkat.CkFtp2_get_DirListingCharset(self, *args)
-    def put_DirListingCharset(self, *args): return _chilkat.CkFtp2_put_DirListingCharset(self, *args)
-    def get_ListPattern(self, *args): return _chilkat.CkFtp2_get_ListPattern(self, *args)
-    def put_ListPattern(self, *args): return _chilkat.CkFtp2_put_ListPattern(self, *args)
-    def get_Password(self, *args): return _chilkat.CkFtp2_get_Password(self, *args)
-    def put_Password(self, *args): return _chilkat.CkFtp2_put_Password(self, *args)
-    def get_Username(self, *args): return _chilkat.CkFtp2_get_Username(self, *args)
-    def put_Username(self, *args): return _chilkat.CkFtp2_put_Username(self, *args)
-    def get_Port(self): return _chilkat.CkFtp2_get_Port(self)
-    def put_Port(self, *args): return _chilkat.CkFtp2_put_Port(self, *args)
-    def get_Hostname(self, *args): return _chilkat.CkFtp2_get_Hostname(self, *args)
-    def put_Hostname(self, *args): return _chilkat.CkFtp2_put_Hostname(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkFtp2_get_SessionLog(self, *args)
-    def get_Passive(self): return _chilkat.CkFtp2_get_Passive(self)
-    def put_Passive(self, *args): return _chilkat.CkFtp2_put_Passive(self, *args)
-    def get_KeepSessionLog(self): return _chilkat.CkFtp2_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkFtp2_put_KeepSessionLog(self, *args)
-    def GetSize(self, *args): return _chilkat.CkFtp2_GetSize(self, *args)
-    def GetFilename(self, *args): return _chilkat.CkFtp2_GetFilename(self, *args)
-    def GetIsDirectory(self, *args): return _chilkat.CkFtp2_GetIsDirectory(self, *args)
-    def GetCreateTime(self, *args): return _chilkat.CkFtp2_GetCreateTime(self, *args)
-    def GetLastAccessTime(self, *args): return _chilkat.CkFtp2_GetLastAccessTime(self, *args)
-    def GetLastModifiedTime(self, *args): return _chilkat.CkFtp2_GetLastModifiedTime(self, *args)
-    def get_NumFilesAndDirs(self): return _chilkat.CkFtp2_get_NumFilesAndDirs(self)
-    def get_ProxyHostname(self, *args): return _chilkat.CkFtp2_get_ProxyHostname(self, *args)
-    def put_ProxyHostname(self, *args): return _chilkat.CkFtp2_put_ProxyHostname(self, *args)
-    def get_ProxyMethod(self): return _chilkat.CkFtp2_get_ProxyMethod(self)
-    def put_ProxyMethod(self, *args): return _chilkat.CkFtp2_put_ProxyMethod(self, *args)
-    def get_Ssl(self): return _chilkat.CkFtp2_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkFtp2_put_Ssl(self, *args)
-    def get_AuthTls(self): return _chilkat.CkFtp2_get_AuthTls(self)
-    def put_AuthTls(self, *args): return _chilkat.CkFtp2_put_AuthTls(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkFtp2_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkFtp2_put_HeartbeatMs(self, *args)
-    def get_IdleTimeoutMs(self): return _chilkat.CkFtp2_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkFtp2_put_IdleTimeoutMs(self, *args)
-    def get_UploadRate(self): return _chilkat.CkFtp2_get_UploadRate(self)
-    def get_DownloadRate(self): return _chilkat.CkFtp2_get_DownloadRate(self)
-    def AsyncGetFileStart(self, *args): return _chilkat.CkFtp2_AsyncGetFileStart(self, *args)
-    def AsyncPutFileStart(self, *args): return _chilkat.CkFtp2_AsyncPutFileStart(self, *args)
-    def AsyncAppendFileStart(self, *args): return _chilkat.CkFtp2_AsyncAppendFileStart(self, *args)
-    def AsyncAbort(self): return _chilkat.CkFtp2_AsyncAbort(self)
-    def get_AsyncFinished(self): return _chilkat.CkFtp2_get_AsyncFinished(self)
-    def get_AsyncLog(self, *args): return _chilkat.CkFtp2_get_AsyncLog(self, *args)
-    def get_AsyncSuccess(self): return _chilkat.CkFtp2_get_AsyncSuccess(self)
-    def get_AsyncBytesReceived(self): return _chilkat.CkFtp2_get_AsyncBytesReceived(self)
-    def get_AsyncBytesSent(self): return _chilkat.CkFtp2_get_AsyncBytesSent(self)
-    def DownloadTree(self, *args): return _chilkat.CkFtp2_DownloadTree(self, *args)
-    def DeleteTree(self): return _chilkat.CkFtp2_DeleteTree(self)
-    def GetIsSymbolicLink(self, *args): return _chilkat.CkFtp2_GetIsSymbolicLink(self, *args)
-    def createPlan(self, *args): return _chilkat.CkFtp2_createPlan(self, *args)
-    def CreatePlan(self, *args): return _chilkat.CkFtp2_CreatePlan(self, *args)
-    def PutPlan(self, *args): return _chilkat.CkFtp2_PutPlan(self, *args)
-    def GetSizeByName(self, *args): return _chilkat.CkFtp2_GetSizeByName(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkFtp2_ClearSessionLog(self)
-    def SetTypeBinary(self): return _chilkat.CkFtp2_SetTypeBinary(self)
-    def SetTypeAscii(self): return _chilkat.CkFtp2_SetTypeAscii(self)
-    def Site(self, *args): return _chilkat.CkFtp2_Site(self, *args)
-    def Quote(self, *args): return _chilkat.CkFtp2_Quote(self, *args)
-    def Syst(self, *args): return _chilkat.CkFtp2_Syst(self, *args)
-    def Stat(self, *args): return _chilkat.CkFtp2_Stat(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkFtp2_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkFtp2_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkFtp2_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkFtp2_put_ConnectTimeout(self, *args)
-    def GetXmlDirListing(self, *args): return _chilkat.CkFtp2_GetXmlDirListing(self, *args)
-    def GetTextDirListing(self, *args): return _chilkat.CkFtp2_GetTextDirListing(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkFtp2_get_ProxyPassword(self, *args)
-    def proxyPassword(self): return _chilkat.CkFtp2_proxyPassword(self)
-    def put_ProxyPassword(self, *args): return _chilkat.CkFtp2_put_ProxyPassword(self, *args)
-    def get_ProxyUsername(self, *args): return _chilkat.CkFtp2_get_ProxyUsername(self, *args)
-    def proxyUsername(self): return _chilkat.CkFtp2_proxyUsername(self)
-    def put_ProxyUsername(self, *args): return _chilkat.CkFtp2_put_ProxyUsername(self, *args)
-    def GetCreateTimeByName(self, *args): return _chilkat.CkFtp2_GetCreateTimeByName(self, *args)
-    def GetLastAccessTimeByName(self, *args): return _chilkat.CkFtp2_GetLastAccessTimeByName(self, *args)
-    def GetLastModifiedTimeByName(self, *args): return _chilkat.CkFtp2_GetLastModifiedTimeByName(self, *args)
-    def GetSizeStr(self, *args): return _chilkat.CkFtp2_GetSizeStr(self, *args)
-    def getSizeStr(self, *args): return _chilkat.CkFtp2_getSizeStr(self, *args)
-    def Noop(self): return _chilkat.CkFtp2_Noop(self)
-    def SetOldestDate(self, *args): return _chilkat.CkFtp2_SetOldestDate(self, *args)
-    def SyncLocalTree(self, *args): return _chilkat.CkFtp2_SyncLocalTree(self, *args)
-    def SyncRemoteTree(self, *args): return _chilkat.CkFtp2_SyncRemoteTree(self, *args)
-    def ConvertToTls(self): return _chilkat.CkFtp2_ConvertToTls(self)
-    def GetSizeStrByName(self, *args): return _chilkat.CkFtp2_GetSizeStrByName(self, *args)
-    def getSizeStrByName(self, *args): return _chilkat.CkFtp2_getSizeStrByName(self, *args)
-    def SetRemoteFileDateTime(self, *args): return _chilkat.CkFtp2_SetRemoteFileDateTime(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkFtp2_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkFtp2_put_SendBufferSize(self, *args)
-    def get_UseEpsv(self): return _chilkat.CkFtp2_get_UseEpsv(self)
-    def put_UseEpsv(self, *args): return _chilkat.CkFtp2_put_UseEpsv(self, *args)
-    def get_ForcePortIpAddress(self, *args): return _chilkat.CkFtp2_get_ForcePortIpAddress(self, *args)
-    def forcePortIpAddress(self): return _chilkat.CkFtp2_forcePortIpAddress(self)
-    def put_ForcePortIpAddress(self, *args): return _chilkat.CkFtp2_put_ForcePortIpAddress(self, *args)
-    def NlstXml(self, *args): return _chilkat.CkFtp2_NlstXml(self, *args)
-    def nlstXml(self, *args): return _chilkat.CkFtp2_nlstXml(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkFtp2_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkFtp2_put_SocksVersion(self, *args)
-    def get_SocksPort(self): return _chilkat.CkFtp2_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkFtp2_put_SocksPort(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkFtp2_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkFtp2_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkFtp2_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkFtp2_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkFtp2_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkFtp2_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkFtp2_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkFtp2_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkFtp2_put_SocksHostname(self, *args)
-    def get_Greeting(self, *args): return _chilkat.CkFtp2_get_Greeting(self, *args)
-    def greeting(self): return _chilkat.CkFtp2_greeting(self)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkFtp2_SetSslClientCertPfx(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkFtp2_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkFtp2_put_VerboseLogging(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkFtp2_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkFtp2_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkFtp2_put_SslProtocol(self, *args)
-    def get_AutoGetSizeForProgress(self): return _chilkat.CkFtp2_get_AutoGetSizeForProgress(self)
-    def put_AutoGetSizeForProgress(self, *args): return _chilkat.CkFtp2_put_AutoGetSizeForProgress(self, *args)
-    def get_SyncPreview(self, *args): return _chilkat.CkFtp2_get_SyncPreview(self, *args)
-    def syncPreview(self): return _chilkat.CkFtp2_syncPreview(self)
-    def SyncRemoteTree2(self, *args): return _chilkat.CkFtp2_SyncRemoteTree2(self, *args)
-    def get_AutoFix(self): return _chilkat.CkFtp2_get_AutoFix(self)
-    def put_AutoFix(self, *args): return _chilkat.CkFtp2_put_AutoFix(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkFtp2_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkFtp2_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkFtp2_put_ClientIpAddress(self, *args)
-CkFtp2_swigregister = _chilkat.CkFtp2_swigregister
-CkFtp2_swigregister(CkFtp2)
-
-class CkMht(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMht, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMht, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMht()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMht
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkMht_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkMht_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkMht_lastErrorHtml(self)
-    def get_UseIEProxy(self): return _chilkat.CkMht_get_UseIEProxy(self)
-    def put_UseIEProxy(self, *args): return _chilkat.CkMht_put_UseIEProxy(self, *args)
-    def get_UseFilename(self): return _chilkat.CkMht_get_UseFilename(self)
-    def put_UseFilename(self, *args): return _chilkat.CkMht_put_UseFilename(self, *args)
-    def get_UseInline(self): return _chilkat.CkMht_get_UseInline(self)
-    def put_UseInline(self, *args): return _chilkat.CkMht_put_UseInline(self, *args)
-    def GetMime(self, *args): return _chilkat.CkMht_GetMime(self, *args)
-    def HtmlToEMLFile(self, *args): return _chilkat.CkMht_HtmlToEMLFile(self, *args)
-    def HtmlToMHTFile(self, *args): return _chilkat.CkMht_HtmlToMHTFile(self, *args)
-    def get_EmbedLocalOnly(self): return _chilkat.CkMht_get_EmbedLocalOnly(self)
-    def put_EmbedLocalOnly(self, *args): return _chilkat.CkMht_put_EmbedLocalOnly(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkMht_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkMht_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkMht_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkMht_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkMht_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkMht_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkMht_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkMht_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkMht_put_SocksHostname(self, *args)
-    def get_SocksPort(self): return _chilkat.CkMht_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkMht_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkMht_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkMht_put_SocksVersion(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkMht_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkMht_put_VerboseLogging(self, *args)
-    def get_ProxyLogin(self, *args): return _chilkat.CkMht_get_ProxyLogin(self, *args)
-    def put_ProxyLogin(self, *args): return _chilkat.CkMht_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkMht_get_ProxyPassword(self, *args)
-    def put_ProxyPassword(self, *args): return _chilkat.CkMht_put_ProxyPassword(self, *args)
-    def proxyLogin(self): return _chilkat.CkMht_proxyLogin(self)
-    def proxyPassword(self): return _chilkat.CkMht_proxyPassword(self)
-    def put_NumCacheLevels(self, *args): return _chilkat.CkMht_put_NumCacheLevels(self, *args)
-    def get_NumCacheLevels(self): return _chilkat.CkMht_get_NumCacheLevels(self)
-    def get_NumCacheRoots(self): return _chilkat.CkMht_get_NumCacheRoots(self)
-    def GetCacheRoot(self, *args): return _chilkat.CkMht_GetCacheRoot(self, *args)
-    def getCacheRoot(self, *args): return _chilkat.CkMht_getCacheRoot(self, *args)
-    def AddCacheRoot(self, *args): return _chilkat.CkMht_AddCacheRoot(self, *args)
-    def get_UpdateCache(self): return _chilkat.CkMht_get_UpdateCache(self)
-    def put_UpdateCache(self, *args): return _chilkat.CkMht_put_UpdateCache(self, *args)
-    def get_FetchFromCache(self): return _chilkat.CkMht_get_FetchFromCache(self)
-    def put_FetchFromCache(self, *args): return _chilkat.CkMht_put_FetchFromCache(self, *args)
-    def get_IgnoreNoCache(self): return _chilkat.CkMht_get_IgnoreNoCache(self)
-    def put_IgnoreNoCache(self, *args): return _chilkat.CkMht_put_IgnoreNoCache(self, *args)
-    def get_IgnoreMustRevalidate(self): return _chilkat.CkMht_get_IgnoreMustRevalidate(self)
-    def put_IgnoreMustRevalidate(self, *args): return _chilkat.CkMht_put_IgnoreMustRevalidate(self, *args)
-    def getMHT(self, *args): return _chilkat.CkMht_getMHT(self, *args)
-    def getEML(self, *args): return _chilkat.CkMht_getEML(self, *args)
-    def htmlToMHT(self, *args): return _chilkat.CkMht_htmlToMHT(self, *args)
-    def htmlToEML(self, *args): return _chilkat.CkMht_htmlToEML(self, *args)
-    def webSiteLogin(self): return _chilkat.CkMht_webSiteLogin(self)
-    def webSitePassword(self): return _chilkat.CkMht_webSitePassword(self)
-    def debugHtmlBefore(self): return _chilkat.CkMht_debugHtmlBefore(self)
-    def debugHtmlAfter(self): return _chilkat.CkMht_debugHtmlAfter(self)
-    def baseUrl(self): return _chilkat.CkMht_baseUrl(self)
-    def proxy(self): return _chilkat.CkMht_proxy(self)
-    def version(self): return _chilkat.CkMht_version(self)
-    def get_Utf8(self): return _chilkat.CkMht_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMht_put_Utf8(self, *args)
-    def get_NtlmAuth(self): return _chilkat.CkMht_get_NtlmAuth(self)
-    def put_NtlmAuth(self, *args): return _chilkat.CkMht_put_NtlmAuth(self, *args)
-    def UnpackMHT(self, *args): return _chilkat.CkMht_UnpackMHT(self, *args)
-    def UnpackMHTString(self, *args): return _chilkat.CkMht_UnpackMHTString(self, *args)
-    def GetAndZipMHT(self, *args): return _chilkat.CkMht_GetAndZipMHT(self, *args)
-    def GetAndZipEML(self, *args): return _chilkat.CkMht_GetAndZipEML(self, *args)
-    def GetEmail(self, *args): return _chilkat.CkMht_GetEmail(self, *args)
-    def GetAndSaveMHT(self, *args): return _chilkat.CkMht_GetAndSaveMHT(self, *args)
-    def GetAndSaveEML(self, *args): return _chilkat.CkMht_GetAndSaveEML(self, *args)
-    def GetMHT(self, *args): return _chilkat.CkMht_GetMHT(self, *args)
-    def GetEML(self, *args): return _chilkat.CkMht_GetEML(self, *args)
-    def HtmlToEmail(self, *args): return _chilkat.CkMht_HtmlToEmail(self, *args)
-    def HtmlToMHT(self, *args): return _chilkat.CkMht_HtmlToMHT(self, *args)
-    def HtmlToEML(self, *args): return _chilkat.CkMht_HtmlToEML(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkMht_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkMht_IsUnlocked(self)
-    def AddExternalStyleSheet(self, *args): return _chilkat.CkMht_AddExternalStyleSheet(self, *args)
-    def ExcludeImagesMatching(self, *args): return _chilkat.CkMht_ExcludeImagesMatching(self, *args)
-    def RestoreDefaults(self): return _chilkat.CkMht_RestoreDefaults(self)
-    def get_PreferMHTScripts(self): return _chilkat.CkMht_get_PreferMHTScripts(self)
-    def put_PreferMHTScripts(self, *args): return _chilkat.CkMht_put_PreferMHTScripts(self, *args)
-    def get_NoScripts(self): return _chilkat.CkMht_get_NoScripts(self)
-    def put_NoScripts(self, *args): return _chilkat.CkMht_put_NoScripts(self, *args)
-    def get_UseCids(self): return _chilkat.CkMht_get_UseCids(self)
-    def put_UseCids(self, *args): return _chilkat.CkMht_put_UseCids(self, *args)
-    def get_EmbedImages(self): return _chilkat.CkMht_get_EmbedImages(self)
-    def put_EmbedImages(self, *args): return _chilkat.CkMht_put_EmbedImages(self, *args)
-    def get_DebugTagCleaning(self): return _chilkat.CkMht_get_DebugTagCleaning(self)
-    def put_DebugTagCleaning(self, *args): return _chilkat.CkMht_put_DebugTagCleaning(self, *args)
-    def get_WebSiteLogin(self, *args): return _chilkat.CkMht_get_WebSiteLogin(self, *args)
-    def put_WebSiteLogin(self, *args): return _chilkat.CkMht_put_WebSiteLogin(self, *args)
-    def get_WebSitePassword(self, *args): return _chilkat.CkMht_get_WebSitePassword(self, *args)
-    def put_WebSitePassword(self, *args): return _chilkat.CkMht_put_WebSitePassword(self, *args)
-    def get_DebugHtmlBefore(self, *args): return _chilkat.CkMht_get_DebugHtmlBefore(self, *args)
-    def put_DebugHtmlBefore(self, *args): return _chilkat.CkMht_put_DebugHtmlBefore(self, *args)
-    def get_DebugHtmlAfter(self, *args): return _chilkat.CkMht_get_DebugHtmlAfter(self, *args)
-    def put_DebugHtmlAfter(self, *args): return _chilkat.CkMht_put_DebugHtmlAfter(self, *args)
-    def get_BaseUrl(self, *args): return _chilkat.CkMht_get_BaseUrl(self, *args)
-    def put_BaseUrl(self, *args): return _chilkat.CkMht_put_BaseUrl(self, *args)
-    def get_Proxy(self, *args): return _chilkat.CkMht_get_Proxy(self, *args)
-    def put_Proxy(self, *args): return _chilkat.CkMht_put_Proxy(self, *args)
-    def get_Version(self, *args): return _chilkat.CkMht_get_Version(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkMht_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkMht_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkMht_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkMht_put_ConnectTimeout(self, *args)
-    def AddCustomHeader(self, *args): return _chilkat.CkMht_AddCustomHeader(self, *args)
-    def RemoveCustomHeader(self, *args): return _chilkat.CkMht_RemoveCustomHeader(self, *args)
-    def ClearCustomHeaders(self): return _chilkat.CkMht_ClearCustomHeaders(self)
-    def SaveLastError(self, *args): return _chilkat.CkMht_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkMht_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkMht_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkMht_LastErrorText(self, *args)
-CkMht_swigregister = _chilkat.CkMht_swigregister
-CkMht_swigregister(CkMht)
-
-class CkHttp(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHttp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHttp, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHttp()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHttp
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkHttp_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHttp_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHttp_lastErrorHtml(self)
-    def RenderGet(self, *args): return _chilkat.CkHttp_RenderGet(self, *args)
-    def renderGet(self, *args): return _chilkat.CkHttp_renderGet(self, *args)
-    def GetCookieXml(self, *args): return _chilkat.CkHttp_GetCookieXml(self, *args)
-    def getCookieXml(self, *args): return _chilkat.CkHttp_getCookieXml(self, *args)
-    def get_RequiredContentType(self, *args): return _chilkat.CkHttp_get_RequiredContentType(self, *args)
-    def requiredContentType(self): return _chilkat.CkHttp_requiredContentType(self)
-    def put_RequiredContentType(self, *args): return _chilkat.CkHttp_put_RequiredContentType(self, *args)
-    def DownloadAppend(self, *args): return _chilkat.CkHttp_DownloadAppend(self, *args)
-    def PostMime(self, *args): return _chilkat.CkHttp_PostMime(self, *args)
-    def UrlDecode(self, *args): return _chilkat.CkHttp_UrlDecode(self, *args)
-    def urlDecode(self, *args): return _chilkat.CkHttp_urlDecode(self, *args)
-    def UrlEncode(self, *args): return _chilkat.CkHttp_UrlEncode(self, *args)
-    def urlEncode(self, *args): return _chilkat.CkHttp_urlEncode(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkHttp_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkHttp_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkHttp_put_SslProtocol(self, *args)
-    def GetHead(self, *args): return _chilkat.CkHttp_GetHead(self, *args)
-    def XmlRpc(self, *args): return _chilkat.CkHttp_XmlRpc(self, *args)
-    def xmlRpc(self, *args): return _chilkat.CkHttp_xmlRpc(self, *args)
-    def GenTimeStamp(self, *args): return _chilkat.CkHttp_GenTimeStamp(self, *args)
-    def genTimeStamp(self): return _chilkat.CkHttp_genTimeStamp(self)
-    def XmlRpcPut(self, *args): return _chilkat.CkHttp_XmlRpcPut(self, *args)
-    def xmlRpcPut(self, *args): return _chilkat.CkHttp_xmlRpcPut(self, *args)
-    def QuickPutStr(self, *args): return _chilkat.CkHttp_QuickPutStr(self, *args)
-    def quickPutStr(self, *args): return _chilkat.CkHttp_quickPutStr(self, *args)
-    def QuickDeleteStr(self, *args): return _chilkat.CkHttp_QuickDeleteStr(self, *args)
-    def quickDeleteStr(self, *args): return _chilkat.CkHttp_quickDeleteStr(self, *args)
-    def PutText(self, *args): return _chilkat.CkHttp_PutText(self, *args)
-    def putText(self, *args): return _chilkat.CkHttp_putText(self, *args)
-    def PutBinary(self, *args): return _chilkat.CkHttp_PutBinary(self, *args)
-    def putBinary(self, *args): return _chilkat.CkHttp_putBinary(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkHttp_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkHttp_put_SendBufferSize(self, *args)
-    def get_NegotiateAuth(self): return _chilkat.CkHttp_get_NegotiateAuth(self)
-    def put_NegotiateAuth(self, *args): return _chilkat.CkHttp_put_NegotiateAuth(self, *args)
-    def get_LoginDomain(self, *args): return _chilkat.CkHttp_get_LoginDomain(self, *args)
-    def loginDomain(self): return _chilkat.CkHttp_loginDomain(self)
-    def put_LoginDomain(self, *args): return _chilkat.CkHttp_put_LoginDomain(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkHttp_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkHttp_put_SocksVersion(self, *args)
-    def get_SocksPort(self): return _chilkat.CkHttp_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkHttp_put_SocksPort(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkHttp_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkHttp_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkHttp_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkHttp_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkHttp_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkHttp_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkHttp_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkHttp_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkHttp_put_SocksHostname(self, *args)
-    def PostXml(self, *args): return _chilkat.CkHttp_PostXml(self, *args)
-    def get_ProxyPartialUrl(self): return _chilkat.CkHttp_get_ProxyPartialUrl(self)
-    def put_ProxyPartialUrl(self, *args): return _chilkat.CkHttp_put_ProxyPartialUrl(self, *args)
-    def GetServerSslCert(self, *args): return _chilkat.CkHttp_GetServerSslCert(self, *args)
-    def get_DigestAuth(self): return _chilkat.CkHttp_get_DigestAuth(self)
-    def put_DigestAuth(self, *args): return _chilkat.CkHttp_put_DigestAuth(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkHttp_SetSslClientCertPfx(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkHttp_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkHttp_put_VerboseLogging(self, *args)
-    def ClearInMemoryCookies(self): return _chilkat.CkHttp_ClearInMemoryCookies(self)
-    def SetCookieXml(self, *args): return _chilkat.CkHttp_SetCookieXml(self, *args)
-    def PostUrlEncoded(self, *args): return _chilkat.CkHttp_PostUrlEncoded(self, *args)
-    def PostBinary(self, *args): return _chilkat.CkHttp_PostBinary(self, *args)
-    def postBinary(self, *args): return _chilkat.CkHttp_postBinary(self, *args)
-    def QuickGetObj(self, *args): return _chilkat.CkHttp_QuickGetObj(self, *args)
-    def get_SessionLogFilename(self, *args): return _chilkat.CkHttp_get_SessionLogFilename(self, *args)
-    def sessionLogFilename(self): return _chilkat.CkHttp_sessionLogFilename(self)
-    def put_SessionLogFilename(self, *args): return _chilkat.CkHttp_put_SessionLogFilename(self, *args)
-    def get_BgLastErrorText(self, *args): return _chilkat.CkHttp_get_BgLastErrorText(self, *args)
-    def bgLastErrorText(self): return _chilkat.CkHttp_bgLastErrorText(self)
-    def get_BgResultData(self, *args): return _chilkat.CkHttp_get_BgResultData(self, *args)
-    def get_BgResultInt(self): return _chilkat.CkHttp_get_BgResultInt(self)
-    def get_BgResultString(self, *args): return _chilkat.CkHttp_get_BgResultString(self, *args)
-    def bgResultString(self): return _chilkat.CkHttp_bgResultString(self)
-    def get_BgTaskFinished(self): return _chilkat.CkHttp_get_BgTaskFinished(self)
-    def get_BgTaskRunning(self): return _chilkat.CkHttp_get_BgTaskRunning(self)
-    def get_BgTaskSuccess(self): return _chilkat.CkHttp_get_BgTaskSuccess(self)
-    def get_EventLogCount(self): return _chilkat.CkHttp_get_EventLogCount(self)
-    def get_KeepEventLog(self): return _chilkat.CkHttp_get_KeepEventLog(self)
-    def put_KeepEventLog(self, *args): return _chilkat.CkHttp_put_KeepEventLog(self, *args)
-    def get_UseBgThread(self): return _chilkat.CkHttp_get_UseBgThread(self)
-    def put_UseBgThread(self, *args): return _chilkat.CkHttp_put_UseBgThread(self, *args)
-    def BgResponseObject(self): return _chilkat.CkHttp_BgResponseObject(self)
-    def BgTaskAbort(self): return _chilkat.CkHttp_BgTaskAbort(self)
-    def ClearBgEventLog(self): return _chilkat.CkHttp_ClearBgEventLog(self)
-    def EventLogName(self, *args): return _chilkat.CkHttp_EventLogName(self, *args)
-    def eventLogName(self, *args): return _chilkat.CkHttp_eventLogName(self, *args)
-    def EventLogValue(self, *args): return _chilkat.CkHttp_EventLogValue(self, *args)
-    def eventLogValue(self, *args): return _chilkat.CkHttp_eventLogValue(self, *args)
-    def SleepMs(self, *args): return _chilkat.CkHttp_SleepMs(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkHttp_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkHttp_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkHttp_put_ClientIpAddress(self, *args)
-    def get_ProxyAuthMethod(self, *args): return _chilkat.CkHttp_get_ProxyAuthMethod(self, *args)
-    def proxyAuthMethod(self): return _chilkat.CkHttp_proxyAuthMethod(self)
-    def put_ProxyAuthMethod(self, *args): return _chilkat.CkHttp_put_ProxyAuthMethod(self, *args)
-    def AddQuickHeader(self, *args): return _chilkat.CkHttp_AddQuickHeader(self, *args)
-    def RemoveQuickHeader(self, *args): return _chilkat.CkHttp_RemoveQuickHeader(self, *args)
-    def SetSslClientCert(self, *args): return _chilkat.CkHttp_SetSslClientCert(self, *args)
-    def get_LastHeader(self, *args): return _chilkat.CkHttp_get_LastHeader(self, *args)
-    def lastHeader(self): return _chilkat.CkHttp_lastHeader(self)
-    def put_UseIEProxy(self, *args): return _chilkat.CkHttp_put_UseIEProxy(self, *args)
-    def get_UseIEProxy(self): return _chilkat.CkHttp_get_UseIEProxy(self)
-    def get_ProxyLogin(self, *args): return _chilkat.CkHttp_get_ProxyLogin(self, *args)
-    def put_ProxyLogin(self, *args): return _chilkat.CkHttp_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkHttp_get_ProxyPassword(self, *args)
-    def put_ProxyPassword(self, *args): return _chilkat.CkHttp_put_ProxyPassword(self, *args)
-    def proxyLogin(self): return _chilkat.CkHttp_proxyLogin(self)
-    def proxyPassword(self): return _chilkat.CkHttp_proxyPassword(self)
-    def version(self): return _chilkat.CkHttp_version(self)
-    def cookieDir(self): return _chilkat.CkHttp_cookieDir(self)
-    def quickGetStr(self, *args): return _chilkat.CkHttp_quickGetStr(self, *args)
-    def proxyDomain(self): return _chilkat.CkHttp_proxyDomain(self)
-    def password(self): return _chilkat.CkHttp_password(self)
-    def login(self): return _chilkat.CkHttp_login(self)
-    def getRequestHeader(self, *args): return _chilkat.CkHttp_getRequestHeader(self, *args)
-    def userAgent(self): return _chilkat.CkHttp_userAgent(self)
-    def referer(self): return _chilkat.CkHttp_referer(self)
-    def ck_accept(self): return _chilkat.CkHttp_ck_accept(self)
-    def acceptCharset(self): return _chilkat.CkHttp_acceptCharset(self)
-    def acceptLanguage(self): return _chilkat.CkHttp_acceptLanguage(self)
-    def connection(self): return _chilkat.CkHttp_connection(self)
-    def getDomain(self, *args): return _chilkat.CkHttp_getDomain(self, *args)
-    def finalRedirectUrl(self): return _chilkat.CkHttp_finalRedirectUrl(self)
-    def getCacheRoot(self, *args): return _chilkat.CkHttp_getCacheRoot(self, *args)
-    def getUrlPath(self, *args): return _chilkat.CkHttp_getUrlPath(self, *args)
-    def lastContentType(self): return _chilkat.CkHttp_lastContentType(self)
-    def lastResponseHeader(self): return _chilkat.CkHttp_lastResponseHeader(self)
-    def lastModDate(self): return _chilkat.CkHttp_lastModDate(self)
-    def get_Utf8(self): return _chilkat.CkHttp_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHttp_put_Utf8(self, *args)
-    def put_NtlmAuth(self, *args): return _chilkat.CkHttp_put_NtlmAuth(self, *args)
-    def get_NtlmAuth(self): return _chilkat.CkHttp_get_NtlmAuth(self)
-    def UnlockComponent(self, *args): return _chilkat.CkHttp_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkHttp_IsUnlocked(self)
-    def Download(self, *args): return _chilkat.CkHttp_Download(self, *args)
-    def ResumeDownload(self, *args): return _chilkat.CkHttp_ResumeDownload(self, *args)
-    def get_Version(self, *args): return _chilkat.CkHttp_get_Version(self, *args)
-    def get_MaxConnections(self): return _chilkat.CkHttp_get_MaxConnections(self)
-    def put_MaxConnections(self, *args): return _chilkat.CkHttp_put_MaxConnections(self, *args)
-    def put_CookieDir(self, *args): return _chilkat.CkHttp_put_CookieDir(self, *args)
-    def get_CookieDir(self, *args): return _chilkat.CkHttp_get_CookieDir(self, *args)
-    def put_SaveCookies(self, *args): return _chilkat.CkHttp_put_SaveCookies(self, *args)
-    def get_SaveCookies(self): return _chilkat.CkHttp_get_SaveCookies(self)
-    def put_SendCookies(self, *args): return _chilkat.CkHttp_put_SendCookies(self, *args)
-    def get_SendCookies(self): return _chilkat.CkHttp_get_SendCookies(self)
-    def QuickGet(self, *args): return _chilkat.CkHttp_QuickGet(self, *args)
-    def QuickGetStr(self, *args): return _chilkat.CkHttp_QuickGetStr(self, *args)
-    def SynchronousRequest(self, *args): return _chilkat.CkHttp_SynchronousRequest(self, *args)
-    def get_ProxyPort(self): return _chilkat.CkHttp_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkHttp_put_ProxyPort(self, *args)
-    def put_ProxyDomain(self, *args): return _chilkat.CkHttp_put_ProxyDomain(self, *args)
-    def get_ProxyDomain(self, *args): return _chilkat.CkHttp_get_ProxyDomain(self, *args)
-    def put_Login(self, *args): return _chilkat.CkHttp_put_Login(self, *args)
-    def get_Login(self, *args): return _chilkat.CkHttp_get_Login(self, *args)
-    def put_Password(self, *args): return _chilkat.CkHttp_put_Password(self, *args)
-    def get_Password(self, *args): return _chilkat.CkHttp_get_Password(self, *args)
-    def SetRequestHeader(self, *args): return _chilkat.CkHttp_SetRequestHeader(self, *args)
-    def GetRequestHeader(self, *args): return _chilkat.CkHttp_GetRequestHeader(self, *args)
-    def HasRequestHeader(self, *args): return _chilkat.CkHttp_HasRequestHeader(self, *args)
-    def RemoveRequestHeader(self, *args): return _chilkat.CkHttp_RemoveRequestHeader(self, *args)
-    def put_UserAgent(self, *args): return _chilkat.CkHttp_put_UserAgent(self, *args)
-    def get_UserAgent(self, *args): return _chilkat.CkHttp_get_UserAgent(self, *args)
-    def put_Referer(self, *args): return _chilkat.CkHttp_put_Referer(self, *args)
-    def get_Referer(self, *args): return _chilkat.CkHttp_get_Referer(self, *args)
-    def put_Accept(self, *args): return _chilkat.CkHttp_put_Accept(self, *args)
-    def get_Accept(self, *args): return _chilkat.CkHttp_get_Accept(self, *args)
-    def put_AcceptCharset(self, *args): return _chilkat.CkHttp_put_AcceptCharset(self, *args)
-    def get_AcceptCharset(self, *args): return _chilkat.CkHttp_get_AcceptCharset(self, *args)
-    def put_AcceptLanguage(self, *args): return _chilkat.CkHttp_put_AcceptLanguage(self, *args)
-    def get_AcceptLanguage(self, *args): return _chilkat.CkHttp_get_AcceptLanguage(self, *args)
-    def put_Connection(self, *args): return _chilkat.CkHttp_put_Connection(self, *args)
-    def get_Connection(self, *args): return _chilkat.CkHttp_get_Connection(self, *args)
-    def get_MaxUrlLen(self): return _chilkat.CkHttp_get_MaxUrlLen(self)
-    def put_MaxUrlLen(self, *args): return _chilkat.CkHttp_put_MaxUrlLen(self, *args)
-    def get_MaxResponseSize(self): return _chilkat.CkHttp_get_MaxResponseSize(self)
-    def put_MaxResponseSize(self, *args): return _chilkat.CkHttp_put_MaxResponseSize(self, *args)
-    def put_MimicIE(self, *args): return _chilkat.CkHttp_put_MimicIE(self, *args)
-    def get_MimicIE(self): return _chilkat.CkHttp_get_MimicIE(self)
-    def put_MimicFireFox(self, *args): return _chilkat.CkHttp_put_MimicFireFox(self, *args)
-    def get_MimicFireFox(self): return _chilkat.CkHttp_get_MimicFireFox(self)
-    def put_AutoAddHostHeader(self, *args): return _chilkat.CkHttp_put_AutoAddHostHeader(self, *args)
-    def get_AutoAddHostHeader(self): return _chilkat.CkHttp_get_AutoAddHostHeader(self)
-    def get_ConnectTimeout(self): return _chilkat.CkHttp_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkHttp_put_ConnectTimeout(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkHttp_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkHttp_put_ReadTimeout(self, *args)
-    def GetDomain(self, *args): return _chilkat.CkHttp_GetDomain(self, *args)
-    def get_WasRedirected(self): return _chilkat.CkHttp_get_WasRedirected(self)
-    def get_FinalRedirectUrl(self, *args): return _chilkat.CkHttp_get_FinalRedirectUrl(self, *args)
-    def put_FollowRedirects(self, *args): return _chilkat.CkHttp_put_FollowRedirects(self, *args)
-    def get_FollowRedirects(self): return _chilkat.CkHttp_get_FollowRedirects(self)
-    def put_NumCacheLevels(self, *args): return _chilkat.CkHttp_put_NumCacheLevels(self, *args)
-    def get_NumCacheLevels(self): return _chilkat.CkHttp_get_NumCacheLevels(self)
-    def get_NumCacheRoots(self): return _chilkat.CkHttp_get_NumCacheRoots(self)
-    def GetCacheRoot(self, *args): return _chilkat.CkHttp_GetCacheRoot(self, *args)
-    def AddCacheRoot(self, *args): return _chilkat.CkHttp_AddCacheRoot(self, *args)
-    def get_LastStatus(self): return _chilkat.CkHttp_get_LastStatus(self)
-    def get_LastContentType(self, *args): return _chilkat.CkHttp_get_LastContentType(self, *args)
-    def get_LastResponseHeader(self, *args): return _chilkat.CkHttp_get_LastResponseHeader(self, *args)
-    def get_LastModDate(self, *args): return _chilkat.CkHttp_get_LastModDate(self, *args)
-    def get_UpdateCache(self): return _chilkat.CkHttp_get_UpdateCache(self)
-    def put_UpdateCache(self, *args): return _chilkat.CkHttp_put_UpdateCache(self, *args)
-    def get_FetchFromCache(self): return _chilkat.CkHttp_get_FetchFromCache(self)
-    def put_FetchFromCache(self, *args): return _chilkat.CkHttp_put_FetchFromCache(self, *args)
-    def get_IgnoreNoCache(self): return _chilkat.CkHttp_get_IgnoreNoCache(self)
-    def put_IgnoreNoCache(self, *args): return _chilkat.CkHttp_put_IgnoreNoCache(self, *args)
-    def get_IgnoreMustRevalidate(self): return _chilkat.CkHttp_get_IgnoreMustRevalidate(self)
-    def put_IgnoreMustRevalidate(self, *args): return _chilkat.CkHttp_put_IgnoreMustRevalidate(self, *args)
-    def get_DefaultFreshPeriod(self): return _chilkat.CkHttp_get_DefaultFreshPeriod(self)
-    def put_DefaultFreshPeriod(self, *args): return _chilkat.CkHttp_put_DefaultFreshPeriod(self, *args)
-    def get_FreshnessAlgorithm(self): return _chilkat.CkHttp_get_FreshnessAlgorithm(self)
-    def put_FreshnessAlgorithm(self, *args): return _chilkat.CkHttp_put_FreshnessAlgorithm(self, *args)
-    def get_LMFactor(self): return _chilkat.CkHttp_get_LMFactor(self)
-    def put_LMFactor(self, *args): return _chilkat.CkHttp_put_LMFactor(self, *args)
-    def get_MaxFreshPeriod(self): return _chilkat.CkHttp_get_MaxFreshPeriod(self)
-    def put_MaxFreshPeriod(self, *args): return _chilkat.CkHttp_put_MaxFreshPeriod(self, *args)
-    def get_MinFreshPeriod(self): return _chilkat.CkHttp_get_MinFreshPeriod(self)
-    def put_MinFreshPeriod(self, *args): return _chilkat.CkHttp_put_MinFreshPeriod(self, *args)
-    def GetUrlPath(self, *args): return _chilkat.CkHttp_GetUrlPath(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkHttp_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHttp_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHttp_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHttp_LastErrorText(self, *args)
-CkHttp_swigregister = _chilkat.CkHttp_swigregister
-CkHttp_swigregister(CkHttp)
-
-class CkHttpRequest(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHttpRequest, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHttpRequest, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHttpRequest()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHttpRequest
-    __del__ = lambda self : None;
-    def RemoveAllParams(self): return _chilkat.CkHttpRequest_RemoveAllParams(self)
-    def LoadBodyFromFile(self, *args): return _chilkat.CkHttpRequest_LoadBodyFromFile(self, *args)
-    def LoadBodyFromBytes(self, *args): return _chilkat.CkHttpRequest_LoadBodyFromBytes(self, *args)
-    def LoadBodyFromString(self, *args): return _chilkat.CkHttpRequest_LoadBodyFromString(self, *args)
-    def UsePut(self): return _chilkat.CkHttpRequest_UsePut(self)
-    def AddBytesForUpload(self, *args): return _chilkat.CkHttpRequest_AddBytesForUpload(self, *args)
-    def UsePostMultipartForm(self): return _chilkat.CkHttpRequest_UsePostMultipartForm(self)
-    def GetUrlEncodedParams(self, *args): return _chilkat.CkHttpRequest_GetUrlEncodedParams(self, *args)
-    def getUrlEncodedParams(self): return _chilkat.CkHttpRequest_getUrlEncodedParams(self)
-    def AddStringForUpload(self, *args): return _chilkat.CkHttpRequest_AddStringForUpload(self, *args)
-    def AddFileForUpload2(self, *args): return _chilkat.CkHttpRequest_AddFileForUpload2(self, *args)
-    def AddStringForUpload2(self, *args): return _chilkat.CkHttpRequest_AddStringForUpload2(self, *args)
-    def AddBytesForUpload2(self, *args): return _chilkat.CkHttpRequest_AddBytesForUpload2(self, *args)
-    def path(self): return _chilkat.CkHttpRequest_path(self)
-    def charset(self): return _chilkat.CkHttpRequest_charset(self)
-    def httpVersion(self): return _chilkat.CkHttpRequest_httpVersion(self)
-    def getHeaderField(self, *args): return _chilkat.CkHttpRequest_getHeaderField(self, *args)
-    def getHeaderName(self, *args): return _chilkat.CkHttpRequest_getHeaderName(self, *args)
-    def getHeaderValue(self, *args): return _chilkat.CkHttpRequest_getHeaderValue(self, *args)
-    def getParam(self, *args): return _chilkat.CkHttpRequest_getParam(self, *args)
-    def getParamName(self, *args): return _chilkat.CkHttpRequest_getParamName(self, *args)
-    def getParamValue(self, *args): return _chilkat.CkHttpRequest_getParamValue(self, *args)
-    def lastErrorText(self): return _chilkat.CkHttpRequest_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHttpRequest_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHttpRequest_lastErrorHtml(self)
-    def RemoveParam(self, *args): return _chilkat.CkHttpRequest_RemoveParam(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkHttpRequest_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHttpRequest_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHttpRequest_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHttpRequest_LastErrorText(self, *args)
-    def get_Utf8(self): return _chilkat.CkHttpRequest_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHttpRequest_put_Utf8(self, *args)
-    def UsePost(self): return _chilkat.CkHttpRequest_UsePost(self)
-    def UseGet(self): return _chilkat.CkHttpRequest_UseGet(self)
-    def UseHead(self): return _chilkat.CkHttpRequest_UseHead(self)
-    def UseXmlHttp(self, *args): return _chilkat.CkHttpRequest_UseXmlHttp(self, *args)
-    def UseUpload(self): return _chilkat.CkHttpRequest_UseUpload(self)
-    def SetFromUrl(self, *args): return _chilkat.CkHttpRequest_SetFromUrl(self, *args)
-    def put_Path(self, *args): return _chilkat.CkHttpRequest_put_Path(self, *args)
-    def get_Path(self, *args): return _chilkat.CkHttpRequest_get_Path(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkHttpRequest_put_Charset(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkHttpRequest_get_Charset(self, *args)
-    def put_SendCharset(self, *args): return _chilkat.CkHttpRequest_put_SendCharset(self, *args)
-    def get_SendCharset(self): return _chilkat.CkHttpRequest_get_SendCharset(self)
-    def put_HttpVersion(self, *args): return _chilkat.CkHttpRequest_put_HttpVersion(self, *args)
-    def get_HttpVersion(self, *args): return _chilkat.CkHttpRequest_get_HttpVersion(self, *args)
-    def AddHeader(self, *args): return _chilkat.CkHttpRequest_AddHeader(self, *args)
-    def AddParam(self, *args): return _chilkat.CkHttpRequest_AddParam(self, *args)
-    def AddFileForUpload(self, *args): return _chilkat.CkHttpRequest_AddFileForUpload(self, *args)
-    def GenerateRequestText(self, *args): return _chilkat.CkHttpRequest_GenerateRequestText(self, *args)
-    def generateRequestText(self): return _chilkat.CkHttpRequest_generateRequestText(self)
-    def GetHeaderField(self, *args): return _chilkat.CkHttpRequest_GetHeaderField(self, *args)
-    def get_NumHeaderFields(self): return _chilkat.CkHttpRequest_get_NumHeaderFields(self)
-    def GetHeaderName(self, *args): return _chilkat.CkHttpRequest_GetHeaderName(self, *args)
-    def GetHeaderValue(self, *args): return _chilkat.CkHttpRequest_GetHeaderValue(self, *args)
-    def GetParam(self, *args): return _chilkat.CkHttpRequest_GetParam(self, *args)
-    def get_NumParams(self): return _chilkat.CkHttpRequest_get_NumParams(self)
-    def GetParamName(self, *args): return _chilkat.CkHttpRequest_GetParamName(self, *args)
-    def GetParamValue(self, *args): return _chilkat.CkHttpRequest_GetParamValue(self, *args)
-CkHttpRequest_swigregister = _chilkat.CkHttpRequest_swigregister
-CkHttpRequest_swigregister(CkHttpRequest)
-
-class CkHttpResponse(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHttpResponse, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHttpResponse, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHttpResponse()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHttpResponse
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkHttpResponse_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHttpResponse_put_Utf8(self, *args)
-    def header(self): return _chilkat.CkHttpResponse_header(self)
-    def bodyStr(self): return _chilkat.CkHttpResponse_bodyStr(self)
-    def statusLine(self): return _chilkat.CkHttpResponse_statusLine(self)
-    def charset(self): return _chilkat.CkHttpResponse_charset(self)
-    def domain(self): return _chilkat.CkHttpResponse_domain(self)
-    def getHeaderField(self, *args): return _chilkat.CkHttpResponse_getHeaderField(self, *args)
-    def getHeaderFieldAttr(self, *args): return _chilkat.CkHttpResponse_getHeaderFieldAttr(self, *args)
-    def getHeaderName(self, *args): return _chilkat.CkHttpResponse_getHeaderName(self, *args)
-    def getHeaderValue(self, *args): return _chilkat.CkHttpResponse_getHeaderValue(self, *args)
-    def getCookieDomain(self, *args): return _chilkat.CkHttpResponse_getCookieDomain(self, *args)
-    def getCookiePath(self, *args): return _chilkat.CkHttpResponse_getCookiePath(self, *args)
-    def getCookieExpiresStr(self, *args): return _chilkat.CkHttpResponse_getCookieExpiresStr(self, *args)
-    def getCookieName(self, *args): return _chilkat.CkHttpResponse_getCookieName(self, *args)
-    def getCookieValue(self, *args): return _chilkat.CkHttpResponse_getCookieValue(self, *args)
-    def get_Header(self, *args): return _chilkat.CkHttpResponse_get_Header(self, *args)
-    def get_Body(self, *args): return _chilkat.CkHttpResponse_get_Body(self, *args)
-    def get_BodyStr(self, *args): return _chilkat.CkHttpResponse_get_BodyStr(self, *args)
-    def get_BodyQP(self, *args): return _chilkat.CkHttpResponse_get_BodyQP(self, *args)
-    def get_StatusLine(self, *args): return _chilkat.CkHttpResponse_get_StatusLine(self, *args)
-    def get_StatusCode(self): return _chilkat.CkHttpResponse_get_StatusCode(self)
-    def get_Charset(self, *args): return _chilkat.CkHttpResponse_get_Charset(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkHttpResponse_get_Domain(self, *args)
-    def get_ContentLength(self): return _chilkat.CkHttpResponse_get_ContentLength(self)
-    def get_Date(self, *args): return _chilkat.CkHttpResponse_get_Date(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkHttpResponse_GetHeaderField(self, *args)
-    def GetHeaderFieldAttr(self, *args): return _chilkat.CkHttpResponse_GetHeaderFieldAttr(self, *args)
-    def get_NumHeaderFields(self): return _chilkat.CkHttpResponse_get_NumHeaderFields(self)
-    def GetHeaderName(self, *args): return _chilkat.CkHttpResponse_GetHeaderName(self, *args)
-    def GetHeaderValue(self, *args): return _chilkat.CkHttpResponse_GetHeaderValue(self, *args)
-    def get_NumCookies(self): return _chilkat.CkHttpResponse_get_NumCookies(self)
-    def GetCookieDomain(self, *args): return _chilkat.CkHttpResponse_GetCookieDomain(self, *args)
-    def GetCookiePath(self, *args): return _chilkat.CkHttpResponse_GetCookiePath(self, *args)
-    def GetCookieExpiresStr(self, *args): return _chilkat.CkHttpResponse_GetCookieExpiresStr(self, *args)
-    def GetCookieExpires(self, *args): return _chilkat.CkHttpResponse_GetCookieExpires(self, *args)
-    def GetCookieName(self, *args): return _chilkat.CkHttpResponse_GetCookieName(self, *args)
-    def GetCookieValue(self, *args): return _chilkat.CkHttpResponse_GetCookieValue(self, *args)
-CkHttpResponse_swigregister = _chilkat.CkHttpResponse_swigregister
-CkHttpResponse_swigregister(CkHttpResponse)
-
-class CkImap(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkImap, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkImap, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkImap()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkImap
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkImap_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkImap_put_Utf8(self, *args)
-    def get_LastAppendedMime(self, *args): return _chilkat.CkImap_get_LastAppendedMime(self, *args)
-    def lastAppendedMime(self): return _chilkat.CkImap_lastAppendedMime(self)
-    def get_LastIntermediateResponse(self, *args): return _chilkat.CkImap_get_LastIntermediateResponse(self, *args)
-    def lastIntermediateResponse(self): return _chilkat.CkImap_lastIntermediateResponse(self)
-    def get_LastResponse(self, *args): return _chilkat.CkImap_get_LastResponse(self, *args)
-    def lastResponse(self): return _chilkat.CkImap_lastResponse(self)
-    def get_LastCommand(self, *args): return _chilkat.CkImap_get_LastCommand(self, *args)
-    def lastCommand(self): return _chilkat.CkImap_lastCommand(self)
-    def get_Version(self, *args): return _chilkat.CkImap_get_Version(self, *args)
-    def version(self): return _chilkat.CkImap_version(self)
-    def AppendMimeWithFlags(self, *args): return _chilkat.CkImap_AppendMimeWithFlags(self, *args)
-    def Subscribe(self, *args): return _chilkat.CkImap_Subscribe(self, *args)
-    def Unsubscribe(self, *args): return _chilkat.CkImap_Unsubscribe(self, *args)
-    def FetchSingleHeaderAsMime(self, *args): return _chilkat.CkImap_FetchSingleHeaderAsMime(self, *args)
-    def fetchSingleHeaderAsMime(self, *args): return _chilkat.CkImap_fetchSingleHeaderAsMime(self, *args)
-    def AppendMimeWithDate(self, *args): return _chilkat.CkImap_AppendMimeWithDate(self, *args)
-    def get_SelectedMailbox(self, *args): return _chilkat.CkImap_get_SelectedMailbox(self, *args)
-    def selectedMailbox(self): return _chilkat.CkImap_selectedMailbox(self)
-    def get_AppendUid(self): return _chilkat.CkImap_get_AppendUid(self)
-    def get_AuthzId(self, *args): return _chilkat.CkImap_get_AuthzId(self, *args)
-    def authzId(self): return _chilkat.CkImap_authzId(self)
-    def put_AuthzId(self, *args): return _chilkat.CkImap_put_AuthzId(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkImap_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkImap_put_SendBufferSize(self, *args)
-    def SshTunnel(self, *args): return _chilkat.CkImap_SshTunnel(self, *args)
-    def SshAuthenticatePw(self, *args): return _chilkat.CkImap_SshAuthenticatePw(self, *args)
-    def SshAuthenticatePk(self, *args): return _chilkat.CkImap_SshAuthenticatePk(self, *args)
-    def Noop(self): return _chilkat.CkImap_Noop(self)
-    def get_SocksHostname(self, *args): return _chilkat.CkImap_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkImap_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkImap_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkImap_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkImap_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkImap_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkImap_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkImap_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkImap_put_SocksPassword(self, *args)
-    def get_SocksPort(self): return _chilkat.CkImap_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkImap_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkImap_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkImap_put_SocksVersion(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkImap_SetSslClientCertPfx(self, *args)
-    def get_StartTls(self): return _chilkat.CkImap_get_StartTls(self)
-    def put_StartTls(self, *args): return _chilkat.CkImap_put_StartTls(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkImap_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkImap_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkImap_put_SslProtocol(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkImap_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkImap_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkImap_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkImap_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkImap_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkImap_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkImap_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkImap_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkImap_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkImap_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkImap_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkImap_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkImap_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkImap_put_HttpProxyPort(self, *args)
-    def get_UidNext(self): return _chilkat.CkImap_get_UidNext(self)
-    def get_AutoFix(self): return _chilkat.CkImap_get_AutoFix(self)
-    def put_AutoFix(self, *args): return _chilkat.CkImap_put_AutoFix(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkImap_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkImap_AddPfxSourceFile(self, *args)
-    def Connect(self, *args): return _chilkat.CkImap_Connect(self, *args)
-    def Disconnect(self): return _chilkat.CkImap_Disconnect(self)
-    def IsConnected(self): return _chilkat.CkImap_IsConnected(self)
-    def get_SeparatorChar(self): return _chilkat.CkImap_get_SeparatorChar(self)
-    def put_SeparatorChar(self, *args): return _chilkat.CkImap_put_SeparatorChar(self, *args)
-    def get_NumMessages(self): return _chilkat.CkImap_get_NumMessages(self)
-    def FetchSequenceAsMime(self, *args): return _chilkat.CkImap_FetchSequenceAsMime(self, *args)
-    def Login(self, *args): return _chilkat.CkImap_Login(self, *args)
-    def Logout(self): return _chilkat.CkImap_Logout(self)
-    def IsLoggedIn(self): return _chilkat.CkImap_IsLoggedIn(self)
-    def SetSslClientCert(self, *args): return _chilkat.CkImap_SetSslClientCert(self, *args)
-    def GetSslServerCert(self): return _chilkat.CkImap_GetSslServerCert(self)
-    def get_SslServerCertVerified(self): return _chilkat.CkImap_get_SslServerCertVerified(self)
-    def get_LoggedInUser(self, *args): return _chilkat.CkImap_get_LoggedInUser(self, *args)
-    def get_ConnectedToHost(self, *args): return _chilkat.CkImap_get_ConnectedToHost(self, *args)
-    def CreateMailbox(self, *args): return _chilkat.CkImap_CreateMailbox(self, *args)
-    def DeleteMailbox(self, *args): return _chilkat.CkImap_DeleteMailbox(self, *args)
-    def RenameMailbox(self, *args): return _chilkat.CkImap_RenameMailbox(self, *args)
-    def CopyMultiple(self, *args): return _chilkat.CkImap_CopyMultiple(self, *args)
-    def CopySequence(self, *args): return _chilkat.CkImap_CopySequence(self, *args)
-    def SetDecryptCert2(self, *args): return _chilkat.CkImap_SetDecryptCert2(self, *args)
-    def LastResponse(self, *args): return _chilkat.CkImap_LastResponse(self, *args)
-    def ListMailboxes(self, *args): return _chilkat.CkImap_ListMailboxes(self, *args)
-    def SelectMailbox(self, *args): return _chilkat.CkImap_SelectMailbox(self, *args)
-    def ExamineMailbox(self, *args): return _chilkat.CkImap_ExamineMailbox(self, *args)
-    def Search(self, *args): return _chilkat.CkImap_Search(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkImap_ClearSessionLog(self)
-    def GetAllUids(self): return _chilkat.CkImap_GetAllUids(self)
-    def FetchSingle(self, *args): return _chilkat.CkImap_FetchSingle(self, *args)
-    def FetchSingleHeader(self, *args): return _chilkat.CkImap_FetchSingleHeader(self, *args)
-    def FetchBundle(self, *args): return _chilkat.CkImap_FetchBundle(self, *args)
-    def FetchHeaders(self, *args): return _chilkat.CkImap_FetchHeaders(self, *args)
-    def FetchChunk(self, *args): return _chilkat.CkImap_FetchChunk(self, *args)
-    def FetchSequence(self, *args): return _chilkat.CkImap_FetchSequence(self, *args)
-    def FetchSequenceHeaders(self, *args): return _chilkat.CkImap_FetchSequenceHeaders(self, *args)
-    def FetchSingleAsMime(self, *args): return _chilkat.CkImap_FetchSingleAsMime(self, *args)
-    def FetchBundleAsMime(self, *args): return _chilkat.CkImap_FetchBundleAsMime(self, *args)
-    def Expunge(self): return _chilkat.CkImap_Expunge(self)
-    def ExpungeAndClose(self): return _chilkat.CkImap_ExpungeAndClose(self)
-    def StoreFlags(self, *args): return _chilkat.CkImap_StoreFlags(self, *args)
-    def FetchFlags(self, *args): return _chilkat.CkImap_FetchFlags(self, *args)
-    def SetFlag(self, *args): return _chilkat.CkImap_SetFlag(self, *args)
-    def SetFlags(self, *args): return _chilkat.CkImap_SetFlags(self, *args)
-    def get_AuthMethod(self, *args): return _chilkat.CkImap_get_AuthMethod(self, *args)
-    def put_AuthMethod(self, *args): return _chilkat.CkImap_put_AuthMethod(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkImap_get_Domain(self, *args)
-    def put_Domain(self, *args): return _chilkat.CkImap_put_Domain(self, *args)
-    def get_Port(self): return _chilkat.CkImap_get_Port(self)
-    def put_Port(self, *args): return _chilkat.CkImap_put_Port(self, *args)
-    def get_Ssl(self): return _chilkat.CkImap_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkImap_put_Ssl(self, *args)
-    def AppendMime(self, *args): return _chilkat.CkImap_AppendMime(self, *args)
-    def AppendMail(self, *args): return _chilkat.CkImap_AppendMail(self, *args)
-    def Copy(self, *args): return _chilkat.CkImap_Copy(self, *args)
-    def SetMailFlag(self, *args): return _chilkat.CkImap_SetMailFlag(self, *args)
-    def GetMailFlag(self, *args): return _chilkat.CkImap_GetMailFlag(self, *args)
-    def RefetchMailFlags(self, *args): return _chilkat.CkImap_RefetchMailFlags(self, *args)
-    def GetMailSize(self, *args): return _chilkat.CkImap_GetMailSize(self, *args)
-    def GetMailNumAttach(self, *args): return _chilkat.CkImap_GetMailNumAttach(self, *args)
-    def GetMailAttachSize(self, *args): return _chilkat.CkImap_GetMailAttachSize(self, *args)
-    def GetMailAttachFilename(self, *args): return _chilkat.CkImap_GetMailAttachFilename(self, *args)
-    def get_PeekMode(self): return _chilkat.CkImap_get_PeekMode(self)
-    def put_PeekMode(self, *args): return _chilkat.CkImap_put_PeekMode(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkImap_get_SessionLog(self, *args)
-    def get_KeepSessionLog(self): return _chilkat.CkImap_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkImap_put_KeepSessionLog(self, *args)
-    def get_AppendSeen(self): return _chilkat.CkImap_get_AppendSeen(self)
-    def put_AppendSeen(self, *args): return _chilkat.CkImap_put_AppendSeen(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkImap_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkImap_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkImap_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkImap_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkImap_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkImap_IsUnlocked(self)
-    def get_ReadTimeout(self): return _chilkat.CkImap_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkImap_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkImap_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkImap_put_ConnectTimeout(self, *args)
-    def SendRawCommand(self, *args): return _chilkat.CkImap_SendRawCommand(self, *args)
-    def lastErrorText(self): return _chilkat.CkImap_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkImap_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkImap_lastErrorHtml(self)
-    def getMailAttachFilename(self, *args): return _chilkat.CkImap_getMailAttachFilename(self, *args)
-    def fetchFlags(self, *args): return _chilkat.CkImap_fetchFlags(self, *args)
-    def authMethod(self): return _chilkat.CkImap_authMethod(self)
-    def domain(self): return _chilkat.CkImap_domain(self)
-    def fetchSingleAsMime(self, *args): return _chilkat.CkImap_fetchSingleAsMime(self, *args)
-    def loggedInUser(self): return _chilkat.CkImap_loggedInUser(self)
-    def connectedToHost(self): return _chilkat.CkImap_connectedToHost(self)
-    def sendRawCommand(self, *args): return _chilkat.CkImap_sendRawCommand(self, *args)
-    def sessionLog(self): return _chilkat.CkImap_sessionLog(self)
-CkImap_swigregister = _chilkat.CkImap_swigregister
-CkImap_swigregister(CkImap)
-
-class CkMailboxes(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMailboxes, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMailboxes, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMailboxes()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMailboxes
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkMailboxes_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMailboxes_put_Utf8(self, *args)
-    def IsMarked(self, *args): return _chilkat.CkMailboxes_IsMarked(self, *args)
-    def HasInferiors(self, *args): return _chilkat.CkMailboxes_HasInferiors(self, *args)
-    def IsSelectable(self, *args): return _chilkat.CkMailboxes_IsSelectable(self, *args)
-    def GetName(self, *args): return _chilkat.CkMailboxes_GetName(self, *args)
-    def get_Count(self): return _chilkat.CkMailboxes_get_Count(self)
-    def getName(self, *args): return _chilkat.CkMailboxes_getName(self, *args)
-CkMailboxes_swigregister = _chilkat.CkMailboxes_swigregister
-CkMailboxes_swigregister(CkMailboxes)
-
-class CkMessageSet(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMessageSet, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMessageSet, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMessageSet()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMessageSet
-    __del__ = lambda self : None;
-    def toString(self): return _chilkat.CkMessageSet_toString(self)
-    def ToString(self, *args): return _chilkat.CkMessageSet_ToString(self, *args)
-    def ToCompactString(self, *args): return _chilkat.CkMessageSet_ToCompactString(self, *args)
-    def toCompactString(self): return _chilkat.CkMessageSet_toCompactString(self)
-    def FromCompactString(self, *args): return _chilkat.CkMessageSet_FromCompactString(self, *args)
-    def ContainsId(self, *args): return _chilkat.CkMessageSet_ContainsId(self, *args)
-    def RemoveId(self, *args): return _chilkat.CkMessageSet_RemoveId(self, *args)
-    def InsertId(self, *args): return _chilkat.CkMessageSet_InsertId(self, *args)
-    def GetId(self, *args): return _chilkat.CkMessageSet_GetId(self, *args)
-    def get_Count(self): return _chilkat.CkMessageSet_get_Count(self)
-    def put_HasUids(self, *args): return _chilkat.CkMessageSet_put_HasUids(self, *args)
-    def get_HasUids(self): return _chilkat.CkMessageSet_get_HasUids(self)
-CkMessageSet_swigregister = _chilkat.CkMessageSet_swigregister
-CkMessageSet_swigregister(CkMessageSet)
-
-class CkCharset(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCharset, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCharset, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCharset()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCharset
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkCharset_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCharset_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCharset_lastErrorHtml(self)
-    def UrlDecodeStr(self, *args): return _chilkat.CkCharset_UrlDecodeStr(self, *args)
-    def urlDecodeStr(self, *args): return _chilkat.CkCharset_urlDecodeStr(self, *args)
-    def getHtmlFileCharset(self, *args): return _chilkat.CkCharset_getHtmlFileCharset(self, *args)
-    def getHtmlCharset(self, *args): return _chilkat.CkCharset_getHtmlCharset(self, *args)
-    def lastOutputAsQP(self): return _chilkat.CkCharset_lastOutputAsQP(self)
-    def lastInputAsQP(self): return _chilkat.CkCharset_lastInputAsQP(self)
-    def lastOutputAsHex(self): return _chilkat.CkCharset_lastOutputAsHex(self)
-    def lastInputAsHex(self): return _chilkat.CkCharset_lastInputAsHex(self)
-    def htmlDecodeToStr(self, *args): return _chilkat.CkCharset_htmlDecodeToStr(self, *args)
-    def toCharset(self): return _chilkat.CkCharset_toCharset(self)
-    def fromCharset(self): return _chilkat.CkCharset_fromCharset(self)
-    def version(self): return _chilkat.CkCharset_version(self)
-    def codePageToCharset(self, *args): return _chilkat.CkCharset_codePageToCharset(self, *args)
-    def altToCharset(self): return _chilkat.CkCharset_altToCharset(self)
-    def upperCase(self, *args): return _chilkat.CkCharset_upperCase(self, *args)
-    def lowerCase(self, *args): return _chilkat.CkCharset_lowerCase(self, *args)
-    def UpperCase(self, *args): return _chilkat.CkCharset_UpperCase(self, *args)
-    def LowerCase(self, *args): return _chilkat.CkCharset_LowerCase(self, *args)
-    def get_Utf8(self): return _chilkat.CkCharset_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCharset_put_Utf8(self, *args)
-    def GetHtmlFileCharset(self, *args): return _chilkat.CkCharset_GetHtmlFileCharset(self, *args)
-    def GetHtmlCharset(self, *args): return _chilkat.CkCharset_GetHtmlCharset(self, *args)
-    def ConvertHtmlFile(self, *args): return _chilkat.CkCharset_ConvertHtmlFile(self, *args)
-    def ConvertHtml(self, *args): return _chilkat.CkCharset_ConvertHtml(self, *args)
-    def get_LastOutputAsQP(self, *args): return _chilkat.CkCharset_get_LastOutputAsQP(self, *args)
-    def get_LastInputAsQP(self, *args): return _chilkat.CkCharset_get_LastInputAsQP(self, *args)
-    def get_LastOutputAsHex(self, *args): return _chilkat.CkCharset_get_LastOutputAsHex(self, *args)
-    def get_LastInputAsHex(self, *args): return _chilkat.CkCharset_get_LastInputAsHex(self, *args)
-    def put_SaveLast(self, *args): return _chilkat.CkCharset_put_SaveLast(self, *args)
-    def get_SaveLast(self): return _chilkat.CkCharset_get_SaveLast(self)
-    def EntityEncodeHex(self, *args): return _chilkat.CkCharset_EntityEncodeHex(self, *args)
-    def EntityEncodeDec(self, *args): return _chilkat.CkCharset_EntityEncodeDec(self, *args)
-    def entityEncodeHex(self, *args): return _chilkat.CkCharset_entityEncodeHex(self, *args)
-    def entityEncodeDec(self, *args): return _chilkat.CkCharset_entityEncodeDec(self, *args)
-    def WriteFile(self, *args): return _chilkat.CkCharset_WriteFile(self, *args)
-    def ReadFile(self, *args): return _chilkat.CkCharset_ReadFile(self, *args)
-    def ConvertFromUnicode(self, *args): return _chilkat.CkCharset_ConvertFromUnicode(self, *args)
-    def ConvertToUnicode(self, *args): return _chilkat.CkCharset_ConvertToUnicode(self, *args)
-    def VerifyFile(self, *args): return _chilkat.CkCharset_VerifyFile(self, *args)
-    def VerifyData(self, *args): return _chilkat.CkCharset_VerifyData(self, *args)
-    def HtmlEntityDecode(self, *args): return _chilkat.CkCharset_HtmlEntityDecode(self, *args)
-    def HtmlDecodeToStr(self, *args): return _chilkat.CkCharset_HtmlDecodeToStr(self, *args)
-    def HtmlEntityDecodeFile(self, *args): return _chilkat.CkCharset_HtmlEntityDecodeFile(self, *args)
-    def ConvertFile(self, *args): return _chilkat.CkCharset_ConvertFile(self, *args)
-    def ConvertData(self, *args): return _chilkat.CkCharset_ConvertData(self, *args)
-    def get_ToCharset(self, *args): return _chilkat.CkCharset_get_ToCharset(self, *args)
-    def put_ToCharset(self, *args): return _chilkat.CkCharset_put_ToCharset(self, *args)
-    def get_FromCharset(self, *args): return _chilkat.CkCharset_get_FromCharset(self, *args)
-    def put_FromCharset(self, *args): return _chilkat.CkCharset_put_FromCharset(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCharset_get_Version(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkCharset_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkCharset_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkCharset_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCharset_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCharset_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCharset_LastErrorText(self, *args)
-    def CharsetToCodePage(self, *args): return _chilkat.CkCharset_CharsetToCodePage(self, *args)
-    def CodePageToCharset(self, *args): return _chilkat.CkCharset_CodePageToCharset(self, *args)
-    def get_ErrorAction(self): return _chilkat.CkCharset_get_ErrorAction(self)
-    def put_ErrorAction(self, *args): return _chilkat.CkCharset_put_ErrorAction(self, *args)
-    def get_AltToCharset(self, *args): return _chilkat.CkCharset_get_AltToCharset(self, *args)
-    def put_AltToCharset(self, *args): return _chilkat.CkCharset_put_AltToCharset(self, *args)
-    def SetErrorBytes(self, *args): return _chilkat.CkCharset_SetErrorBytes(self, *args)
-    def SetErrorString(self, *args): return _chilkat.CkCharset_SetErrorString(self, *args)
-CkCharset_swigregister = _chilkat.CkCharset_swigregister
-CkCharset_swigregister(CkCharset)
-
-class CkSpider(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSpider, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSpider, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSpider()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSpider
-    __del__ = lambda self : None;
-    def getAvoidPattern(self, *args): return _chilkat.CkSpider_getAvoidPattern(self, *args)
-    def getOutboundLink(self, *args): return _chilkat.CkSpider_getOutboundLink(self, *args)
-    def getFailedUrl(self, *args): return _chilkat.CkSpider_getFailedUrl(self, *args)
-    def getSpideredUrl(self, *args): return _chilkat.CkSpider_getSpideredUrl(self, *args)
-    def getUnspideredUrl(self, *args): return _chilkat.CkSpider_getUnspideredUrl(self, *args)
-    def get_ProxyDomain(self, *args): return _chilkat.CkSpider_get_ProxyDomain(self, *args)
-    def proxyDomain(self): return _chilkat.CkSpider_proxyDomain(self)
-    def put_ProxyDomain(self, *args): return _chilkat.CkSpider_put_ProxyDomain(self, *args)
-    def get_ProxyLogin(self, *args): return _chilkat.CkSpider_get_ProxyLogin(self, *args)
-    def proxyLogin(self): return _chilkat.CkSpider_proxyLogin(self)
-    def put_ProxyLogin(self, *args): return _chilkat.CkSpider_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkSpider_get_ProxyPassword(self, *args)
-    def proxyPassword(self): return _chilkat.CkSpider_proxyPassword(self)
-    def put_ProxyPassword(self, *args): return _chilkat.CkSpider_put_ProxyPassword(self, *args)
-    def get_ProxyPort(self): return _chilkat.CkSpider_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkSpider_put_ProxyPort(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkSpider_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSpider_put_VerboseLogging(self, *args)
-    def put_UserAgent(self, *args): return _chilkat.CkSpider_put_UserAgent(self, *args)
-    def userAgent(self): return _chilkat.CkSpider_userAgent(self)
-    def get_UserAgent(self, *args): return _chilkat.CkSpider_get_UserAgent(self, *args)
-    def cacheDir(self): return _chilkat.CkSpider_cacheDir(self)
-    def avoidPattern(self, *args): return _chilkat.CkSpider_avoidPattern(self, *args)
-    def outboundLink(self, *args): return _chilkat.CkSpider_outboundLink(self, *args)
-    def failedUrl(self, *args): return _chilkat.CkSpider_failedUrl(self, *args)
-    def spideredUrl(self, *args): return _chilkat.CkSpider_spideredUrl(self, *args)
-    def unspideredUrl(self, *args): return _chilkat.CkSpider_unspideredUrl(self, *args)
-    def domain(self): return _chilkat.CkSpider_domain(self)
-    def lastHtmlDescription(self): return _chilkat.CkSpider_lastHtmlDescription(self)
-    def lastHtmlKeywords(self): return _chilkat.CkSpider_lastHtmlKeywords(self)
-    def lastHtmlTitle(self): return _chilkat.CkSpider_lastHtmlTitle(self)
-    def lastHtml(self): return _chilkat.CkSpider_lastHtml(self)
-    def lastUrl(self): return _chilkat.CkSpider_lastUrl(self)
-    def lastModDateStr(self): return _chilkat.CkSpider_lastModDateStr(self)
-    def fetchRobotsText(self): return _chilkat.CkSpider_fetchRobotsText(self)
-    def GetDomain(self, *args): return _chilkat.CkSpider_GetDomain(self, *args)
-    def GetBaseDomain(self, *args): return _chilkat.CkSpider_GetBaseDomain(self, *args)
-    def CanonicalizeUrl(self, *args): return _chilkat.CkSpider_CanonicalizeUrl(self, *args)
-    def getDomain(self, *args): return _chilkat.CkSpider_getDomain(self, *args)
-    def getBaseDomain(self, *args): return _chilkat.CkSpider_getBaseDomain(self, *args)
-    def canonicalizeUrl(self, *args): return _chilkat.CkSpider_canonicalizeUrl(self, *args)
-    def lastErrorText(self): return _chilkat.CkSpider_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSpider_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSpider_lastErrorHtml(self)
-    def get_LastHtmlDescription(self, *args): return _chilkat.CkSpider_get_LastHtmlDescription(self, *args)
-    def get_LastHtmlKeywords(self, *args): return _chilkat.CkSpider_get_LastHtmlKeywords(self, *args)
-    def get_LastHtmlTitle(self, *args): return _chilkat.CkSpider_get_LastHtmlTitle(self, *args)
-    def get_LastHtml(self, *args): return _chilkat.CkSpider_get_LastHtml(self, *args)
-    def get_LastFromCache(self): return _chilkat.CkSpider_get_LastFromCache(self)
-    def get_LastModDate(self, *args): return _chilkat.CkSpider_get_LastModDate(self, *args)
-    def get_LastUrl(self, *args): return _chilkat.CkSpider_get_LastUrl(self, *args)
-    def get_LastModDateStr(self, *args): return _chilkat.CkSpider_get_LastModDateStr(self, *args)
-    def SleepMs(self, *args): return _chilkat.CkSpider_SleepMs(self, *args)
-    def SkipUnspidered(self, *args): return _chilkat.CkSpider_SkipUnspidered(self, *args)
-    def FetchRobotsText(self, *args): return _chilkat.CkSpider_FetchRobotsText(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkSpider_get_Domain(self, *args)
-    def AddMustMatchPattern(self, *args): return _chilkat.CkSpider_AddMustMatchPattern(self, *args)
-    def AddAvoidOutboundLinkPattern(self, *args): return _chilkat.CkSpider_AddAvoidOutboundLinkPattern(self, *args)
-    def GetAvoidPattern(self, *args): return _chilkat.CkSpider_GetAvoidPattern(self, *args)
-    def AddAvoidPattern(self, *args): return _chilkat.CkSpider_AddAvoidPattern(self, *args)
-    def GetOutboundLink(self, *args): return _chilkat.CkSpider_GetOutboundLink(self, *args)
-    def GetFailedUrl(self, *args): return _chilkat.CkSpider_GetFailedUrl(self, *args)
-    def GetSpideredUrl(self, *args): return _chilkat.CkSpider_GetSpideredUrl(self, *args)
-    def GetUnspideredUrl(self, *args): return _chilkat.CkSpider_GetUnspideredUrl(self, *args)
-    def RecrawlLast(self): return _chilkat.CkSpider_RecrawlLast(self)
-    def ClearOutboundLinks(self): return _chilkat.CkSpider_ClearOutboundLinks(self)
-    def ClearFailedUrls(self): return _chilkat.CkSpider_ClearFailedUrls(self)
-    def ClearSpideredUrls(self): return _chilkat.CkSpider_ClearSpideredUrls(self)
-    def get_WindDownCount(self): return _chilkat.CkSpider_get_WindDownCount(self)
-    def put_WindDownCount(self, *args): return _chilkat.CkSpider_put_WindDownCount(self, *args)
-    def get_NumAvoidPatterns(self): return _chilkat.CkSpider_get_NumAvoidPatterns(self)
-    def get_NumOutboundLinks(self): return _chilkat.CkSpider_get_NumOutboundLinks(self)
-    def get_NumFailed(self): return _chilkat.CkSpider_get_NumFailed(self)
-    def get_NumSpidered(self): return _chilkat.CkSpider_get_NumSpidered(self)
-    def get_NumUnspidered(self): return _chilkat.CkSpider_get_NumUnspidered(self)
-    def CrawlNext(self): return _chilkat.CkSpider_CrawlNext(self)
-    def get_ChopAtQuery(self): return _chilkat.CkSpider_get_ChopAtQuery(self)
-    def put_ChopAtQuery(self, *args): return _chilkat.CkSpider_put_ChopAtQuery(self, *args)
-    def get_AvoidHttps(self): return _chilkat.CkSpider_get_AvoidHttps(self)
-    def put_AvoidHttps(self, *args): return _chilkat.CkSpider_put_AvoidHttps(self, *args)
-    def get_MaxResponseSize(self): return _chilkat.CkSpider_get_MaxResponseSize(self)
-    def put_MaxResponseSize(self, *args): return _chilkat.CkSpider_put_MaxResponseSize(self, *args)
-    def get_MaxUrlLen(self): return _chilkat.CkSpider_get_MaxUrlLen(self)
-    def put_MaxUrlLen(self, *args): return _chilkat.CkSpider_put_MaxUrlLen(self, *args)
-    def get_CacheDir(self, *args): return _chilkat.CkSpider_get_CacheDir(self, *args)
-    def put_CacheDir(self, *args): return _chilkat.CkSpider_put_CacheDir(self, *args)
-    def get_UpdateCache(self): return _chilkat.CkSpider_get_UpdateCache(self)
-    def put_UpdateCache(self, *args): return _chilkat.CkSpider_put_UpdateCache(self, *args)
-    def get_FetchFromCache(self): return _chilkat.CkSpider_get_FetchFromCache(self)
-    def put_FetchFromCache(self, *args): return _chilkat.CkSpider_put_FetchFromCache(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkSpider_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkSpider_put_ConnectTimeout(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkSpider_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkSpider_put_ReadTimeout(self, *args)
-    def AddUnspidered(self, *args): return _chilkat.CkSpider_AddUnspidered(self, *args)
-    def Initialize(self, *args): return _chilkat.CkSpider_Initialize(self, *args)
-CkSpider_swigregister = _chilkat.CkSpider_swigregister
-CkSpider_swigregister(CkSpider)
-
-class CkXml(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkXml, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkXml, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkXml()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkXml
-    __del__ = lambda self : None;
-    def GetChildWithContent(self, *args): return _chilkat.CkXml_GetChildWithContent(self, *args)
-    def GetChildExact(self, *args): return _chilkat.CkXml_GetChildExact(self, *args)
-    def get_ContentInt(self): return _chilkat.CkXml_get_ContentInt(self)
-    def put_ContentInt(self, *args): return _chilkat.CkXml_put_ContentInt(self, *args)
-    def GetChildBoolValue(self, *args): return _chilkat.CkXml_GetChildBoolValue(self, *args)
-    def AddAttributeInt(self, *args): return _chilkat.CkXml_AddAttributeInt(self, *args)
-    def DecodeEntities(self, *args): return _chilkat.CkXml_DecodeEntities(self, *args)
-    def decodeEntities(self, *args): return _chilkat.CkXml_decodeEntities(self, *args)
-    def FindChild2(self, *args): return _chilkat.CkXml_FindChild2(self, *args)
-    def GetAttrValueInt(self, *args): return _chilkat.CkXml_GetAttrValueInt(self, *args)
-    def GetAttributeValueInt(self, *args): return _chilkat.CkXml_GetAttributeValueInt(self, *args)
-    def GetChildTagByIndex(self, *args): return _chilkat.CkXml_GetChildTagByIndex(self, *args)
-    def getChildTagByIndex(self, *args): return _chilkat.CkXml_getChildTagByIndex(self, *args)
-    def SaveBinaryContent(self, *args): return _chilkat.CkXml_SaveBinaryContent(self, *args)
-    def SetBinaryContentFromFile(self, *args): return _chilkat.CkXml_SetBinaryContentFromFile(self, *args)
-    def SortByAttributeInt(self, *args): return _chilkat.CkXml_SortByAttributeInt(self, *args)
-    def TagEquals(self, *args): return _chilkat.CkXml_TagEquals(self, *args)
-    def UpdateAttributeInt(self, *args): return _chilkat.CkXml_UpdateAttributeInt(self, *args)
-    def UpdateChildContentInt(self, *args): return _chilkat.CkXml_UpdateChildContentInt(self, *args)
-    def AddStyleSheet(self, *args): return _chilkat.CkXml_AddStyleSheet(self, *args)
-    def SortRecordsByContentInt(self, *args): return _chilkat.CkXml_SortRecordsByContentInt(self, *args)
-    def TagContent(self, *args): return _chilkat.CkXml_TagContent(self, *args)
-    def tagContent(self, *args): return _chilkat.CkXml_tagContent(self, *args)
-    def GetSelf(self): return _chilkat.CkXml_GetSelf(self)
-    def get_DocType(self, *args): return _chilkat.CkXml_get_DocType(self, *args)
-    def docType(self): return _chilkat.CkXml_docType(self)
-    def put_DocType(self, *args): return _chilkat.CkXml_put_DocType(self, *args)
-    def ChilkatPath(self, *args): return _chilkat.CkXml_ChilkatPath(self, *args)
-    def chilkatPath(self, *args): return _chilkat.CkXml_chilkatPath(self, *args)
-    def tag(self): return _chilkat.CkXml_tag(self)
-    def content(self): return _chilkat.CkXml_content(self)
-    def encoding(self): return _chilkat.CkXml_encoding(self)
-    def getXml(self): return _chilkat.CkXml_getXml(self)
-    def lastErrorText(self): return _chilkat.CkXml_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkXml_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkXml_lastErrorHtml(self)
-    def getChildContent(self, *args): return _chilkat.CkXml_getChildContent(self, *args)
-    def getAttrValue(self, *args): return _chilkat.CkXml_getAttrValue(self, *args)
-    def getAttributeValue(self, *args): return _chilkat.CkXml_getAttributeValue(self, *args)
-    def getAttributeName(self, *args): return _chilkat.CkXml_getAttributeName(self, *args)
-    def version(self): return _chilkat.CkXml_version(self)
-    def accumulateTagContent(self, *args): return _chilkat.CkXml_accumulateTagContent(self, *args)
-    def getChildContentByIndex(self, *args): return _chilkat.CkXml_getChildContentByIndex(self, *args)
-    def getChildTag(self, *args): return _chilkat.CkXml_getChildTag(self, *args)
-    def childContent(self, *args): return _chilkat.CkXml_childContent(self, *args)
-    def attr(self, *args): return _chilkat.CkXml_attr(self, *args)
-    def attrValue(self, *args): return _chilkat.CkXml_attrValue(self, *args)
-    def attrName(self, *args): return _chilkat.CkXml_attrName(self, *args)
-    def xml(self): return _chilkat.CkXml_xml(self)
-    def get_Utf8(self): return _chilkat.CkXml_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkXml_put_Utf8(self, *args)
-    def get_SortCaseInsensitive(self): return _chilkat.CkXml_get_SortCaseInsensitive(self)
-    def put_SortCaseInsensitive(self, *args): return _chilkat.CkXml_put_SortCaseInsensitive(self, *args)
-    def GetRoot2(self): return _chilkat.CkXml_GetRoot2(self)
-    def GetParent2(self): return _chilkat.CkXml_GetParent2(self)
-    def FirstChild2(self): return _chilkat.CkXml_FirstChild2(self)
-    def LastChild2(self): return _chilkat.CkXml_LastChild2(self)
-    def HttpGet(self, *args): return _chilkat.CkXml_HttpGet(self, *args)
-    def HttpPost(self, *args): return _chilkat.CkXml_HttpPost(self, *args)
-    def SetBinaryContent(self, *args): return _chilkat.CkXml_SetBinaryContent(self, *args)
-    def GetBinaryContent(self, *args): return _chilkat.CkXml_GetBinaryContent(self, *args)
-    def ZipTree(self): return _chilkat.CkXml_ZipTree(self)
-    def ZipContent(self): return _chilkat.CkXml_ZipContent(self)
-    def UnzipTree(self): return _chilkat.CkXml_UnzipTree(self)
-    def UnzipContent(self): return _chilkat.CkXml_UnzipContent(self)
-    def EncryptContent(self, *args): return _chilkat.CkXml_EncryptContent(self, *args)
-    def DecryptContent(self, *args): return _chilkat.CkXml_DecryptContent(self, *args)
-    def GetRoot(self): return _chilkat.CkXml_GetRoot(self)
-    def GetChildWithTag(self, *args): return _chilkat.CkXml_GetChildWithTag(self, *args)
-    def get_TreeId(self): return _chilkat.CkXml_get_TreeId(self)
-    def PreviousSibling(self): return _chilkat.CkXml_PreviousSibling(self)
-    def NextSibling(self): return _chilkat.CkXml_NextSibling(self)
-    def PreviousSibling2(self): return _chilkat.CkXml_PreviousSibling2(self)
-    def NextSibling2(self): return _chilkat.CkXml_NextSibling2(self)
-    def LastChild(self): return _chilkat.CkXml_LastChild(self)
-    def FirstChild(self): return _chilkat.CkXml_FirstChild(self)
-    def Clear(self): return _chilkat.CkXml_Clear(self)
-    def Copy(self, *args): return _chilkat.CkXml_Copy(self, *args)
-    def GetParent(self): return _chilkat.CkXml_GetParent(self)
-    def SearchForAttribute(self, *args): return _chilkat.CkXml_SearchForAttribute(self, *args)
-    def SearchAllForContent(self, *args): return _chilkat.CkXml_SearchAllForContent(self, *args)
-    def SearchForContent(self, *args): return _chilkat.CkXml_SearchForContent(self, *args)
-    def SearchForTag(self, *args): return _chilkat.CkXml_SearchForTag(self, *args)
-    def SearchForAttribute2(self, *args): return _chilkat.CkXml_SearchForAttribute2(self, *args)
-    def SearchAllForContent2(self, *args): return _chilkat.CkXml_SearchAllForContent2(self, *args)
-    def SearchForContent2(self, *args): return _chilkat.CkXml_SearchForContent2(self, *args)
-    def SearchForTag2(self, *args): return _chilkat.CkXml_SearchForTag2(self, *args)
-    def GetNthChildWithTag2(self, *args): return _chilkat.CkXml_GetNthChildWithTag2(self, *args)
-    def FindChild(self, *args): return _chilkat.CkXml_FindChild(self, *args)
-    def FindOrAddNewChild(self, *args): return _chilkat.CkXml_FindOrAddNewChild(self, *args)
-    def NewChild(self, *args): return _chilkat.CkXml_NewChild(self, *args)
-    def NewChild2(self, *args): return _chilkat.CkXml_NewChild2(self, *args)
-    def NewChildInt2(self, *args): return _chilkat.CkXml_NewChildInt2(self, *args)
-    def GetNthChildWithTag(self, *args): return _chilkat.CkXml_GetNthChildWithTag(self, *args)
-    def NumChildrenHavingTag(self, *args): return _chilkat.CkXml_NumChildrenHavingTag(self, *args)
-    def ExtractChildByName(self, *args): return _chilkat.CkXml_ExtractChildByName(self, *args)
-    def ExtractChildByIndex(self, *args): return _chilkat.CkXml_ExtractChildByIndex(self, *args)
-    def RemoveFromTree(self): return _chilkat.CkXml_RemoveFromTree(self)
-    def GetChild(self, *args): return _chilkat.CkXml_GetChild(self, *args)
-    def GetChild2(self, *args): return _chilkat.CkXml_GetChild2(self, *args)
-    def AddChildTree(self, *args): return _chilkat.CkXml_AddChildTree(self, *args)
-    def SwapTree(self, *args): return _chilkat.CkXml_SwapTree(self, *args)
-    def SwapNode(self, *args): return _chilkat.CkXml_SwapNode(self, *args)
-    def HasAttrWithValue(self, *args): return _chilkat.CkXml_HasAttrWithValue(self, *args)
-    def GetAttrValue(self, *args): return _chilkat.CkXml_GetAttrValue(self, *args)
-    def GetAttributeValue(self, *args): return _chilkat.CkXml_GetAttributeValue(self, *args)
-    def GetAttributeName(self, *args): return _chilkat.CkXml_GetAttributeName(self, *args)
-    def RemoveAllAttributes(self): return _chilkat.CkXml_RemoveAllAttributes(self)
-    def RemoveChild(self, *args): return _chilkat.CkXml_RemoveChild(self, *args)
-    def RemoveAttribute(self, *args): return _chilkat.CkXml_RemoveAttribute(self, *args)
-    def AddAttribute(self, *args): return _chilkat.CkXml_AddAttribute(self, *args)
-    def AppendToContent(self, *args): return _chilkat.CkXml_AppendToContent(self, *args)
-    def GetXml(self, *args): return _chilkat.CkXml_GetXml(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkXml_SaveXml(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkXml_LoadXmlFile(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkXml_LoadXml(self, *args)
-    def LoadXmlFile2(self, *args): return _chilkat.CkXml_LoadXmlFile2(self, *args)
-    def LoadXml2(self, *args): return _chilkat.CkXml_LoadXml2(self, *args)
-    def get_Version(self, *args): return _chilkat.CkXml_get_Version(self, *args)
-    def get_Cdata(self): return _chilkat.CkXml_get_Cdata(self)
-    def put_Cdata(self, *args): return _chilkat.CkXml_put_Cdata(self, *args)
-    def get_NumChildren(self): return _chilkat.CkXml_get_NumChildren(self)
-    def get_Content(self, *args): return _chilkat.CkXml_get_Content(self, *args)
-    def put_Content(self, *args): return _chilkat.CkXml_put_Content(self, *args)
-    def GetChildContent(self, *args): return _chilkat.CkXml_GetChildContent(self, *args)
-    def UpdateChildContent(self, *args): return _chilkat.CkXml_UpdateChildContent(self, *args)
-    def ContentMatches(self, *args): return _chilkat.CkXml_ContentMatches(self, *args)
-    def ChildContentMatches(self, *args): return _chilkat.CkXml_ChildContentMatches(self, *args)
-    def get_Tag(self, *args): return _chilkat.CkXml_get_Tag(self, *args)
-    def put_Tag(self, *args): return _chilkat.CkXml_put_Tag(self, *args)
-    def get_NumAttributes(self): return _chilkat.CkXml_get_NumAttributes(self)
-    def get_Standalone(self): return _chilkat.CkXml_get_Standalone(self)
-    def put_Standalone(self, *args): return _chilkat.CkXml_put_Standalone(self, *args)
-    def get_Encoding(self, *args): return _chilkat.CkXml_get_Encoding(self, *args)
-    def put_Encoding(self, *args): return _chilkat.CkXml_put_Encoding(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkXml_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkXml_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkXml_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkXml_LastErrorText(self, *args)
-    def QEncodeContent(self, *args): return _chilkat.CkXml_QEncodeContent(self, *args)
-    def BEncodeContent(self, *args): return _chilkat.CkXml_BEncodeContent(self, *args)
-    def DecodeContent(self, *args): return _chilkat.CkXml_DecodeContent(self, *args)
-    def UpdateAttribute(self, *args): return _chilkat.CkXml_UpdateAttribute(self, *args)
-    def GetChildIntValue(self, *args): return _chilkat.CkXml_GetChildIntValue(self, *args)
-    def SortByTag(self, *args): return _chilkat.CkXml_SortByTag(self, *args)
-    def SortByContent(self, *args): return _chilkat.CkXml_SortByContent(self, *args)
-    def SortByAttribute(self, *args): return _chilkat.CkXml_SortByAttribute(self, *args)
-    def SortRecordsByContent(self, *args): return _chilkat.CkXml_SortRecordsByContent(self, *args)
-    def SortRecordsByAttribute(self, *args): return _chilkat.CkXml_SortRecordsByAttribute(self, *args)
-    def FindNextRecord(self, *args): return _chilkat.CkXml_FindNextRecord(self, *args)
-    def HasChildWithTag(self, *args): return _chilkat.CkXml_HasChildWithTag(self, *args)
-    def RemoveChildWithContent(self, *args): return _chilkat.CkXml_RemoveChildWithContent(self, *args)
-    def HasChildWithTagAndContent(self, *args): return _chilkat.CkXml_HasChildWithTagAndContent(self, *args)
-    def HasChildWithContent(self, *args): return _chilkat.CkXml_HasChildWithContent(self, *args)
-    def RemoveAllChildren(self): return _chilkat.CkXml_RemoveAllChildren(self)
-    def RemoveChildByIndex(self, *args): return _chilkat.CkXml_RemoveChildByIndex(self, *args)
-    def AccumulateTagContent(self, *args): return _chilkat.CkXml_AccumulateTagContent(self, *args)
-    def GetChildContentByIndex(self, *args): return _chilkat.CkXml_GetChildContentByIndex(self, *args)
-    def GetChildTag(self, *args): return _chilkat.CkXml_GetChildTag(self, *args)
-    def AddToAttribute(self, *args): return _chilkat.CkXml_AddToAttribute(self, *args)
-    def AddToContent(self, *args): return _chilkat.CkXml_AddToContent(self, *args)
-    def AddToChildContent(self, *args): return _chilkat.CkXml_AddToChildContent(self, *args)
-    def AddOrUpdateAttributeI(self, *args): return _chilkat.CkXml_AddOrUpdateAttributeI(self, *args)
-    def AddOrUpdateAttribute(self, *args): return _chilkat.CkXml_AddOrUpdateAttribute(self, *args)
-    def HasAttribute(self, *args): return _chilkat.CkXml_HasAttribute(self, *args)
-CkXml_swigregister = _chilkat.CkXml_swigregister
-CkXml_swigregister(CkXml)
-
-class CkPfx(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkPfx, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkPfx, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkPfx()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkPfx
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkPfx_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkPfx_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkPfx_lastErrorHtml(self)
-    def get_Utf8(self): return _chilkat.CkPfx_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkPfx_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkPfx_UnlockComponent(self, *args)
-    def ImportPfxFile(self, *args): return _chilkat.CkPfx_ImportPfxFile(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkPfx_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkPfx_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkPfx_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkPfx_LastErrorText(self, *args)
-CkPfx_swigregister = _chilkat.CkPfx_swigregister
-CkPfx_swigregister(CkPfx)
-
-class CkBounce(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkBounce, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkBounce, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkBounce()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkBounce
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkBounce_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkBounce_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkBounce_lastErrorHtml(self)
-    def bounceAddress(self): return _chilkat.CkBounce_bounceAddress(self)
-    def bounceData(self): return _chilkat.CkBounce_bounceData(self)
-    def get_Version(self, *args): return _chilkat.CkBounce_get_Version(self, *args)
-    def get_Utf8(self): return _chilkat.CkBounce_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkBounce_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkBounce_UnlockComponent(self, *args)
-    def ExamineEmail(self, *args): return _chilkat.CkBounce_ExamineEmail(self, *args)
-    def ExamineMime(self, *args): return _chilkat.CkBounce_ExamineMime(self, *args)
-    def ExamineEml(self, *args): return _chilkat.CkBounce_ExamineEml(self, *args)
-    def get_BounceType(self): return _chilkat.CkBounce_get_BounceType(self)
-    def get_BounceAddress(self, *args): return _chilkat.CkBounce_get_BounceAddress(self, *args)
-    def get_BounceData(self, *args): return _chilkat.CkBounce_get_BounceData(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkBounce_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkBounce_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkBounce_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkBounce_LastErrorText(self, *args)
-CkBounce_swigregister = _chilkat.CkBounce_swigregister
-CkBounce_swigregister(CkBounce)
-
-class CkRarEntry(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRarEntry, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRarEntry, name)
-    __repr__ = _swig_repr
-    def get_Utf8(self): return _chilkat.CkRarEntry_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRarEntry_put_Utf8(self, *args)
-    def get_Filename(self, *args): return _chilkat.CkRarEntry_get_Filename(self, *args)
-    def get_UncompressedSize(self): return _chilkat.CkRarEntry_get_UncompressedSize(self)
-    def get_CompressedSize(self): return _chilkat.CkRarEntry_get_CompressedSize(self)
-    def get_LastModified(self, *args): return _chilkat.CkRarEntry_get_LastModified(self, *args)
-    def get_IsDirectory(self): return _chilkat.CkRarEntry_get_IsDirectory(self)
-    def get_IsReadOnly(self): return _chilkat.CkRarEntry_get_IsReadOnly(self)
-    def Unrar(self, *args): return _chilkat.CkRarEntry_Unrar(self, *args)
-    def get_Crc(self): return _chilkat.CkRarEntry_get_Crc(self)
-    def SaveLastError(self, *args): return _chilkat.CkRarEntry_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRarEntry_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRarEntry_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRarEntry_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkRarEntry_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRarEntry_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRarEntry_lastErrorHtml(self)
-    def filename(self): return _chilkat.CkRarEntry_filename(self)
-    def __init__(self): 
-        this = _chilkat.new_CkRarEntry()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRarEntry
-    __del__ = lambda self : None;
-CkRarEntry_swigregister = _chilkat.CkRarEntry_swigregister
-CkRarEntry_swigregister(CkRarEntry)
-
-class CkRar(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRar, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRar, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkRar()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRar
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkRar_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRar_put_Utf8(self, *args)
-    def Unrar(self, *args): return _chilkat.CkRar_Unrar(self, *args)
-    def FastOpen(self, *args): return _chilkat.CkRar_FastOpen(self, *args)
-    def Open(self, *args): return _chilkat.CkRar_Open(self, *args)
-    def Close(self): return _chilkat.CkRar_Close(self)
-    def get_NumEntries(self): return _chilkat.CkRar_get_NumEntries(self)
-    def GetEntryByName(self, *args): return _chilkat.CkRar_GetEntryByName(self, *args)
-    def GetEntryByIndex(self, *args): return _chilkat.CkRar_GetEntryByIndex(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkRar_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRar_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRar_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRar_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkRar_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRar_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRar_lastErrorHtml(self)
-CkRar_swigregister = _chilkat.CkRar_swigregister
-CkRar_swigregister(CkRar)
-
-class CkRss(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRss, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRss, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkRss()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRss
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkRss_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRss_put_Utf8(self, *args)
-    def get_NumChannels(self): return _chilkat.CkRss_get_NumChannels(self)
-    def get_NumItems(self): return _chilkat.CkRss_get_NumItems(self)
-    def AddNewChannel(self): return _chilkat.CkRss_AddNewChannel(self)
-    def AddNewImage(self): return _chilkat.CkRss_AddNewImage(self)
-    def AddNewItem(self): return _chilkat.CkRss_AddNewItem(self)
-    def DownloadRss(self, *args): return _chilkat.CkRss_DownloadRss(self, *args)
-    def GetAttr(self, *args): return _chilkat.CkRss_GetAttr(self, *args)
-    def getAttr(self, *args): return _chilkat.CkRss_getAttr(self, *args)
-    def GetChannel(self, *args): return _chilkat.CkRss_GetChannel(self, *args)
-    def GetCount(self, *args): return _chilkat.CkRss_GetCount(self, *args)
-    def GetDate(self, *args): return _chilkat.CkRss_GetDate(self, *args)
-    def GetImage(self): return _chilkat.CkRss_GetImage(self)
-    def GetInt(self, *args): return _chilkat.CkRss_GetInt(self, *args)
-    def GetItem(self, *args): return _chilkat.CkRss_GetItem(self, *args)
-    def GetString(self, *args): return _chilkat.CkRss_GetString(self, *args)
-    def getString(self, *args): return _chilkat.CkRss_getString(self, *args)
-    def LoadRssFile(self, *args): return _chilkat.CkRss_LoadRssFile(self, *args)
-    def LoadRssString(self, *args): return _chilkat.CkRss_LoadRssString(self, *args)
-    def MGetAttr(self, *args): return _chilkat.CkRss_MGetAttr(self, *args)
-    def mGetAttr(self, *args): return _chilkat.CkRss_mGetAttr(self, *args)
-    def MGetString(self, *args): return _chilkat.CkRss_MGetString(self, *args)
-    def mGetString(self, *args): return _chilkat.CkRss_mGetString(self, *args)
-    def MSetAttr(self, *args): return _chilkat.CkRss_MSetAttr(self, *args)
-    def MSetString(self, *args): return _chilkat.CkRss_MSetString(self, *args)
-    def NewRss(self): return _chilkat.CkRss_NewRss(self)
-    def Remove(self, *args): return _chilkat.CkRss_Remove(self, *args)
-    def SetAttr(self, *args): return _chilkat.CkRss_SetAttr(self, *args)
-    def SetDate(self, *args): return _chilkat.CkRss_SetDate(self, *args)
-    def SetDateNow(self, *args): return _chilkat.CkRss_SetDateNow(self, *args)
-    def SetInt(self, *args): return _chilkat.CkRss_SetInt(self, *args)
-    def SetString(self, *args): return _chilkat.CkRss_SetString(self, *args)
-    def ToXmlString(self, *args): return _chilkat.CkRss_ToXmlString(self, *args)
-    def toXmlString(self): return _chilkat.CkRss_toXmlString(self)
-    def SaveLastError(self, *args): return _chilkat.CkRss_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRss_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRss_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRss_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkRss_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRss_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRss_lastErrorHtml(self)
-CkRss_swigregister = _chilkat.CkRss_swigregister
-CkRss_swigregister(CkRss)
-
-class CkAtom(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkAtom, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkAtom, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkAtom()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkAtom
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkAtom_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkAtom_put_Utf8(self, *args)
-    def get_NumEntries(self): return _chilkat.CkAtom_get_NumEntries(self)
-    def AddElement(self, *args): return _chilkat.CkAtom_AddElement(self, *args)
-    def AddElementDate(self, *args): return _chilkat.CkAtom_AddElementDate(self, *args)
-    def AddElementHtml(self, *args): return _chilkat.CkAtom_AddElementHtml(self, *args)
-    def AddElementXHtml(self, *args): return _chilkat.CkAtom_AddElementXHtml(self, *args)
-    def AddElementXml(self, *args): return _chilkat.CkAtom_AddElementXml(self, *args)
-    def AddEntry(self, *args): return _chilkat.CkAtom_AddEntry(self, *args)
-    def AddLink(self, *args): return _chilkat.CkAtom_AddLink(self, *args)
-    def AddPerson(self, *args): return _chilkat.CkAtom_AddPerson(self, *args)
-    def DeleteElement(self, *args): return _chilkat.CkAtom_DeleteElement(self, *args)
-    def DeleteElementAttr(self, *args): return _chilkat.CkAtom_DeleteElementAttr(self, *args)
-    def DeletePerson(self, *args): return _chilkat.CkAtom_DeletePerson(self, *args)
-    def DownloadAtom(self, *args): return _chilkat.CkAtom_DownloadAtom(self, *args)
-    def GetElement(self, *args): return _chilkat.CkAtom_GetElement(self, *args)
-    def getElement(self, *args): return _chilkat.CkAtom_getElement(self, *args)
-    def GetElementAttr(self, *args): return _chilkat.CkAtom_GetElementAttr(self, *args)
-    def getElementAttr(self, *args): return _chilkat.CkAtom_getElementAttr(self, *args)
-    def GetElementCount(self, *args): return _chilkat.CkAtom_GetElementCount(self, *args)
-    def GetElementDate(self, *args): return _chilkat.CkAtom_GetElementDate(self, *args)
-    def GetEntry(self, *args): return _chilkat.CkAtom_GetEntry(self, *args)
-    def GetLinkHref(self, *args): return _chilkat.CkAtom_GetLinkHref(self, *args)
-    def getLinkHref(self, *args): return _chilkat.CkAtom_getLinkHref(self, *args)
-    def GetPersonInfo(self, *args): return _chilkat.CkAtom_GetPersonInfo(self, *args)
-    def getPersonInfo(self, *args): return _chilkat.CkAtom_getPersonInfo(self, *args)
-    def GetTopAttr(self, *args): return _chilkat.CkAtom_GetTopAttr(self, *args)
-    def getTopAttr(self, *args): return _chilkat.CkAtom_getTopAttr(self, *args)
-    def HasElement(self, *args): return _chilkat.CkAtom_HasElement(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkAtom_LoadXml(self, *args)
-    def NewEntry(self): return _chilkat.CkAtom_NewEntry(self)
-    def NewFeed(self): return _chilkat.CkAtom_NewFeed(self)
-    def SetElementAttr(self, *args): return _chilkat.CkAtom_SetElementAttr(self, *args)
-    def SetTopAttr(self, *args): return _chilkat.CkAtom_SetTopAttr(self, *args)
-    def ToXmlString(self, *args): return _chilkat.CkAtom_ToXmlString(self, *args)
-    def toXmlString(self): return _chilkat.CkAtom_toXmlString(self)
-    def UpdateElement(self, *args): return _chilkat.CkAtom_UpdateElement(self, *args)
-    def UpdateElementDate(self, *args): return _chilkat.CkAtom_UpdateElementDate(self, *args)
-    def UpdateElementHtml(self, *args): return _chilkat.CkAtom_UpdateElementHtml(self, *args)
-    def UpdateElementXHtml(self, *args): return _chilkat.CkAtom_UpdateElementXHtml(self, *args)
-    def UpdateElementXml(self, *args): return _chilkat.CkAtom_UpdateElementXml(self, *args)
-    def UpdatePerson(self, *args): return _chilkat.CkAtom_UpdatePerson(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkAtom_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkAtom_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkAtom_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkAtom_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkAtom_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkAtom_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkAtom_lastErrorHtml(self)
-CkAtom_swigregister = _chilkat.CkAtom_swigregister
-CkAtom_swigregister(CkAtom)
-
-class CkCache(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCache, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCache, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCache()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCache
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCache_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCache_put_Utf8(self, *args)
-    def get_LastEtagFetched(self, *args): return _chilkat.CkCache_get_LastEtagFetched(self, *args)
-    def lastEtagFetched(self): return _chilkat.CkCache_lastEtagFetched(self)
-    def get_LastExpirationFetched(self, *args): return _chilkat.CkCache_get_LastExpirationFetched(self, *args)
-    def get_LastHitExpired(self): return _chilkat.CkCache_get_LastHitExpired(self)
-    def get_LastKeyFetched(self, *args): return _chilkat.CkCache_get_LastKeyFetched(self, *args)
-    def lastKeyFetched(self): return _chilkat.CkCache_lastKeyFetched(self)
-    def get_Level(self): return _chilkat.CkCache_get_Level(self)
-    def put_Level(self, *args): return _chilkat.CkCache_put_Level(self, *args)
-    def get_NumRoots(self): return _chilkat.CkCache_get_NumRoots(self)
-    def AddRoot(self, *args): return _chilkat.CkCache_AddRoot(self, *args)
-    def DeleteAll(self): return _chilkat.CkCache_DeleteAll(self)
-    def DeleteAllExpired(self): return _chilkat.CkCache_DeleteAllExpired(self)
-    def DeleteFromCache(self, *args): return _chilkat.CkCache_DeleteFromCache(self, *args)
-    def DeleteOlder(self, *args): return _chilkat.CkCache_DeleteOlder(self, *args)
-    def FetchFromCache(self, *args): return _chilkat.CkCache_FetchFromCache(self, *args)
-    def GetEtag(self, *args): return _chilkat.CkCache_GetEtag(self, *args)
-    def getEtag(self, *args): return _chilkat.CkCache_getEtag(self, *args)
-    def GetExpiration(self, *args): return _chilkat.CkCache_GetExpiration(self, *args)
-    def GetFilename(self, *args): return _chilkat.CkCache_GetFilename(self, *args)
-    def getFilename(self, *args): return _chilkat.CkCache_getFilename(self, *args)
-    def GetRoot(self, *args): return _chilkat.CkCache_GetRoot(self, *args)
-    def getRoot(self, *args): return _chilkat.CkCache_getRoot(self, *args)
-    def IsCached(self, *args): return _chilkat.CkCache_IsCached(self, *args)
-    def SaveToCache(self, *args): return _chilkat.CkCache_SaveToCache(self, *args)
-    def SaveToCacheNoExpire(self, *args): return _chilkat.CkCache_SaveToCacheNoExpire(self, *args)
-    def UpdateExpiration(self, *args): return _chilkat.CkCache_UpdateExpiration(self, *args)
-    def FetchText(self, *args): return _chilkat.CkCache_FetchText(self, *args)
-    def fetchText(self, *args): return _chilkat.CkCache_fetchText(self, *args)
-    def SaveText(self, *args): return _chilkat.CkCache_SaveText(self, *args)
-    def SaveTextNoExpire(self, *args): return _chilkat.CkCache_SaveTextNoExpire(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCache_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCache_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCache_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCache_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCache_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCache_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCache_lastErrorHtml(self)
-CkCache_swigregister = _chilkat.CkCache_swigregister
-CkCache_swigregister(CkCache)
-
-class CkDh(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDh, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDh, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDh()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDh
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDh_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDh_put_Utf8(self, *args)
-    def UseKnownPrime(self, *args): return _chilkat.CkDh_UseKnownPrime(self, *args)
-    def get_G(self): return _chilkat.CkDh_get_G(self)
-    def get_P(self, *args): return _chilkat.CkDh_get_P(self, *args)
-    def p(self): return _chilkat.CkDh_p(self)
-    def SetPG(self, *args): return _chilkat.CkDh_SetPG(self, *args)
-    def CreateE(self, *args): return _chilkat.CkDh_CreateE(self, *args)
-    def createE(self, *args): return _chilkat.CkDh_createE(self, *args)
-    def FindK(self, *args): return _chilkat.CkDh_FindK(self, *args)
-    def findK(self, *args): return _chilkat.CkDh_findK(self, *args)
-    def GenPG(self, *args): return _chilkat.CkDh_GenPG(self, *args)
-    def get_Version(self, *args): return _chilkat.CkDh_get_Version(self, *args)
-    def version(self): return _chilkat.CkDh_version(self)
-    def UnlockComponent(self, *args): return _chilkat.CkDh_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkDh_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDh_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDh_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDh_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDh_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDh_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDh_lastErrorHtml(self)
-CkDh_swigregister = _chilkat.CkDh_swigregister
-CkDh_swigregister(CkDh)
-
-class CkDsa(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDsa, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDsa, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDsa()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDsa
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDsa_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDsa_put_Utf8(self, *args)
-    def get_GroupSize(self): return _chilkat.CkDsa_get_GroupSize(self)
-    def put_GroupSize(self, *args): return _chilkat.CkDsa_put_GroupSize(self, *args)
-    def GenKey(self, *args): return _chilkat.CkDsa_GenKey(self, *args)
-    def GenKeyFromParamsDerFile(self, *args): return _chilkat.CkDsa_GenKeyFromParamsDerFile(self, *args)
-    def GenKeyFromParamsPemFile(self, *args): return _chilkat.CkDsa_GenKeyFromParamsPemFile(self, *args)
-    def GenKeyFromParamsDer(self, *args): return _chilkat.CkDsa_GenKeyFromParamsDer(self, *args)
-    def GenKeyFromParamsPem(self, *args): return _chilkat.CkDsa_GenKeyFromParamsPem(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkDsa_UnlockComponent(self, *args)
-    def VerifyKey(self): return _chilkat.CkDsa_VerifyKey(self)
-    def ToXml(self, *args): return _chilkat.CkDsa_ToXml(self, *args)
-    def toXml(self, *args): return _chilkat.CkDsa_toXml(self, *args)
-    def FromXml(self, *args): return _chilkat.CkDsa_FromXml(self, *args)
-    def FromEncryptedPem(self, *args): return _chilkat.CkDsa_FromEncryptedPem(self, *args)
-    def FromPem(self, *args): return _chilkat.CkDsa_FromPem(self, *args)
-    def SaveText(self, *args): return _chilkat.CkDsa_SaveText(self, *args)
-    def ToEncryptedPem(self, *args): return _chilkat.CkDsa_ToEncryptedPem(self, *args)
-    def toEncryptedPem(self, *args): return _chilkat.CkDsa_toEncryptedPem(self, *args)
-    def ToPem(self, *args): return _chilkat.CkDsa_ToPem(self, *args)
-    def toPem(self): return _chilkat.CkDsa_toPem(self)
-    def ToDer(self, *args): return _chilkat.CkDsa_ToDer(self, *args)
-    def ToDerFile(self, *args): return _chilkat.CkDsa_ToDerFile(self, *args)
-    def FromDer(self, *args): return _chilkat.CkDsa_FromDer(self, *args)
-    def FromDerFile(self, *args): return _chilkat.CkDsa_FromDerFile(self, *args)
-    def FromPublicPem(self, *args): return _chilkat.CkDsa_FromPublicPem(self, *args)
-    def ToPublicPem(self, *args): return _chilkat.CkDsa_ToPublicPem(self, *args)
-    def toPublicPem(self): return _chilkat.CkDsa_toPublicPem(self)
-    def get_Hash(self, *args): return _chilkat.CkDsa_get_Hash(self, *args)
-    def put_Hash(self, *args): return _chilkat.CkDsa_put_Hash(self, *args)
-    def get_Signature(self, *args): return _chilkat.CkDsa_get_Signature(self, *args)
-    def put_Signature(self, *args): return _chilkat.CkDsa_put_Signature(self, *args)
-    def SetEncodedHash(self, *args): return _chilkat.CkDsa_SetEncodedHash(self, *args)
-    def SetEncodedSignature(self, *args): return _chilkat.CkDsa_SetEncodedSignature(self, *args)
-    def GetEncodedSignature(self, *args): return _chilkat.CkDsa_GetEncodedSignature(self, *args)
-    def getEncodedSignature(self, *args): return _chilkat.CkDsa_getEncodedSignature(self, *args)
-    def GetEncodedHash(self, *args): return _chilkat.CkDsa_GetEncodedHash(self, *args)
-    def getEncodedHash(self, *args): return _chilkat.CkDsa_getEncodedHash(self, *args)
-    def SignHash(self): return _chilkat.CkDsa_SignHash(self)
-    def Verify(self): return _chilkat.CkDsa_Verify(self)
-    def SetKeyExplicit(self, *args): return _chilkat.CkDsa_SetKeyExplicit(self, *args)
-    def ToPublicDerFile(self, *args): return _chilkat.CkDsa_ToPublicDerFile(self, *args)
-    def ToPublicDer(self, *args): return _chilkat.CkDsa_ToPublicDer(self, *args)
-    def FromPublicDer(self, *args): return _chilkat.CkDsa_FromPublicDer(self, *args)
-    def FromPublicDerFile(self, *args): return _chilkat.CkDsa_FromPublicDerFile(self, *args)
-    def get_HexP(self, *args): return _chilkat.CkDsa_get_HexP(self, *args)
-    def hexP(self): return _chilkat.CkDsa_hexP(self)
-    def get_HexQ(self, *args): return _chilkat.CkDsa_get_HexQ(self, *args)
-    def hexQ(self): return _chilkat.CkDsa_hexQ(self)
-    def get_HexG(self, *args): return _chilkat.CkDsa_get_HexG(self, *args)
-    def hexG(self): return _chilkat.CkDsa_hexG(self)
-    def get_HexX(self, *args): return _chilkat.CkDsa_get_HexX(self, *args)
-    def hexX(self): return _chilkat.CkDsa_hexX(self)
-    def get_HexY(self, *args): return _chilkat.CkDsa_get_HexY(self, *args)
-    def hexY(self): return _chilkat.CkDsa_hexY(self)
-    def SetPubKeyExplicit(self, *args): return _chilkat.CkDsa_SetPubKeyExplicit(self, *args)
-    def get_Version(self, *args): return _chilkat.CkDsa_get_Version(self, *args)
-    def version(self): return _chilkat.CkDsa_version(self)
-    def LoadText(self, *args): return _chilkat.CkDsa_LoadText(self, *args)
-    def loadText(self, *args): return _chilkat.CkDsa_loadText(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkDsa_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDsa_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDsa_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDsa_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDsa_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDsa_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDsa_lastErrorHtml(self)
-CkDsa_swigregister = _chilkat.CkDsa_swigregister
-CkDsa_swigregister(CkDsa)
-
-class CkSFtpFile(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSFtpFile, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSFtpFile, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSFtpFile()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSFtpFile
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSFtpFile_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSFtpFile_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSFtpFile_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSFtpFile_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSFtpFile_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSFtpFile_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSFtpFile_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSFtpFile_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSFtpFile_lastErrorHtml(self)
-    def get_Filename(self, *args): return _chilkat.CkSFtpFile_get_Filename(self, *args)
-    def filename(self): return _chilkat.CkSFtpFile_filename(self)
-    def get_Owner(self, *args): return _chilkat.CkSFtpFile_get_Owner(self, *args)
-    def owner(self): return _chilkat.CkSFtpFile_owner(self)
-    def get_Group(self, *args): return _chilkat.CkSFtpFile_get_Group(self, *args)
-    def group(self): return _chilkat.CkSFtpFile_group(self)
-    def get_FileType(self, *args): return _chilkat.CkSFtpFile_get_FileType(self, *args)
-    def fileType(self): return _chilkat.CkSFtpFile_fileType(self)
-    def get_IsRegular(self): return _chilkat.CkSFtpFile_get_IsRegular(self)
-    def get_IsDirectory(self): return _chilkat.CkSFtpFile_get_IsDirectory(self)
-    def get_IsSymLink(self): return _chilkat.CkSFtpFile_get_IsSymLink(self)
-    def get_IsReadOnly(self): return _chilkat.CkSFtpFile_get_IsReadOnly(self)
-    def get_IsSystem(self): return _chilkat.CkSFtpFile_get_IsSystem(self)
-    def get_IsHidden(self): return _chilkat.CkSFtpFile_get_IsHidden(self)
-    def get_IsCaseInsensitive(self): return _chilkat.CkSFtpFile_get_IsCaseInsensitive(self)
-    def get_IsArchive(self): return _chilkat.CkSFtpFile_get_IsArchive(self)
-    def get_IsEncrypted(self): return _chilkat.CkSFtpFile_get_IsEncrypted(self)
-    def get_IsCompressed(self): return _chilkat.CkSFtpFile_get_IsCompressed(self)
-    def get_IsSparse(self): return _chilkat.CkSFtpFile_get_IsSparse(self)
-    def get_IsAppendOnly(self): return _chilkat.CkSFtpFile_get_IsAppendOnly(self)
-    def get_IsImmutable(self): return _chilkat.CkSFtpFile_get_IsImmutable(self)
-    def get_IsSync(self): return _chilkat.CkSFtpFile_get_IsSync(self)
-    def get_Permissions(self): return _chilkat.CkSFtpFile_get_Permissions(self)
-    def get_Size32(self): return _chilkat.CkSFtpFile_get_Size32(self)
-    def get_LastModifiedTime(self, *args): return _chilkat.CkSFtpFile_get_LastModifiedTime(self, *args)
-    def get_LastAccessTime(self, *args): return _chilkat.CkSFtpFile_get_LastAccessTime(self, *args)
-    def get_CreateTime(self, *args): return _chilkat.CkSFtpFile_get_CreateTime(self, *args)
-    def get_SizeStr(self, *args): return _chilkat.CkSFtpFile_get_SizeStr(self, *args)
-    def sizeStr(self): return _chilkat.CkSFtpFile_sizeStr(self)
-    def get_Uid(self): return _chilkat.CkSFtpFile_get_Uid(self)
-    def get_Gid(self): return _chilkat.CkSFtpFile_get_Gid(self)
-CkSFtpFile_swigregister = _chilkat.CkSFtpFile_swigregister
-CkSFtpFile_swigregister(CkSFtpFile)
-
-class CkSFtpDir(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSFtpDir, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSFtpDir, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSFtpDir()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSFtpDir
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSFtpDir_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSFtpDir_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSFtpDir_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSFtpDir_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSFtpDir_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSFtpDir_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSFtpDir_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSFtpDir_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSFtpDir_lastErrorHtml(self)
-    def get_NumFilesAndDirs(self): return _chilkat.CkSFtpDir_get_NumFilesAndDirs(self)
-    def get_OriginalPath(self, *args): return _chilkat.CkSFtpDir_get_OriginalPath(self, *args)
-    def originalPath(self): return _chilkat.CkSFtpDir_originalPath(self)
-    def GetFileObject(self, *args): return _chilkat.CkSFtpDir_GetFileObject(self, *args)
-    def GetFilename(self, *args): return _chilkat.CkSFtpDir_GetFilename(self, *args)
-    def getFilename(self, *args): return _chilkat.CkSFtpDir_getFilename(self, *args)
-CkSFtpDir_swigregister = _chilkat.CkSFtpDir_swigregister
-CkSFtpDir_swigregister(CkSFtpDir)
-
-class CkSFtp(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSFtp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSFtp, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSFtp()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSFtp
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSFtp_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSFtp_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSFtp_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSFtp_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSFtp_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSFtp_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSFtp_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSFtp_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSFtp_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkSFtp_UnlockComponent(self, *args)
-    def get_ConnectTimeoutMs(self): return _chilkat.CkSFtp_get_ConnectTimeoutMs(self)
-    def put_ConnectTimeoutMs(self, *args): return _chilkat.CkSFtp_put_ConnectTimeoutMs(self, *args)
-    def get_DisconnectCode(self): return _chilkat.CkSFtp_get_DisconnectCode(self)
-    def get_InitializeFailCode(self): return _chilkat.CkSFtp_get_InitializeFailCode(self)
-    def get_MaxPacketSize(self): return _chilkat.CkSFtp_get_MaxPacketSize(self)
-    def put_MaxPacketSize(self, *args): return _chilkat.CkSFtp_put_MaxPacketSize(self, *args)
-    def get_IdleTimeoutMs(self): return _chilkat.CkSFtp_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkSFtp_put_IdleTimeoutMs(self, *args)
-    def get_InitializeFailReason(self, *args): return _chilkat.CkSFtp_get_InitializeFailReason(self, *args)
-    def initializeFailReason(self): return _chilkat.CkSFtp_initializeFailReason(self)
-    def get_DisconnectReason(self, *args): return _chilkat.CkSFtp_get_DisconnectReason(self, *args)
-    def disconnectReason(self): return _chilkat.CkSFtp_disconnectReason(self)
-    def get_Version(self, *args): return _chilkat.CkSFtp_get_Version(self, *args)
-    def version(self): return _chilkat.CkSFtp_version(self)
-    def get_IsConnected(self): return _chilkat.CkSFtp_get_IsConnected(self)
-    def get_KeepSessionLog(self): return _chilkat.CkSFtp_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkSFtp_put_KeepSessionLog(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkSFtp_get_SessionLog(self, *args)
-    def sessionLog(self): return _chilkat.CkSFtp_sessionLog(self)
-    def Disconnect(self): return _chilkat.CkSFtp_Disconnect(self)
-    def Connect(self, *args): return _chilkat.CkSFtp_Connect(self, *args)
-    def AuthenticatePk(self, *args): return _chilkat.CkSFtp_AuthenticatePk(self, *args)
-    def AuthenticatePw(self, *args): return _chilkat.CkSFtp_AuthenticatePw(self, *args)
-    def InitializeSftp(self): return _chilkat.CkSFtp_InitializeSftp(self)
-    def OpenFile(self, *args): return _chilkat.CkSFtp_OpenFile(self, *args)
-    def openFile(self, *args): return _chilkat.CkSFtp_openFile(self, *args)
-    def OpenDir(self, *args): return _chilkat.CkSFtp_OpenDir(self, *args)
-    def openDir(self, *args): return _chilkat.CkSFtp_openDir(self, *args)
-    def CloseHandle(self, *args): return _chilkat.CkSFtp_CloseHandle(self, *args)
-    def GetFileSize32(self, *args): return _chilkat.CkSFtp_GetFileSize32(self, *args)
-    def GetFileSizeStr(self, *args): return _chilkat.CkSFtp_GetFileSizeStr(self, *args)
-    def getFileSizeStr(self, *args): return _chilkat.CkSFtp_getFileSizeStr(self, *args)
-    def GetFileLastAccess(self, *args): return _chilkat.CkSFtp_GetFileLastAccess(self, *args)
-    def GetFileLastModified(self, *args): return _chilkat.CkSFtp_GetFileLastModified(self, *args)
-    def GetFileCreateTime(self, *args): return _chilkat.CkSFtp_GetFileCreateTime(self, *args)
-    def GetFileOwner(self, *args): return _chilkat.CkSFtp_GetFileOwner(self, *args)
-    def getFileOwner(self, *args): return _chilkat.CkSFtp_getFileOwner(self, *args)
-    def GetFileGroup(self, *args): return _chilkat.CkSFtp_GetFileGroup(self, *args)
-    def getFileGroup(self, *args): return _chilkat.CkSFtp_getFileGroup(self, *args)
-    def GetFilePermissions(self, *args): return _chilkat.CkSFtp_GetFilePermissions(self, *args)
-    def Add64(self, *args): return _chilkat.CkSFtp_Add64(self, *args)
-    def add64(self, *args): return _chilkat.CkSFtp_add64(self, *args)
-    def ReadFileBytes32(self, *args): return _chilkat.CkSFtp_ReadFileBytes32(self, *args)
-    def ReadFileBytes64s(self, *args): return _chilkat.CkSFtp_ReadFileBytes64s(self, *args)
-    def ReadFileText64s(self, *args): return _chilkat.CkSFtp_ReadFileText64s(self, *args)
-    def readFileText64s(self, *args): return _chilkat.CkSFtp_readFileText64s(self, *args)
-    def ReadFileText32(self, *args): return _chilkat.CkSFtp_ReadFileText32(self, *args)
-    def readFileText32(self, *args): return _chilkat.CkSFtp_readFileText32(self, *args)
-    def DownloadFile(self, *args): return _chilkat.CkSFtp_DownloadFile(self, *args)
-    def Eof(self, *args): return _chilkat.CkSFtp_Eof(self, *args)
-    def ReadFileBytes(self, *args): return _chilkat.CkSFtp_ReadFileBytes(self, *args)
-    def ReadFileText(self, *args): return _chilkat.CkSFtp_ReadFileText(self, *args)
-    def readFileText(self, *args): return _chilkat.CkSFtp_readFileText(self, *args)
-    def LastReadFailed(self, *args): return _chilkat.CkSFtp_LastReadFailed(self, *args)
-    def LastReadNumBytes(self, *args): return _chilkat.CkSFtp_LastReadNumBytes(self, *args)
-    def WriteFileBytes(self, *args): return _chilkat.CkSFtp_WriteFileBytes(self, *args)
-    def WriteFileBytes32(self, *args): return _chilkat.CkSFtp_WriteFileBytes32(self, *args)
-    def WriteFileBytes64s(self, *args): return _chilkat.CkSFtp_WriteFileBytes64s(self, *args)
-    def WriteFileText(self, *args): return _chilkat.CkSFtp_WriteFileText(self, *args)
-    def WriteFileText32(self, *args): return _chilkat.CkSFtp_WriteFileText32(self, *args)
-    def WriteFileText64s(self, *args): return _chilkat.CkSFtp_WriteFileText64s(self, *args)
-    def UploadFile(self, *args): return _chilkat.CkSFtp_UploadFile(self, *args)
-    def RealPath(self, *args): return _chilkat.CkSFtp_RealPath(self, *args)
-    def realPath(self, *args): return _chilkat.CkSFtp_realPath(self, *args)
-    def ReadDir(self, *args): return _chilkat.CkSFtp_ReadDir(self, *args)
-    def RemoveFile(self, *args): return _chilkat.CkSFtp_RemoveFile(self, *args)
-    def RemoveDir(self, *args): return _chilkat.CkSFtp_RemoveDir(self, *args)
-    def RenameFileOrDir(self, *args): return _chilkat.CkSFtp_RenameFileOrDir(self, *args)
-    def CreateDir(self, *args): return _chilkat.CkSFtp_CreateDir(self, *args)
-    def SetCreateTime(self, *args): return _chilkat.CkSFtp_SetCreateTime(self, *args)
-    def SetLastModifiedTime(self, *args): return _chilkat.CkSFtp_SetLastModifiedTime(self, *args)
-    def SetLastAccessTime(self, *args): return _chilkat.CkSFtp_SetLastAccessTime(self, *args)
-    def SetOwnerAndGroup(self, *args): return _chilkat.CkSFtp_SetOwnerAndGroup(self, *args)
-    def SetPermissions(self, *args): return _chilkat.CkSFtp_SetPermissions(self, *args)
-    def CopyFileAttr(self, *args): return _chilkat.CkSFtp_CopyFileAttr(self, *args)
-    def get_ProtocolVersion(self): return _chilkat.CkSFtp_get_ProtocolVersion(self)
-    def get_EnableCache(self): return _chilkat.CkSFtp_get_EnableCache(self)
-    def put_EnableCache(self, *args): return _chilkat.CkSFtp_put_EnableCache(self, *args)
-    def ClearCache(self): return _chilkat.CkSFtp_ClearCache(self)
-    def DownloadFileByName(self, *args): return _chilkat.CkSFtp_DownloadFileByName(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkSFtp_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkSFtp_put_HeartbeatMs(self, *args)
-    def UploadFileByName(self, *args): return _chilkat.CkSFtp_UploadFileByName(self, *args)
-    def ResumeUploadFileByName(self, *args): return _chilkat.CkSFtp_ResumeUploadFileByName(self, *args)
-    def ResumeDownloadFileByName(self, *args): return _chilkat.CkSFtp_ResumeDownloadFileByName(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkSFtp_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSFtp_put_VerboseLogging(self, *args)
-    def get_FilenameCharset(self, *args): return _chilkat.CkSFtp_get_FilenameCharset(self, *args)
-    def filenameCharset(self): return _chilkat.CkSFtp_filenameCharset(self)
-    def put_FilenameCharset(self, *args): return _chilkat.CkSFtp_put_FilenameCharset(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkSFtp_ClearSessionLog(self)
-    def get_ForceV3(self): return _chilkat.CkSFtp_get_ForceV3(self)
-    def put_ForceV3(self, *args): return _chilkat.CkSFtp_put_ForceV3(self, *args)
-    def get_UtcMode(self): return _chilkat.CkSFtp_get_UtcMode(self)
-    def put_UtcMode(self, *args): return _chilkat.CkSFtp_put_UtcMode(self, *args)
-    def get_PreserveDate(self): return _chilkat.CkSFtp_get_PreserveDate(self)
-    def put_PreserveDate(self, *args): return _chilkat.CkSFtp_put_PreserveDate(self, *args)
-    def get_ClientIdentifier(self, *args): return _chilkat.CkSFtp_get_ClientIdentifier(self, *args)
-    def clientIdentifier(self): return _chilkat.CkSFtp_clientIdentifier(self)
-    def put_ClientIdentifier(self, *args): return _chilkat.CkSFtp_put_ClientIdentifier(self, *args)
-    def get_HostKeyFingerprint(self, *args): return _chilkat.CkSFtp_get_HostKeyFingerprint(self, *args)
-    def hostKeyFingerprint(self): return _chilkat.CkSFtp_hostKeyFingerprint(self)
-    def get_SocksHostname(self, *args): return _chilkat.CkSFtp_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSFtp_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSFtp_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSFtp_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSFtp_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSFtp_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSFtp_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSFtp_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSFtp_put_SocksPassword(self, *args)
-    def get_SocksPort(self): return _chilkat.CkSFtp_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSFtp_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSFtp_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSFtp_put_SocksVersion(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSFtp_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSFtp_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSFtp_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSFtp_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSFtp_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSFtp_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSFtp_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSFtp_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSFtp_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSFtp_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSFtp_put_HttpProxyPort(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSFtp_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSFtp_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSFtp_put_HttpProxyUsername(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSFtp_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSFtp_put_TcpNoDelay(self, *args)
-    def get_AccumulateBuffer(self, *args): return _chilkat.CkSFtp_get_AccumulateBuffer(self, *args)
-    def ClearAccumulateBuffer(self): return _chilkat.CkSFtp_ClearAccumulateBuffer(self)
-    def AccumulateBytes(self, *args): return _chilkat.CkSFtp_AccumulateBytes(self, *args)
-    def AuthenticatePwPk(self, *args): return _chilkat.CkSFtp_AuthenticatePwPk(self, *args)
-CkSFtp_swigregister = _chilkat.CkSFtp_swigregister
-CkSFtp_swigregister(CkSFtp)
-
-class CkSsh(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSsh, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSsh, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSsh()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSsh
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSsh_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSsh_put_Utf8(self, *args)
-    def Connect(self, *args): return _chilkat.CkSsh_Connect(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkSsh_UnlockComponent(self, *args)
-    def AuthenticatePw(self, *args): return _chilkat.CkSsh_AuthenticatePw(self, *args)
-    def get_Version(self, *args): return _chilkat.CkSsh_get_Version(self, *args)
-    def version(self): return _chilkat.CkSsh_version(self)
-    def get_KeepSessionLog(self): return _chilkat.CkSsh_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkSsh_put_KeepSessionLog(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkSsh_get_SessionLog(self, *args)
-    def sessionLog(self): return _chilkat.CkSsh_sessionLog(self)
-    def get_IdleTimeoutMs(self): return _chilkat.CkSsh_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkSsh_put_IdleTimeoutMs(self, *args)
-    def get_ConnectTimeoutMs(self): return _chilkat.CkSsh_get_ConnectTimeoutMs(self)
-    def put_ConnectTimeoutMs(self, *args): return _chilkat.CkSsh_put_ConnectTimeoutMs(self, *args)
-    def get_ChannelOpenFailCode(self): return _chilkat.CkSsh_get_ChannelOpenFailCode(self)
-    def get_DisconnectCode(self): return _chilkat.CkSsh_get_DisconnectCode(self)
-    def get_DisconnectReason(self, *args): return _chilkat.CkSsh_get_DisconnectReason(self, *args)
-    def disconnectReason(self): return _chilkat.CkSsh_disconnectReason(self)
-    def get_ChannelOpenFailReason(self, *args): return _chilkat.CkSsh_get_ChannelOpenFailReason(self, *args)
-    def channelOpenFailReason(self): return _chilkat.CkSsh_channelOpenFailReason(self)
-    def get_MaxPacketSize(self): return _chilkat.CkSsh_get_MaxPacketSize(self)
-    def put_MaxPacketSize(self, *args): return _chilkat.CkSsh_put_MaxPacketSize(self, *args)
-    def Disconnect(self): return _chilkat.CkSsh_Disconnect(self)
-    def OpenSessionChannel(self): return _chilkat.CkSsh_OpenSessionChannel(self)
-    def OpenCustomChannel(self, *args): return _chilkat.CkSsh_OpenCustomChannel(self, *args)
-    def get_NumOpenChannels(self): return _chilkat.CkSsh_get_NumOpenChannels(self)
-    def GetChannelNumber(self, *args): return _chilkat.CkSsh_GetChannelNumber(self, *args)
-    def GetChannelType(self, *args): return _chilkat.CkSsh_GetChannelType(self, *args)
-    def getChannelType(self, *args): return _chilkat.CkSsh_getChannelType(self, *args)
-    def SendReqPty(self, *args): return _chilkat.CkSsh_SendReqPty(self, *args)
-    def SendReqX11Forwarding(self, *args): return _chilkat.CkSsh_SendReqX11Forwarding(self, *args)
-    def SendReqSetEnv(self, *args): return _chilkat.CkSsh_SendReqSetEnv(self, *args)
-    def SendReqShell(self, *args): return _chilkat.CkSsh_SendReqShell(self, *args)
-    def SendReqExec(self, *args): return _chilkat.CkSsh_SendReqExec(self, *args)
-    def SendReqSubsystem(self, *args): return _chilkat.CkSsh_SendReqSubsystem(self, *args)
-    def SendReqWindowChange(self, *args): return _chilkat.CkSsh_SendReqWindowChange(self, *args)
-    def SendReqXonXoff(self, *args): return _chilkat.CkSsh_SendReqXonXoff(self, *args)
-    def SendReqSignal(self, *args): return _chilkat.CkSsh_SendReqSignal(self, *args)
-    def ChannelSendData(self, *args): return _chilkat.CkSsh_ChannelSendData(self, *args)
-    def ChannelSendString(self, *args): return _chilkat.CkSsh_ChannelSendString(self, *args)
-    def ChannelPoll(self, *args): return _chilkat.CkSsh_ChannelPoll(self, *args)
-    def ChannelReadAndPoll(self, *args): return _chilkat.CkSsh_ChannelReadAndPoll(self, *args)
-    def ChannelRead(self, *args): return _chilkat.CkSsh_ChannelRead(self, *args)
-    def GetReceivedData(self, *args): return _chilkat.CkSsh_GetReceivedData(self, *args)
-    def GetReceivedStderr(self, *args): return _chilkat.CkSsh_GetReceivedStderr(self, *args)
-    def ChannelReceivedEof(self, *args): return _chilkat.CkSsh_ChannelReceivedEof(self, *args)
-    def ChannelReceivedClose(self, *args): return _chilkat.CkSsh_ChannelReceivedClose(self, *args)
-    def ChannelSendClose(self, *args): return _chilkat.CkSsh_ChannelSendClose(self, *args)
-    def ChannelSendEof(self, *args): return _chilkat.CkSsh_ChannelSendEof(self, *args)
-    def ChannelIsOpen(self, *args): return _chilkat.CkSsh_ChannelIsOpen(self, *args)
-    def ChannelReceiveToClose(self, *args): return _chilkat.CkSsh_ChannelReceiveToClose(self, *args)
-    def ClearTtyModes(self): return _chilkat.CkSsh_ClearTtyModes(self)
-    def SetTtyMode(self, *args): return _chilkat.CkSsh_SetTtyMode(self, *args)
-    def get_IsConnected(self): return _chilkat.CkSsh_get_IsConnected(self)
-    def ReKey(self): return _chilkat.CkSsh_ReKey(self)
-    def AuthenticatePk(self, *args): return _chilkat.CkSsh_AuthenticatePk(self, *args)
-    def GetReceivedText(self, *args): return _chilkat.CkSsh_GetReceivedText(self, *args)
-    def getReceivedText(self, *args): return _chilkat.CkSsh_getReceivedText(self, *args)
-    def GetReceivedNumBytes(self, *args): return _chilkat.CkSsh_GetReceivedNumBytes(self, *args)
-    def ChannelReceiveUntilMatch(self, *args): return _chilkat.CkSsh_ChannelReceiveUntilMatch(self, *args)
-    def SendIgnore(self): return _chilkat.CkSsh_SendIgnore(self)
-    def OpenDirectTcpIpChannel(self, *args): return _chilkat.CkSsh_OpenDirectTcpIpChannel(self, *args)
-    def GetReceivedTextS(self, *args): return _chilkat.CkSsh_GetReceivedTextS(self, *args)
-    def getReceivedTextS(self, *args): return _chilkat.CkSsh_getReceivedTextS(self, *args)
-    def GetReceivedDataN(self, *args): return _chilkat.CkSsh_GetReceivedDataN(self, *args)
-    def PeekReceivedText(self, *args): return _chilkat.CkSsh_PeekReceivedText(self, *args)
-    def peekReceivedText(self, *args): return _chilkat.CkSsh_peekReceivedText(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkSsh_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkSsh_put_HeartbeatMs(self, *args)
-    def ChannelReceivedExitStatus(self, *args): return _chilkat.CkSsh_ChannelReceivedExitStatus(self, *args)
-    def GetChannelExitStatus(self, *args): return _chilkat.CkSsh_GetChannelExitStatus(self, *args)
-    def get_ClientIdentifier(self, *args): return _chilkat.CkSsh_get_ClientIdentifier(self, *args)
-    def clientIdentifier(self): return _chilkat.CkSsh_clientIdentifier(self)
-    def put_ClientIdentifier(self, *args): return _chilkat.CkSsh_put_ClientIdentifier(self, *args)
-    def get_ReadTimeoutMs(self): return _chilkat.CkSsh_get_ReadTimeoutMs(self)
-    def put_ReadTimeoutMs(self, *args): return _chilkat.CkSsh_put_ReadTimeoutMs(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSsh_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSsh_put_TcpNoDelay(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkSsh_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSsh_put_VerboseLogging(self, *args)
-    def get_HostKeyFingerprint(self, *args): return _chilkat.CkSsh_get_HostKeyFingerprint(self, *args)
-    def hostKeyFingerprint(self): return _chilkat.CkSsh_hostKeyFingerprint(self)
-    def get_SocksVersion(self): return _chilkat.CkSsh_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSsh_put_SocksVersion(self, *args)
-    def get_SocksPort(self): return _chilkat.CkSsh_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSsh_put_SocksPort(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkSsh_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSsh_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSsh_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSsh_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSsh_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSsh_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSsh_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSsh_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSsh_put_SocksPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSsh_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSsh_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSsh_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSsh_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSsh_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSsh_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSsh_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSsh_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSsh_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSsh_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSsh_put_HttpProxyPort(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSsh_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSsh_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSsh_put_HttpProxyUsername(self, *args)
-    def ChannelReceiveUntilMatchN(self, *args): return _chilkat.CkSsh_ChannelReceiveUntilMatchN(self, *args)
-    def ChannelReadAndPoll2(self, *args): return _chilkat.CkSsh_ChannelReadAndPoll2(self, *args)
-    def AuthenticatePwPk(self, *args): return _chilkat.CkSsh_AuthenticatePwPk(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSsh_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSsh_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSsh_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSsh_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSsh_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSsh_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSsh_lastErrorHtml(self)
-CkSsh_swigregister = _chilkat.CkSsh_swigregister
-CkSsh_swigregister(CkSsh)
-
-class CkSshKey(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSshKey, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSshKey, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSshKey()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSshKey
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSshKey_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSshKey_put_Utf8(self, *args)
-    def get_IsRsaKey(self): return _chilkat.CkSshKey_get_IsRsaKey(self)
-    def get_IsDsaKey(self): return _chilkat.CkSshKey_get_IsDsaKey(self)
-    def get_IsPrivateKey(self): return _chilkat.CkSshKey_get_IsPrivateKey(self)
-    def get_Password(self, *args): return _chilkat.CkSshKey_get_Password(self, *args)
-    def password(self): return _chilkat.CkSshKey_password(self)
-    def put_Password(self, *args): return _chilkat.CkSshKey_put_Password(self, *args)
-    def get_Comment(self, *args): return _chilkat.CkSshKey_get_Comment(self, *args)
-    def comment(self): return _chilkat.CkSshKey_comment(self)
-    def put_Comment(self, *args): return _chilkat.CkSshKey_put_Comment(self, *args)
-    def GenFingerprint(self, *args): return _chilkat.CkSshKey_GenFingerprint(self, *args)
-    def genFingerprint(self): return _chilkat.CkSshKey_genFingerprint(self)
-    def ToXml(self, *args): return _chilkat.CkSshKey_ToXml(self, *args)
-    def toXml(self): return _chilkat.CkSshKey_toXml(self)
-    def ToRfc4716PublicKey(self, *args): return _chilkat.CkSshKey_ToRfc4716PublicKey(self, *args)
-    def toRfc4716PublicKey(self): return _chilkat.CkSshKey_toRfc4716PublicKey(self)
-    def ToOpenSshPublicKey(self, *args): return _chilkat.CkSshKey_ToOpenSshPublicKey(self, *args)
-    def toOpenSshPublicKey(self): return _chilkat.CkSshKey_toOpenSshPublicKey(self)
-    def FromXml(self, *args): return _chilkat.CkSshKey_FromXml(self, *args)
-    def FromRfc4716PublicKey(self, *args): return _chilkat.CkSshKey_FromRfc4716PublicKey(self, *args)
-    def FromOpenSshPublicKey(self, *args): return _chilkat.CkSshKey_FromOpenSshPublicKey(self, *args)
-    def FromPuttyPrivateKey(self, *args): return _chilkat.CkSshKey_FromPuttyPrivateKey(self, *args)
-    def FromOpenSshPrivateKey(self, *args): return _chilkat.CkSshKey_FromOpenSshPrivateKey(self, *args)
-    def GenerateRsaKey(self, *args): return _chilkat.CkSshKey_GenerateRsaKey(self, *args)
-    def GenerateDsaKey(self, *args): return _chilkat.CkSshKey_GenerateDsaKey(self, *args)
-    def SaveText(self, *args): return _chilkat.CkSshKey_SaveText(self, *args)
-    def LoadText(self, *args): return _chilkat.CkSshKey_LoadText(self, *args)
-    def loadText(self, *args): return _chilkat.CkSshKey_loadText(self, *args)
-    def ToOpenSshPrivateKey(self, *args): return _chilkat.CkSshKey_ToOpenSshPrivateKey(self, *args)
-    def toOpenSshPrivateKey(self, *args): return _chilkat.CkSshKey_toOpenSshPrivateKey(self, *args)
-    def ToPuttyPrivateKey(self, *args): return _chilkat.CkSshKey_ToPuttyPrivateKey(self, *args)
-    def toPuttyPrivateKey(self, *args): return _chilkat.CkSshKey_toPuttyPrivateKey(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSshKey_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSshKey_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSshKey_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSshKey_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSshKey_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSshKey_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSshKey_lastErrorHtml(self)
-CkSshKey_swigregister = _chilkat.CkSshKey_swigregister
-CkSshKey_swigregister(CkSshKey)
-
-class CkIcon(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkIcon, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkIcon, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkIcon()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkIcon
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkIcon_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkIcon_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkIcon_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkIcon_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkIcon_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkIcon_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkIcon_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkIcon_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkIcon_lastErrorHtml(self)
-CkIcon_swigregister = _chilkat.CkIcon_swigregister
-CkIcon_swigregister(CkIcon)
-
-class CkService(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkService, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkService, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkService()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkService
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkService_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkService_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkService_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkService_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkService_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkService_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkService_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkService_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkService_lastErrorHtml(self)
-    def Install(self): return _chilkat.CkService_Install(self)
-    def Uninstall(self): return _chilkat.CkService_Uninstall(self)
-    def Start(self): return _chilkat.CkService_Start(self)
-    def Stop(self): return _chilkat.CkService_Stop(self)
-    def get_ServiceName(self, *args): return _chilkat.CkService_get_ServiceName(self, *args)
-    def serviceName(self): return _chilkat.CkService_serviceName(self)
-    def put_ServiceName(self, *args): return _chilkat.CkService_put_ServiceName(self, *args)
-    def get_DisplayName(self, *args): return _chilkat.CkService_get_DisplayName(self, *args)
-    def displayName(self): return _chilkat.CkService_displayName(self)
-    def put_DisplayName(self, *args): return _chilkat.CkService_put_DisplayName(self, *args)
-    def get_ExeFilename(self, *args): return _chilkat.CkService_get_ExeFilename(self, *args)
-    def exeFilename(self): return _chilkat.CkService_exeFilename(self)
-    def put_ExeFilename(self, *args): return _chilkat.CkService_put_ExeFilename(self, *args)
-    def get_AutoStart(self): return _chilkat.CkService_get_AutoStart(self)
-    def put_AutoStart(self, *args): return _chilkat.CkService_put_AutoStart(self, *args)
-    def SetAutoStart(self): return _chilkat.CkService_SetAutoStart(self)
-    def SetDemandStart(self): return _chilkat.CkService_SetDemandStart(self)
-    def Disable(self): return _chilkat.CkService_Disable(self)
-    def IsAutoStart(self): return _chilkat.CkService_IsAutoStart(self)
-    def IsDemandStart(self): return _chilkat.CkService_IsDemandStart(self)
-    def IsDisabled(self): return _chilkat.CkService_IsDisabled(self)
-    def IsInstalled(self): return _chilkat.CkService_IsInstalled(self)
-    def IsRunning(self): return _chilkat.CkService_IsRunning(self)
-CkService_swigregister = _chilkat.CkService_swigregister
-CkService_swigregister(CkService)
-
-class CkCompression(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCompression, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCompression, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCompression()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCompression
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCompression_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCompression_put_Utf8(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkCompression_get_Charset(self, *args)
-    def charset(self): return _chilkat.CkCompression_charset(self)
-    def put_Charset(self, *args): return _chilkat.CkCompression_put_Charset(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkCompression_get_EncodingMode(self, *args)
-    def encodingMode(self): return _chilkat.CkCompression_encodingMode(self)
-    def put_EncodingMode(self, *args): return _chilkat.CkCompression_put_EncodingMode(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkCompression_UnlockComponent(self, *args)
-    def get_Algorithm(self, *args): return _chilkat.CkCompression_get_Algorithm(self, *args)
-    def algorithm(self): return _chilkat.CkCompression_algorithm(self)
-    def put_Algorithm(self, *args): return _chilkat.CkCompression_put_Algorithm(self, *args)
-    def BeginCompressBytes(self, *args): return _chilkat.CkCompression_BeginCompressBytes(self, *args)
-    def BeginCompressBytesENC(self, *args): return _chilkat.CkCompression_BeginCompressBytesENC(self, *args)
-    def beginCompressBytesENC(self, *args): return _chilkat.CkCompression_beginCompressBytesENC(self, *args)
-    def BeginCompressString(self, *args): return _chilkat.CkCompression_BeginCompressString(self, *args)
-    def BeginCompressStringENC(self, *args): return _chilkat.CkCompression_BeginCompressStringENC(self, *args)
-    def beginCompressStringENC(self, *args): return _chilkat.CkCompression_beginCompressStringENC(self, *args)
-    def BeginDecompressBytes(self, *args): return _chilkat.CkCompression_BeginDecompressBytes(self, *args)
-    def BeginDecompressBytesENC(self, *args): return _chilkat.CkCompression_BeginDecompressBytesENC(self, *args)
-    def BeginDecompressString(self, *args): return _chilkat.CkCompression_BeginDecompressString(self, *args)
-    def beginDecompressString(self, *args): return _chilkat.CkCompression_beginDecompressString(self, *args)
-    def BeginDecompressStringENC(self, *args): return _chilkat.CkCompression_BeginDecompressStringENC(self, *args)
-    def beginDecompressStringENC(self, *args): return _chilkat.CkCompression_beginDecompressStringENC(self, *args)
-    def CompressBytes(self, *args): return _chilkat.CkCompression_CompressBytes(self, *args)
-    def CompressBytesENC(self, *args): return _chilkat.CkCompression_CompressBytesENC(self, *args)
-    def compressBytesENC(self, *args): return _chilkat.CkCompression_compressBytesENC(self, *args)
-    def CompressFile(self, *args): return _chilkat.CkCompression_CompressFile(self, *args)
-    def CompressString(self, *args): return _chilkat.CkCompression_CompressString(self, *args)
-    def CompressStringENC(self, *args): return _chilkat.CkCompression_CompressStringENC(self, *args)
-    def compressStringENC(self, *args): return _chilkat.CkCompression_compressStringENC(self, *args)
-    def DecompressBytes(self, *args): return _chilkat.CkCompression_DecompressBytes(self, *args)
-    def DecompressBytesENC(self, *args): return _chilkat.CkCompression_DecompressBytesENC(self, *args)
-    def DecompressFile(self, *args): return _chilkat.CkCompression_DecompressFile(self, *args)
-    def DecompressString(self, *args): return _chilkat.CkCompression_DecompressString(self, *args)
-    def decompressString(self, *args): return _chilkat.CkCompression_decompressString(self, *args)
-    def DecompressStringENC(self, *args): return _chilkat.CkCompression_DecompressStringENC(self, *args)
-    def decompressStringENC(self, *args): return _chilkat.CkCompression_decompressStringENC(self, *args)
-    def EndCompressBytes(self, *args): return _chilkat.CkCompression_EndCompressBytes(self, *args)
-    def EndCompressBytesENC(self, *args): return _chilkat.CkCompression_EndCompressBytesENC(self, *args)
-    def endCompressBytesENC(self): return _chilkat.CkCompression_endCompressBytesENC(self)
-    def EndCompressString(self, *args): return _chilkat.CkCompression_EndCompressString(self, *args)
-    def EndCompressStringENC(self, *args): return _chilkat.CkCompression_EndCompressStringENC(self, *args)
-    def endCompressStringENC(self): return _chilkat.CkCompression_endCompressStringENC(self)
-    def EndDecompressBytes(self, *args): return _chilkat.CkCompression_EndDecompressBytes(self, *args)
-    def EndDecompressBytesENC(self, *args): return _chilkat.CkCompression_EndDecompressBytesENC(self, *args)
-    def EndDecompressString(self, *args): return _chilkat.CkCompression_EndDecompressString(self, *args)
-    def endDecompressString(self): return _chilkat.CkCompression_endDecompressString(self)
-    def EndDecompressStringENC(self, *args): return _chilkat.CkCompression_EndDecompressStringENC(self, *args)
-    def endDecompressStringENC(self): return _chilkat.CkCompression_endDecompressStringENC(self)
-    def MoreCompressBytes(self, *args): return _chilkat.CkCompression_MoreCompressBytes(self, *args)
-    def MoreCompressBytesENC(self, *args): return _chilkat.CkCompression_MoreCompressBytesENC(self, *args)
-    def moreCompressBytesENC(self, *args): return _chilkat.CkCompression_moreCompressBytesENC(self, *args)
-    def MoreCompressString(self, *args): return _chilkat.CkCompression_MoreCompressString(self, *args)
-    def MoreCompressStringENC(self, *args): return _chilkat.CkCompression_MoreCompressStringENC(self, *args)
-    def moreCompressStringENC(self, *args): return _chilkat.CkCompression_moreCompressStringENC(self, *args)
-    def MoreDecompressBytes(self, *args): return _chilkat.CkCompression_MoreDecompressBytes(self, *args)
-    def MoreDecompressBytesENC(self, *args): return _chilkat.CkCompression_MoreDecompressBytesENC(self, *args)
-    def MoreDecompressString(self, *args): return _chilkat.CkCompression_MoreDecompressString(self, *args)
-    def moreDecompressString(self, *args): return _chilkat.CkCompression_moreDecompressString(self, *args)
-    def MoreDecompressStringENC(self, *args): return _chilkat.CkCompression_MoreDecompressStringENC(self, *args)
-    def moreDecompressStringENC(self, *args): return _chilkat.CkCompression_moreDecompressStringENC(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCompression_get_Version(self, *args)
-    def version(self): return _chilkat.CkCompression_version(self)
-    def SaveLastError(self, *args): return _chilkat.CkCompression_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCompression_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCompression_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCompression_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCompression_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCompression_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCompression_lastErrorHtml(self)
-CkCompression_swigregister = _chilkat.CkCompression_swigregister
-CkCompression_swigregister(CkCompression)
-
-class CkBz2(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkBz2, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkBz2, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkBz2()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkBz2
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkBz2_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkBz2_put_Utf8(self, *args)
-    def UncompressFile(self, *args): return _chilkat.CkBz2_UncompressFile(self, *args)
-    def CompressFile(self, *args): return _chilkat.CkBz2_CompressFile(self, *args)
-    def UncompressFileToMem(self, *args): return _chilkat.CkBz2_UncompressFileToMem(self, *args)
-    def CompressFileToMem(self, *args): return _chilkat.CkBz2_CompressFileToMem(self, *args)
-    def CompressMemToFile(self, *args): return _chilkat.CkBz2_CompressMemToFile(self, *args)
-    def UncompressMemToFile(self, *args): return _chilkat.CkBz2_UncompressMemToFile(self, *args)
-    def CompressMemory(self, *args): return _chilkat.CkBz2_CompressMemory(self, *args)
-    def UncompressMemory(self, *args): return _chilkat.CkBz2_UncompressMemory(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkBz2_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkBz2_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkBz2_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkBz2_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkBz2_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkBz2_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkBz2_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkBz2_lastErrorHtml(self)
-CkBz2_swigregister = _chilkat.CkBz2_swigregister
-CkBz2_swigregister(CkBz2)
-
-class CkCgi(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCgi, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCgi, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCgi()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCgi
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCgi_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCgi_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCgi_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCgi_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCgi_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCgi_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCgi_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCgi_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCgi_lastErrorHtml(self)
-CkCgi_swigregister = _chilkat.CkCgi_swigregister
-CkCgi_swigregister(CkCgi)
-
-class CkHtmlToText(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHtmlToText, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHtmlToText, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHtmlToText()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHtmlToText
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkHtmlToText_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHtmlToText_put_Utf8(self, *args)
-    def IsUnlocked(self): return _chilkat.CkHtmlToText_IsUnlocked(self)
-    def ToText(self, *args): return _chilkat.CkHtmlToText_ToText(self, *args)
-    def toText(self, *args): return _chilkat.CkHtmlToText_toText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkHtmlToText_UnlockComponent(self, *args)
-    def WriteStringToFile(self, *args): return _chilkat.CkHtmlToText_WriteStringToFile(self, *args)
-    def ReadFileToString(self, *args): return _chilkat.CkHtmlToText_ReadFileToString(self, *args)
-    def readFileToString(self, *args): return _chilkat.CkHtmlToText_readFileToString(self, *args)
-    def get_RightMargin(self): return _chilkat.CkHtmlToText_get_RightMargin(self)
-    def put_RightMargin(self, *args): return _chilkat.CkHtmlToText_put_RightMargin(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkHtmlToText_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHtmlToText_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHtmlToText_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHtmlToText_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkHtmlToText_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHtmlToText_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHtmlToText_lastErrorHtml(self)
-CkHtmlToText_swigregister = _chilkat.CkHtmlToText_swigregister
-CkHtmlToText_swigregister(CkHtmlToText)
-
-class CkCsv(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCsv, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCsv, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCsv()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCsv
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCsv_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCsv_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCsv_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCsv_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCsv_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCsv_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCsv_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCsv_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCsv_lastErrorHtml(self)
-    def LoadFile(self, *args): return _chilkat.CkCsv_LoadFile(self, *args)
-    def SaveFile(self, *args): return _chilkat.CkCsv_SaveFile(self, *args)
-    def SaveFile2(self, *args): return _chilkat.CkCsv_SaveFile2(self, *args)
-    def LoadFile2(self, *args): return _chilkat.CkCsv_LoadFile2(self, *args)
-    def GetCell(self, *args): return _chilkat.CkCsv_GetCell(self, *args)
-    def getCell(self, *args): return _chilkat.CkCsv_getCell(self, *args)
-    def get_NumRows(self): return _chilkat.CkCsv_get_NumRows(self)
-    def SetCell(self, *args): return _chilkat.CkCsv_SetCell(self, *args)
-    def GetNumCols(self, *args): return _chilkat.CkCsv_GetNumCols(self, *args)
-    def get_Delimiter(self, *args): return _chilkat.CkCsv_get_Delimiter(self, *args)
-    def delimiter(self): return _chilkat.CkCsv_delimiter(self)
-    def put_Delimiter(self, *args): return _chilkat.CkCsv_put_Delimiter(self, *args)
-    def get_Crlf(self): return _chilkat.CkCsv_get_Crlf(self)
-    def put_Crlf(self, *args): return _chilkat.CkCsv_put_Crlf(self, *args)
-    def get_HasColumnNames(self): return _chilkat.CkCsv_get_HasColumnNames(self)
-    def put_HasColumnNames(self, *args): return _chilkat.CkCsv_put_HasColumnNames(self, *args)
-    def get_NumColumns(self): return _chilkat.CkCsv_get_NumColumns(self)
-    def GetIndex(self, *args): return _chilkat.CkCsv_GetIndex(self, *args)
-    def GetColumnName(self, *args): return _chilkat.CkCsv_GetColumnName(self, *args)
-    def getColumnName(self, *args): return _chilkat.CkCsv_getColumnName(self, *args)
-    def LoadFromString(self, *args): return _chilkat.CkCsv_LoadFromString(self, *args)
-    def SaveToString(self, *args): return _chilkat.CkCsv_SaveToString(self, *args)
-    def saveToString(self): return _chilkat.CkCsv_saveToString(self)
-    def SetColumnName(self, *args): return _chilkat.CkCsv_SetColumnName(self, *args)
-CkCsv_swigregister = _chilkat.CkCsv_swigregister
-CkCsv_swigregister(CkCsv)
-
-class CkTar(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkTar, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkTar, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkTar()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkTar
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkTar_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkTar_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkTar_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkTar_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkTar_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkTar_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkTar_get_Version(self, *args)
-    def lastErrorText(self): return _chilkat.CkTar_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkTar_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkTar_lastErrorHtml(self)
-    def version(self): return _chilkat.CkTar_version(self)
-    def get_NoAbsolutePaths(self): return _chilkat.CkTar_get_NoAbsolutePaths(self)
-    def put_NoAbsolutePaths(self, *args): return _chilkat.CkTar_put_NoAbsolutePaths(self, *args)
-    def get_UntarCaseSensitive(self): return _chilkat.CkTar_get_UntarCaseSensitive(self)
-    def put_UntarCaseSensitive(self, *args): return _chilkat.CkTar_put_UntarCaseSensitive(self, *args)
-    def get_UntarDebugLog(self): return _chilkat.CkTar_get_UntarDebugLog(self)
-    def put_UntarDebugLog(self, *args): return _chilkat.CkTar_put_UntarDebugLog(self, *args)
-    def get_UntarDiscardPaths(self): return _chilkat.CkTar_get_UntarDiscardPaths(self)
-    def put_UntarDiscardPaths(self, *args): return _chilkat.CkTar_put_UntarDiscardPaths(self, *args)
-    def get_UntarFromDir(self, *args): return _chilkat.CkTar_get_UntarFromDir(self, *args)
-    def untarFromDir(self): return _chilkat.CkTar_untarFromDir(self)
-    def put_UntarFromDir(self, *args): return _chilkat.CkTar_put_UntarFromDir(self, *args)
-    def get_UntarMatchPattern(self, *args): return _chilkat.CkTar_get_UntarMatchPattern(self, *args)
-    def untarMatchPattern(self): return _chilkat.CkTar_untarMatchPattern(self)
-    def put_UntarMatchPattern(self, *args): return _chilkat.CkTar_put_UntarMatchPattern(self, *args)
-    def get_UntarMaxCount(self): return _chilkat.CkTar_get_UntarMaxCount(self)
-    def put_UntarMaxCount(self, *args): return _chilkat.CkTar_put_UntarMaxCount(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkTar_UnlockComponent(self, *args)
-    def Untar(self, *args): return _chilkat.CkTar_Untar(self, *args)
-    def UntarFromMemory(self, *args): return _chilkat.CkTar_UntarFromMemory(self, *args)
-    def UntarFirstMatchingToMemory(self, *args): return _chilkat.CkTar_UntarFirstMatchingToMemory(self, *args)
-    def AddDirRoot(self, *args): return _chilkat.CkTar_AddDirRoot(self, *args)
-    def get_NumDirRoots(self): return _chilkat.CkTar_get_NumDirRoots(self)
-    def GetDirRoot(self, *args): return _chilkat.CkTar_GetDirRoot(self, *args)
-    def getDirRoot(self, *args): return _chilkat.CkTar_getDirRoot(self, *args)
-    def WriteTar(self, *args): return _chilkat.CkTar_WriteTar(self, *args)
-    def WriteTarGz(self, *args): return _chilkat.CkTar_WriteTarGz(self, *args)
-    def WriteTarBz2(self, *args): return _chilkat.CkTar_WriteTarBz2(self, *args)
-    def WriteTarZ(self, *args): return _chilkat.CkTar_WriteTarZ(self, *args)
-    def ListXml(self, *args): return _chilkat.CkTar_ListXml(self, *args)
-    def listXml(self, *args): return _chilkat.CkTar_listXml(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkTar_get_Charset(self, *args)
-    def charset(self): return _chilkat.CkTar_charset(self)
-    def put_Charset(self, *args): return _chilkat.CkTar_put_Charset(self, *args)
-    def UntarZ(self, *args): return _chilkat.CkTar_UntarZ(self, *args)
-    def UntarGz(self, *args): return _chilkat.CkTar_UntarGz(self, *args)
-    def UntarBz2(self, *args): return _chilkat.CkTar_UntarBz2(self, *args)
-    def get_UserName(self, *args): return _chilkat.CkTar_get_UserName(self, *args)
-    def userName(self): return _chilkat.CkTar_userName(self)
-    def put_UserName(self, *args): return _chilkat.CkTar_put_UserName(self, *args)
-    def get_GroupName(self, *args): return _chilkat.CkTar_get_GroupName(self, *args)
-    def groupName(self): return _chilkat.CkTar_groupName(self)
-    def put_GroupName(self, *args): return _chilkat.CkTar_put_GroupName(self, *args)
-    def get_UserId(self): return _chilkat.CkTar_get_UserId(self)
-    def put_UserId(self, *args): return _chilkat.CkTar_put_UserId(self, *args)
-    def get_GroupId(self): return _chilkat.CkTar_get_GroupId(self)
-    def put_GroupId(self, *args): return _chilkat.CkTar_put_GroupId(self, *args)
-    def get_DirMode(self): return _chilkat.CkTar_get_DirMode(self)
-    def put_DirMode(self, *args): return _chilkat.CkTar_put_DirMode(self, *args)
-    def get_FileMode(self): return _chilkat.CkTar_get_FileMode(self)
-    def put_FileMode(self, *args): return _chilkat.CkTar_put_FileMode(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkTar_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkTar_put_VerboseLogging(self, *args)
-    def get_WriteFormat(self, *args): return _chilkat.CkTar_get_WriteFormat(self, *args)
-    def writeFormat(self): return _chilkat.CkTar_writeFormat(self)
-    def put_WriteFormat(self, *args): return _chilkat.CkTar_put_WriteFormat(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkTar_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkTar_put_HeartbeatMs(self, *args)
-CkTar_swigregister = _chilkat.CkTar_swigregister
-CkTar_swigregister(CkTar)
-
-class CkSocksProxy(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSocksProxy, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSocksProxy, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSocksProxy()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSocksProxy
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSocksProxy_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSocksProxy_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSocksProxy_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSocksProxy_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSocksProxy_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSocksProxy_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSocksProxy_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSocksProxy_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSocksProxy_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkSocksProxy_UnlockComponent(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSocksProxy_get_SocksVersion(self)
-    def get_AuthenticatedSocks5(self): return _chilkat.CkSocksProxy_get_AuthenticatedSocks5(self)
-    def get_ConnectionPending(self): return _chilkat.CkSocksProxy_get_ConnectionPending(self)
-    def get_ClientPort(self): return _chilkat.CkSocksProxy_get_ClientPort(self)
-    def get_ServerPort(self): return _chilkat.CkSocksProxy_get_ServerPort(self)
-    def get_ClientIp(self, *args): return _chilkat.CkSocksProxy_get_ClientIp(self, *args)
-    def clientIp(self): return _chilkat.CkSocksProxy_clientIp(self)
-    def get_ServerIp(self, *args): return _chilkat.CkSocksProxy_get_ServerIp(self, *args)
-    def serverIp(self): return _chilkat.CkSocksProxy_serverIp(self)
-    def get_Login(self, *args): return _chilkat.CkSocksProxy_get_Login(self, *args)
-    def login(self): return _chilkat.CkSocksProxy_login(self)
-    def get_Password(self, *args): return _chilkat.CkSocksProxy_get_Password(self, *args)
-    def password(self): return _chilkat.CkSocksProxy_password(self)
-    def Initialize(self, *args): return _chilkat.CkSocksProxy_Initialize(self, *args)
-    def WaitForConnection(self, *args): return _chilkat.CkSocksProxy_WaitForConnection(self, *args)
-    def AllowConnection(self): return _chilkat.CkSocksProxy_AllowConnection(self)
-    def ProceedSocks5(self): return _chilkat.CkSocksProxy_ProceedSocks5(self)
-    def RejectConnection(self): return _chilkat.CkSocksProxy_RejectConnection(self)
-    def get_AllowUnauthenticatedSocks5(self): return _chilkat.CkSocksProxy_get_AllowUnauthenticatedSocks5(self)
-    def put_AllowUnauthenticatedSocks5(self, *args): return _chilkat.CkSocksProxy_put_AllowUnauthenticatedSocks5(self, *args)
-    def get_ListenBindIpAddress(self, *args): return _chilkat.CkSocksProxy_get_ListenBindIpAddress(self, *args)
-    def listenBindIpAddress(self): return _chilkat.CkSocksProxy_listenBindIpAddress(self)
-    def put_ListenBindIpAddress(self, *args): return _chilkat.CkSocksProxy_put_ListenBindIpAddress(self, *args)
-    def get_OutboundBindIpAddress(self, *args): return _chilkat.CkSocksProxy_get_OutboundBindIpAddress(self, *args)
-    def outboundBindIpAddress(self): return _chilkat.CkSocksProxy_outboundBindIpAddress(self)
-    def put_OutboundBindIpAddress(self, *args): return _chilkat.CkSocksProxy_put_OutboundBindIpAddress(self, *args)
-    def get_OutboundBindPort(self): return _chilkat.CkSocksProxy_get_OutboundBindPort(self)
-    def put_OutboundBindPort(self, *args): return _chilkat.CkSocksProxy_put_OutboundBindPort(self, *args)
-    def GetTunnelsXml(self, *args): return _chilkat.CkSocksProxy_GetTunnelsXml(self, *args)
-    def getTunnelsXml(self): return _chilkat.CkSocksProxy_getTunnelsXml(self)
-    def StopAllTunnels(self, *args): return _chilkat.CkSocksProxy_StopAllTunnels(self, *args)
-CkSocksProxy_swigregister = _chilkat.CkSocksProxy_swigregister
-CkSocksProxy_swigregister(CkSocksProxy)
-
-class CkSshTunnel(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSshTunnel, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSshTunnel, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSshTunnel()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSshTunnel
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSshTunnel_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSshTunnel_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSshTunnel_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSshTunnel_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSshTunnel_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSshTunnel_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSshTunnel_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSshTunnel_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSshTunnel_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkSshTunnel_UnlockComponent(self, *args)
-    def get_SshLogin(self, *args): return _chilkat.CkSshTunnel_get_SshLogin(self, *args)
-    def sshLogin(self): return _chilkat.CkSshTunnel_sshLogin(self)
-    def put_SshLogin(self, *args): return _chilkat.CkSshTunnel_put_SshLogin(self, *args)
-    def get_SshPassword(self, *args): return _chilkat.CkSshTunnel_get_SshPassword(self, *args)
-    def sshPassword(self): return _chilkat.CkSshTunnel_sshPassword(self)
-    def put_SshPassword(self, *args): return _chilkat.CkSshTunnel_put_SshPassword(self, *args)
-    def get_ConnectLog(self, *args): return _chilkat.CkSshTunnel_get_ConnectLog(self, *args)
-    def connectLog(self): return _chilkat.CkSshTunnel_connectLog(self)
-    def put_ConnectLog(self, *args): return _chilkat.CkSshTunnel_put_ConnectLog(self, *args)
-    def get_DestHostname(self, *args): return _chilkat.CkSshTunnel_get_DestHostname(self, *args)
-    def destHostname(self): return _chilkat.CkSshTunnel_destHostname(self)
-    def put_DestHostname(self, *args): return _chilkat.CkSshTunnel_put_DestHostname(self, *args)
-    def get_SshHostname(self, *args): return _chilkat.CkSshTunnel_get_SshHostname(self, *args)
-    def sshHostname(self): return _chilkat.CkSshTunnel_sshHostname(self)
-    def put_SshHostname(self, *args): return _chilkat.CkSshTunnel_put_SshHostname(self, *args)
-    def get_SshPort(self): return _chilkat.CkSshTunnel_get_SshPort(self)
-    def put_SshPort(self, *args): return _chilkat.CkSshTunnel_put_SshPort(self, *args)
-    def get_DestPort(self): return _chilkat.CkSshTunnel_get_DestPort(self)
-    def put_DestPort(self, *args): return _chilkat.CkSshTunnel_put_DestPort(self, *args)
-    def get_IsAccepting(self): return _chilkat.CkSshTunnel_get_IsAccepting(self)
-    def StopAllTunnels(self, *args): return _chilkat.CkSshTunnel_StopAllTunnels(self, *args)
-    def GetTunnelsXml(self, *args): return _chilkat.CkSshTunnel_GetTunnelsXml(self, *args)
-    def getTunnelsXml(self): return _chilkat.CkSshTunnel_getTunnelsXml(self)
-    def StopAccepting(self): return _chilkat.CkSshTunnel_StopAccepting(self)
-    def BeginAccepting(self, *args): return _chilkat.CkSshTunnel_BeginAccepting(self, *args)
-    def SetSshAuthenticationKey(self, *args): return _chilkat.CkSshTunnel_SetSshAuthenticationKey(self, *args)
-    def get_ListenBindIpAddress(self, *args): return _chilkat.CkSshTunnel_get_ListenBindIpAddress(self, *args)
-    def listenBindIpAddress(self): return _chilkat.CkSshTunnel_listenBindIpAddress(self)
-    def put_ListenBindIpAddress(self, *args): return _chilkat.CkSshTunnel_put_ListenBindIpAddress(self, *args)
-    def get_OutboundBindIpAddress(self, *args): return _chilkat.CkSshTunnel_get_OutboundBindIpAddress(self, *args)
-    def outboundBindIpAddress(self): return _chilkat.CkSshTunnel_outboundBindIpAddress(self)
-    def put_OutboundBindIpAddress(self, *args): return _chilkat.CkSshTunnel_put_OutboundBindIpAddress(self, *args)
-    def get_OutboundBindPort(self): return _chilkat.CkSshTunnel_get_OutboundBindPort(self)
-    def put_OutboundBindPort(self, *args): return _chilkat.CkSshTunnel_put_OutboundBindPort(self, *args)
-    def get_MaxPacketSize(self): return _chilkat.CkSshTunnel_get_MaxPacketSize(self)
-    def put_MaxPacketSize(self, *args): return _chilkat.CkSshTunnel_put_MaxPacketSize(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSshTunnel_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSshTunnel_put_TcpNoDelay(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSshTunnel_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSshTunnel_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSshTunnel_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSshTunnel_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSshTunnel_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyPort(self, *args)
-    def get_SocksPort(self): return _chilkat.CkSshTunnel_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSshTunnel_put_SocksPort(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkSshTunnel_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSshTunnel_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSshTunnel_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSshTunnel_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSshTunnel_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSshTunnel_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSshTunnel_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSshTunnel_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSshTunnel_put_SocksPassword(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSshTunnel_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSshTunnel_put_SocksVersion(self, *args)
-    def get_ConnectTimeoutMs(self): return _chilkat.CkSshTunnel_get_ConnectTimeoutMs(self)
-    def put_ConnectTimeoutMs(self, *args): return _chilkat.CkSshTunnel_put_ConnectTimeoutMs(self, *args)
-    def get_ListenPort(self): return _chilkat.CkSshTunnel_get_ListenPort(self)
-CkSshTunnel_swigregister = _chilkat.CkSshTunnel_swigregister
-CkSshTunnel_swigregister(CkSshTunnel)
-
-class CkNtlm(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkNtlm, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkNtlm, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkNtlm()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkNtlm
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkNtlm_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkNtlm_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkNtlm_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkNtlm_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkNtlm_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkNtlm_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkNtlm_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkNtlm_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkNtlm_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkNtlm_UnlockComponent(self, *args)
-    def get_TargetName(self, *args): return _chilkat.CkNtlm_get_TargetName(self, *args)
-    def targetName(self): return _chilkat.CkNtlm_targetName(self)
-    def put_TargetName(self, *args): return _chilkat.CkNtlm_put_TargetName(self, *args)
-    def get_NetBiosComputerName(self, *args): return _chilkat.CkNtlm_get_NetBiosComputerName(self, *args)
-    def netBiosComputerName(self): return _chilkat.CkNtlm_netBiosComputerName(self)
-    def put_NetBiosComputerName(self, *args): return _chilkat.CkNtlm_put_NetBiosComputerName(self, *args)
-    def get_NetBiosDomainName(self, *args): return _chilkat.CkNtlm_get_NetBiosDomainName(self, *args)
-    def netBiosDomainName(self): return _chilkat.CkNtlm_netBiosDomainName(self)
-    def put_NetBiosDomainName(self, *args): return _chilkat.CkNtlm_put_NetBiosDomainName(self, *args)
-    def get_DnsDomainName(self, *args): return _chilkat.CkNtlm_get_DnsDomainName(self, *args)
-    def dnsDomainName(self): return _chilkat.CkNtlm_dnsDomainName(self)
-    def put_DnsDomainName(self, *args): return _chilkat.CkNtlm_put_DnsDomainName(self, *args)
-    def get_DnsComputerName(self, *args): return _chilkat.CkNtlm_get_DnsComputerName(self, *args)
-    def dnsComputerName(self): return _chilkat.CkNtlm_dnsComputerName(self)
-    def put_DnsComputerName(self, *args): return _chilkat.CkNtlm_put_DnsComputerName(self, *args)
-    def get_UserName(self, *args): return _chilkat.CkNtlm_get_UserName(self, *args)
-    def userName(self): return _chilkat.CkNtlm_userName(self)
-    def put_UserName(self, *args): return _chilkat.CkNtlm_put_UserName(self, *args)
-    def get_Password(self, *args): return _chilkat.CkNtlm_get_Password(self, *args)
-    def password(self): return _chilkat.CkNtlm_password(self)
-    def put_Password(self, *args): return _chilkat.CkNtlm_put_Password(self, *args)
-    def get_NtlmVersion(self): return _chilkat.CkNtlm_get_NtlmVersion(self)
-    def put_NtlmVersion(self, *args): return _chilkat.CkNtlm_put_NtlmVersion(self, *args)
-    def get_OemCodePage(self): return _chilkat.CkNtlm_get_OemCodePage(self)
-    def put_OemCodePage(self, *args): return _chilkat.CkNtlm_put_OemCodePage(self, *args)
-    def get_Flags(self, *args): return _chilkat.CkNtlm_get_Flags(self, *args)
-    def flags(self): return _chilkat.CkNtlm_flags(self)
-    def put_Flags(self, *args): return _chilkat.CkNtlm_put_Flags(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkNtlm_get_Domain(self, *args)
-    def domain(self): return _chilkat.CkNtlm_domain(self)
-    def put_Domain(self, *args): return _chilkat.CkNtlm_put_Domain(self, *args)
-    def get_Workstation(self, *args): return _chilkat.CkNtlm_get_Workstation(self, *args)
-    def workstation(self): return _chilkat.CkNtlm_workstation(self)
-    def put_Workstation(self, *args): return _chilkat.CkNtlm_put_Workstation(self, *args)
-    def GenType1(self, *args): return _chilkat.CkNtlm_GenType1(self, *args)
-    def genType1(self): return _chilkat.CkNtlm_genType1(self)
-    def GenType2(self, *args): return _chilkat.CkNtlm_GenType2(self, *args)
-    def genType2(self, *args): return _chilkat.CkNtlm_genType2(self, *args)
-    def GenType3(self, *args): return _chilkat.CkNtlm_GenType3(self, *args)
-    def genType3(self, *args): return _chilkat.CkNtlm_genType3(self, *args)
-    def ParseType1(self, *args): return _chilkat.CkNtlm_ParseType1(self, *args)
-    def parseType1(self, *args): return _chilkat.CkNtlm_parseType1(self, *args)
-    def ParseType2(self, *args): return _chilkat.CkNtlm_ParseType2(self, *args)
-    def parseType2(self, *args): return _chilkat.CkNtlm_parseType2(self, *args)
-    def ParseType3(self, *args): return _chilkat.CkNtlm_ParseType3(self, *args)
-    def parseType3(self, *args): return _chilkat.CkNtlm_parseType3(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkNtlm_get_EncodingMode(self, *args)
-    def encodingMode(self): return _chilkat.CkNtlm_encodingMode(self)
-    def put_EncodingMode(self, *args): return _chilkat.CkNtlm_put_EncodingMode(self, *args)
-    def SetFlag(self, *args): return _chilkat.CkNtlm_SetFlag(self, *args)
-    def get_ClientChallenge(self, *args): return _chilkat.CkNtlm_get_ClientChallenge(self, *args)
-    def clientChallenge(self): return _chilkat.CkNtlm_clientChallenge(self)
-    def put_ClientChallenge(self, *args): return _chilkat.CkNtlm_put_ClientChallenge(self, *args)
-    def get_ServerChallenge(self, *args): return _chilkat.CkNtlm_get_ServerChallenge(self, *args)
-    def serverChallenge(self): return _chilkat.CkNtlm_serverChallenge(self)
-    def put_ServerChallenge(self, *args): return _chilkat.CkNtlm_put_ServerChallenge(self, *args)
-    def LoadType3(self, *args): return _chilkat.CkNtlm_LoadType3(self, *args)
-CkNtlm_swigregister = _chilkat.CkNtlm_swigregister
-CkNtlm_swigregister(CkNtlm)
-
-class CkDkim(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDkim, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDkim, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDkim()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDkim
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDkim_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDkim_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkDkim_UnlockComponent(self, *args)
-    def get_DkimCanon(self, *args): return _chilkat.CkDkim_get_DkimCanon(self, *args)
-    def dkimCanon(self): return _chilkat.CkDkim_dkimCanon(self)
-    def put_DkimCanon(self, *args): return _chilkat.CkDkim_put_DkimCanon(self, *args)
-    def get_DomainKeyCanon(self, *args): return _chilkat.CkDkim_get_DomainKeyCanon(self, *args)
-    def domainKeyCanon(self): return _chilkat.CkDkim_domainKeyCanon(self)
-    def put_DomainKeyCanon(self, *args): return _chilkat.CkDkim_put_DomainKeyCanon(self, *args)
-    def get_DkimAlg(self, *args): return _chilkat.CkDkim_get_DkimAlg(self, *args)
-    def dkimAlg(self): return _chilkat.CkDkim_dkimAlg(self)
-    def put_DkimAlg(self, *args): return _chilkat.CkDkim_put_DkimAlg(self, *args)
-    def get_DomainKeyAlg(self, *args): return _chilkat.CkDkim_get_DomainKeyAlg(self, *args)
-    def domainKeyAlg(self): return _chilkat.CkDkim_domainKeyAlg(self)
-    def put_DomainKeyAlg(self, *args): return _chilkat.CkDkim_put_DomainKeyAlg(self, *args)
-    def get_DkimHeaders(self, *args): return _chilkat.CkDkim_get_DkimHeaders(self, *args)
-    def dkimHeaders(self): return _chilkat.CkDkim_dkimHeaders(self)
-    def put_DkimHeaders(self, *args): return _chilkat.CkDkim_put_DkimHeaders(self, *args)
-    def get_DomainKeyHeaders(self, *args): return _chilkat.CkDkim_get_DomainKeyHeaders(self, *args)
-    def domainKeyHeaders(self): return _chilkat.CkDkim_domainKeyHeaders(self)
-    def put_DomainKeyHeaders(self, *args): return _chilkat.CkDkim_put_DomainKeyHeaders(self, *args)
-    def get_DkimDomain(self, *args): return _chilkat.CkDkim_get_DkimDomain(self, *args)
-    def dkimDomain(self): return _chilkat.CkDkim_dkimDomain(self)
-    def put_DkimDomain(self, *args): return _chilkat.CkDkim_put_DkimDomain(self, *args)
-    def get_DomainKeyDomain(self, *args): return _chilkat.CkDkim_get_DomainKeyDomain(self, *args)
-    def domainKeyDomain(self): return _chilkat.CkDkim_domainKeyDomain(self)
-    def put_DomainKeyDomain(self, *args): return _chilkat.CkDkim_put_DomainKeyDomain(self, *args)
-    def get_DkimSelector(self, *args): return _chilkat.CkDkim_get_DkimSelector(self, *args)
-    def dkimSelector(self): return _chilkat.CkDkim_dkimSelector(self)
-    def put_DkimSelector(self, *args): return _chilkat.CkDkim_put_DkimSelector(self, *args)
-    def get_DomainKeySelector(self, *args): return _chilkat.CkDkim_get_DomainKeySelector(self, *args)
-    def domainKeySelector(self): return _chilkat.CkDkim_domainKeySelector(self)
-    def put_DomainKeySelector(self, *args): return _chilkat.CkDkim_put_DomainKeySelector(self, *args)
-    def get_DkimBodyLengthCount(self): return _chilkat.CkDkim_get_DkimBodyLengthCount(self)
-    def put_DkimBodyLengthCount(self, *args): return _chilkat.CkDkim_put_DkimBodyLengthCount(self, *args)
-    def LoadDkimPk(self, *args): return _chilkat.CkDkim_LoadDkimPk(self, *args)
-    def LoadDomainKeyPk(self, *args): return _chilkat.CkDkim_LoadDomainKeyPk(self, *args)
-    def LoadDkimPkFile(self, *args): return _chilkat.CkDkim_LoadDkimPkFile(self, *args)
-    def LoadDomainKeyPkFile(self, *args): return _chilkat.CkDkim_LoadDomainKeyPkFile(self, *args)
-    def LoadPublicKey(self, *args): return _chilkat.CkDkim_LoadPublicKey(self, *args)
-    def LoadPublicKeyFile(self, *args): return _chilkat.CkDkim_LoadPublicKeyFile(self, *args)
-    def PrefetchPublicKey(self, *args): return _chilkat.CkDkim_PrefetchPublicKey(self, *args)
-    def VerifyDkimSignature(self, *args): return _chilkat.CkDkim_VerifyDkimSignature(self, *args)
-    def VerifyDomainKeySignature(self, *args): return _chilkat.CkDkim_VerifyDomainKeySignature(self, *args)
-    def NumDkimSignatures(self, *args): return _chilkat.CkDkim_NumDkimSignatures(self, *args)
-    def NumDomainKeySignatures(self, *args): return _chilkat.CkDkim_NumDomainKeySignatures(self, *args)
-    def AddDkimSignature(self, *args): return _chilkat.CkDkim_AddDkimSignature(self, *args)
-    def AddDomainKeySignature(self, *args): return _chilkat.CkDkim_AddDomainKeySignature(self, *args)
-    def LoadDkimPkBytes(self, *args): return _chilkat.CkDkim_LoadDkimPkBytes(self, *args)
-    def LoadDomainKeyPkBytes(self, *args): return _chilkat.CkDkim_LoadDomainKeyPkBytes(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkDkim_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDkim_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDkim_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDkim_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDkim_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDkim_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDkim_lastErrorHtml(self)
-CkDkim_swigregister = _chilkat.CkDkim_swigregister
-CkDkim_swigregister(CkDkim)
-
-class CkDirTree(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDirTree, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDirTree, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDirTree()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDirTree
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDirTree_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDirTree_put_Utf8(self, *args)
-    def get_BaseDir(self, *args): return _chilkat.CkDirTree_get_BaseDir(self, *args)
-    def baseDir(self): return _chilkat.CkDirTree_baseDir(self)
-    def put_BaseDir(self, *args): return _chilkat.CkDirTree_put_BaseDir(self, *args)
-    def get_Recurse(self): return _chilkat.CkDirTree_get_Recurse(self)
-    def put_Recurse(self, *args): return _chilkat.CkDirTree_put_Recurse(self, *args)
-    def get_DoneIterating(self): return _chilkat.CkDirTree_get_DoneIterating(self)
-    def BeginIterate(self): return _chilkat.CkDirTree_BeginIterate(self)
-    def AdvancePosition(self): return _chilkat.CkDirTree_AdvancePosition(self)
-    def get_IsDirectory(self): return _chilkat.CkDirTree_get_IsDirectory(self)
-    def get_RelativePath(self, *args): return _chilkat.CkDirTree_get_RelativePath(self, *args)
-    def relativePath(self): return _chilkat.CkDirTree_relativePath(self)
-    def get_FullPath(self, *args): return _chilkat.CkDirTree_get_FullPath(self, *args)
-    def fullPath(self): return _chilkat.CkDirTree_fullPath(self)
-    def get_FullUncPath(self, *args): return _chilkat.CkDirTree_get_FullUncPath(self, *args)
-    def fullUncPath(self): return _chilkat.CkDirTree_fullUncPath(self)
-    def get_FileSize32(self): return _chilkat.CkDirTree_get_FileSize32(self)
-    def SaveLastError(self, *args): return _chilkat.CkDirTree_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDirTree_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDirTree_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDirTree_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDirTree_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDirTree_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDirTree_lastErrorHtml(self)
-CkDirTree_swigregister = _chilkat.CkDirTree_swigregister
-CkDirTree_swigregister(CkDirTree)
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
deleted file mode 100644
index a19f2d59cff..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# This package defines dialog boxes used by the main
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-import os, sys, stat
-#import dialog_map
-
-def LoadDialogs(rc_name = "dialogs.rc"):
-    base_name = os.path.splitext(rc_name)[0]
-    mod_name = "dialogs.resources." + base_name
-    mod = None
-    # If we are running from source code, check the .py file is up to date
-    # wrt the .rc file passed in.
-    # If we are running from binaries, the rc name is not used at all - we
-    # assume someone running from source previously generated the .py!
-    if not hasattr(sys, "frozen"):
-        from resources import rc2py
-        rc_path = os.path.dirname( rc2py.__file__ )
-        if not os.path.isabs(rc_name):
-            rc_name = os.path.join( rc_path, rc_name)
-        py_name = os.path.join(rc_path, base_name + ".py")
-        mtime = size = None
-        if os.path.exists(py_name):
-            try:
-                mod = __import__(mod_name)
-                mod = sys.modules[mod_name]
-                mtime = mod._rc_mtime_
-                size = mod._rc_size_
-            except (ImportError, AttributeError):
-                mtime = None
-        try:
-            stat_data = os.stat(rc_name)
-            rc_mtime = stat_data[stat.ST_MTIME]
-            rc_size = stat_data[stat.ST_SIZE]
-        except OSError:
-            rc_mtime = rc_size = None
-        if rc_mtime!=mtime or rc_size!=size:
-            # Need to generate the dialog.
-            print "Generating %s from %s" % (py_name, rc_name)
-            rc2py.convert(rc_name, py_name)
-            if mod is not None:
-                reload(mod)
-    if mod is None:
-        mod = __import__(mod_name)
-        mod = sys.modules[mod_name]
-    return mod.FakeParser()
-
-def ShowDialog(parent, manager, config, idd):
-    """Displays another dialog"""
-    if manager.dialog_parser is None:
-        manager.dialog_parser = LoadDialogs()
-    import dialog_map
-    print dir(dialog_map)
-    commands = dialog_map.dialog_map[idd]
-    if not parent:
-        import win32gui
-        try:
-            parent = win32gui.GetActiveWindow()
-        except win32gui.error:
-            pass
-
-    import dlgcore
-    dlg = dlgcore.ProcessorDialog(parent, manager, config, idd, commands)
-    return dlg.DoModal()
-
-def MakePropertyPage(parent, manager, config, idd, yoffset=24):
-    """Creates a child dialog box to use as property page in a tab control"""
-    if manager.dialog_parser is None:
-        manager.dialog_parser = LoadDialogs()
-    import dialog_map
-    commands = dialog_map.dialog_map[idd]
-    if not parent:
-        raise "Parent must be the tab control"
-
-    import dlgcore
-    dlg = dlgcore.ProcessorPage(parent, manager, config, idd, commands, yoffset)
-    return dlg
-
-import dlgutils
-SetWaitCursor = dlgutils.SetWaitCursor
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
deleted file mode 100644
index 8576a3526ff..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ /dev/null
@@ -1,1810 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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/>.
-#
-##############################################################################
-
-from processors import *
-from opt_processors import *
-import os
-import addin
-from dialogs import ShowDialog, MakePropertyPage
-
-import win32ui
-import webbrowser
-import commctrl
-import win32con
-import win32gui
-
-import win32gui_struct
-import xmlrpclib
-
-from manager import ustr
-
-try:
-    enumerate
-except NameError:   # enumerate new in 2.3
-    def enumerate(seq):
-        return [(i, seq[i]) for i in xrange(len(seq))]
-
-BIF_NEWDIALOGSTYLE = 0x00000040
-BIF_NONEWFOLDERBUTTON = 0x0000200
-CSIDL_COMMONMYPICTURES = 0x00000036
-
-class _WIN32MASKEDSTRUCT:
-    def __init__(self, **kw):
-        full_fmt = ""
-        for name, fmt, default, mask in self._struct_items_:
-            self.__dict__[name] = None
-            if fmt == "z":
-                full_fmt += "pi"
-            else:
-                full_fmt += fmt
-        for name, val in kw.iteritems():
-            if name not in self.__dict__:
-                raise ValueError("LVITEM structures do not have an item '%s'" % (name,))
-            self.__dict__[name] = val
-
-    def __setattr__(self, attr, val):
-        if not attr.startswith("_") and attr not in self.__dict__:
-            raise AttributeError(attr)
-        self.__dict__[attr] = val
-
-    def toparam(self):
-        self._buffs = []
-        full_fmt = ""
-        vals = []
-        mask = 0
-        # calc the mask
-        for name, fmt, default, this_mask in self._struct_items_:
-            if this_mask is not None and self.__dict__.get(name) is not None:
-                mask |= this_mask
-        self.mask = mask
-        for name, fmt, default, this_mask in self._struct_items_:
-            val = self.__dict__[name]
-            if fmt == "z":
-                fmt = "Pi"
-                if val is None:
-                    vals.append(0)
-                    vals.append(0)
-                else:
-                    # Note this demo still works with byte strings.  An
-                    # alternate strategy would be to use unicode natively
-                    # and use the 'W' version of the messages - eg,
-                    # LVM_SETITEMW etc.
-                    val = val + "\0"
-                    if isinstance(val, unicode):
-                        val = val.encode("mbcs")
-                    str_buf = array.array("b", val)
-                    vals.append(str_buf.buffer_info()[0])
-                    vals.append(len(val))
-                    self._buffs.append(str_buf) # keep alive during the call.
-            else:
-                if val is None:
-                    val = default
-                vals.append(val)
-            full_fmt += fmt
-        return struct.pack(*(full_fmt,) + tuple(vals))
-
-
-# NOTE: See the win32gui_struct module for an alternative way of dealing
-# with these structures
-class LVITEM(_WIN32MASKEDSTRUCT):
-    _struct_items_ = [
-        ("mask", "I", 0, None),
-        ("iItem", "i", 0, None),
-        ("iSubItem", "i", 0, None),
-        ("state", "I", 0, commctrl.LVIF_STATE),
-        ("stateMask", "I", 0, None),
-        ("text", "z", None, commctrl.LVIF_TEXT),
-        ("iImage", "i", 0, commctrl.LVIF_IMAGE),
-        ("lParam", "i", 0, commctrl.LVIF_PARAM),
-        ("iIdent", "i", 0, None),
-        ("cchTextMax", "i", 0, 255),
-        ("pszText", "i", 0, None),
-        ("flags", "i", 0, None),
-    ]
-
-class LVCOLUMN(_WIN32MASKEDSTRUCT):
-    _struct_items_ = [
-        ("mask", "I", 0, None),
-        ("fmt", "i", 0, commctrl.LVCF_FMT),
-        ("cx", "i", 0, commctrl.LVCF_WIDTH),
-        ("text", "z", None, commctrl.LVCF_TEXT),
-        ("iSubItem", "i", 0, commctrl.LVCF_SUBITEM),
-        ("iImage", "i", 0, commctrl.LVCF_IMAGE),
-        ("iOrder", "i", 0, commctrl.LVCF_ORDER),
-    ]
-
-global flag_stop
-flag_stop=win32con.MB_ICONSTOP
-
-global flag_error
-flag_error=win32con.MB_ICONERROR
-
-global flag_info
-flag_info=win32con.MB_ICONINFORMATION
-
-global flag_excl
-flag_excl=win32con.MB_ICONEXCLAMATION
-
-#global NewConn
-NewConn=addin.GetConn()
-## Retrieves current registered XMLRPC connection
-def GetConn():
-    return NewConn
-
-global objects_with_match
-objects_with_match=[]
-
-global hwndChk_list
-hwndChk_list=[]
-
-global search_text
-search_text='search_text'
-global partner_ref
-partner_ref = ''
-global name
-name=''
-global email
-email=''
-global country_ref
-country_ref = ""
-global state_ref
-state_ref = ""
-global new_con_country
-new_con_country= ""
-global new_con_state
-new_con_state= ""
-global search_country
-search_country = None
-
-def check():
-    server = NewConn.getitem('_server')
-    port = NewConn.getitem('_port')
-    NewConn.GetDBList()
-    if str(NewConn.getitem('_running')) == 'False':
-        win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
-        return False
-    if str(NewConn.getitem('_login')) == 'False':
-        return False
-    return True
-
-def resetConnAttribs(window):
-    config = window.manager.LoadConfig()
-    NewConn.setitem('_server', config['server'])
-    NewConn.setitem('_port', config['port'])
-    NewConn.setitem('protocol', config['protocol'])
-    NewConn.setitem('_uri', "http://" + config['server'] + ":" + str(config['port']))
-    NewConn.setitem('_obj_list', config['objects'])
-    NewConn.setitem('_dbname', config['database'])
-    NewConn.setitem('_uname', config['uname'])
-    NewConn.setitem('_pwd', config['pwd'])
-    NewConn.setitem('_login', str(config['login']))
-    NewConn.setitem('_webserver',manager.config['webserver'])
-    NewConn.setitem('_webport',manager.config['webport'])
-    NewConn.setitem('_webportocol',manager.config['webportocol'])
-    return
-
-def setConnAttribs(server, port, manager):
-    protocol = NewConn.getitem('protocol')
-    if protocol=='XML-RPCS':
-        protocol='https://'
-    else:
-        protocol='http://'
-    uri = protocol + server + ":" + str(port)
-    NewConn.setitem('_server',server)
-    NewConn.setitem('_port',port)
-    NewConn.setitem('_uri',uri)
-    NewConn.GetDBList()
-    manager.config = manager.LoadConfig()
-    NewConn.setitem('_dbname',manager.config['database'])
-    NewConn.setitem('_uname', manager.config['uname'])
-    NewConn.setitem('_pwd', manager.config['pwd'])
-    NewConn.setitem('_login', str(manager.config['login']))
-    NewConn.setitem('_obj_list', manager.config['objects'])
-    NewConn.setitem('_webserver',manager.config['webserver'])
-    NewConn.setitem('_webport',manager.config['webport'])
-    NewConn.setitem('_webprotocol',manager.config['webprotocol'])
-    return
-
-def getConnAttributes(manager):
-    manager.config['server'] = NewConn.getitem('_server')
-    manager.config['port'] = NewConn.getitem('_port')
-    manager.config['protocol'] = NewConn.getitem('protocol')
-    manager.config['objects'] = eval(NewConn.getitem('_obj_list'))
-    manager.config['database'] = NewConn.getitem('_dbname')
-    manager.config['uname'] = NewConn.getitem('_uname')
-    manager.config['pwd'] = NewConn.getitem('_pwd')
-    manager.config['login'] = NewConn.getitem('_login')
-    manager.config['webserver'] = NewConn.getitem('_webserver')
-    manager.config['webport'] = NewConn.getitem('_webport')
-    manager.config['webprotocol'] = NewConn.getitem('_webprotocol')
-    return
-
-def setWebConnAttribs(server, port, manager):
-    manager.config = manager.LoadConfig()
-    NewConn.setitem('_webserver',server)
-    NewConn.setitem('_webport',port)
-    return
-
-def getMessage(e):
-    import pywintypes
-    print "Exception %s: %s"%(type(e),str(e))
-    msg = str(e)
-    if type(e) == pywintypes.com_error:
-        msg=str(e)
-    elif type(e) == xmlrpclib.Fault:
-        msg = str(e.faultCode) or e.faultString or e.message or str(e)
-    else:
-        if hasattr(e, 'faultCode') and e.faultCode:
-            msg = str(e.faultCode)
-        elif hasattr(e, 'faultString') and e.faultString:
-            msg = e.faultString
-        elif hasattr(e, 'message') and e.message:
-            msg = e.message
-    return msg
-
-class OKButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids):
-        self.mngr = window.manager
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
-        protocol = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[3])
-        if not protocol:
-            win32ui.MessageBox("Invalid Protocol !\nPlease select Protocol from Connection Protocol List.", "OpenERP Connection", flag_excl)
-            return
-        NewConn.setitem('protocol', protocol)
-        try:
-            port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
-        except ValueError, e:
-            win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)
-            return
-        except Exception,e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "OpenERP Connection", flag_excl)
-            return
-        setConnAttribs(server, port, self.mngr)
-        if str(NewConn.getitem('_running')) == 'False':
-            msg = "No server running on host '%s' at port '%d'. Press ignore to still continue with this configuration?"%(server,port)
-            r=win32ui.MessageBox(msg, "OpenERP Connection", win32con.MB_ABORTRETRYIGNORE | win32con.MB_ICONQUESTION)
-            if r==3:
-                resetConnAttribs(self.window)
-                return
-            elif r==4:
-                self.OnClicked(id)
-            elif r==5:
-                setConnAttribs(server, port, self.mngr)
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class DoneButtonProcessor(ButtonProcessor):
-    def OnClicked(self, id):
-        getConnAttributes(self.window.manager)
-        self.window.manager.SaveConfig()
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class WEBOKButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids):
-        self.mngr = window.manager
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-#        global web_server
-#        global web_server_port
-        server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
-        web_protocol = 'http:\\\\'
-
-        hwnd = win32gui.GetDlgItem(self.window.hwnd, self.other_ids[2])
-        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
-        if chk:
-            web_protocol = 'https:\\\\'
-        NewConn.setitem('_webprotocol', web_protocol)
-        try:
-            port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
-        except ValueError:
-            win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)
-            return
-        if server.strip() == "" or server.strip() == "http:\\\\":
-            win32ui.MessageBox("Invalid web Server address.", "OpenERP Connection", flag_excl)
-            return
-        setWebConnAttribs(server, port, self.mngr)
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class WEBCHKProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids):
-        self.mngr = window.manager
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        web_protocol = 'http:\\\\'
-        hwnd = self.GetControl()
-        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
-        if chk:
-            web_protocol = 'https:\\\\'
-        NewConn.setitem('_webprotocol', web_protocol)
-
-class MessageProcessor(ControlProcessor):
-    def Init(self):
-        text = "  This Outlook Plugin for OpenERP has been developed by OpenERP s.a.\n\n \
-                      For more information, please visit our website \n\n \
-                                    http://www.openerp.com \n\n\n \
-                       Copyright @ 2005-Today. All rights reserved.\n\n\
-OpenERP is a trademark of OpenERP s.a. The software is released under AGPL."
-        win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT, 0, text)
-
-    def GetPopupHelpText(self, cid):
-        return "Displays details on this plugin"
-
-class TabProcessor(ControlProcessor):
-    def __init__(self, window, control_ids, page_ids):
-        ControlProcessor.__init__(self, window, control_ids)
-        self.page_ids = page_ids.split()
-
-    def Init(self):
-        self.pages = {}
-        self.currentPage = None
-        self.currentPageIndex = -1
-        self.currentPageHwnd = None
-        for index, page_id in enumerate(self.page_ids):
-            template = self.window.manager.dialog_parser.dialogs[page_id]
-            self.addPage(index, page_id, template[0][0])
-        server = self.window.manager.config['server']
-        port = self.window.manager.config['port']
-        setConnAttribs(server, port, self.window.manager)
-        self.switchToPage(0)
-
-    def Done(self):
-        if self.currentPageHwnd is not None:
-            if not self.currentPage.SaveAllControls():
-                win32gui.SendMessage(self.GetControl(), commctrl.TCM_SETCURSEL, self.currentPageIndex,0)
-                return False
-        return True
-
-    def OnNotify(self, nmhdr, wparam, lparam):
-        selChangedCode =  5177342
-        code = nmhdr[2]
-        if code==selChangedCode:
-            index = win32gui.SendMessage(self.GetControl(), commctrl.TCM_GETCURSEL, 0,0)
-            if index!=self.currentPageIndex:
-                self.switchToPage(index)
-
-    def switchToPage(self, index):
-        if self.currentPageHwnd is not None:
-            if not self.currentPage.SaveAllControls():
-                win32gui.SendMessage(self.GetControl(), commctrl.TCM_SETCURSEL, self.currentPageIndex,0)
-                return 1
-            win32gui.DestroyWindow(self.currentPageHwnd)
-        self.currentPage = MakePropertyPage(self.GetControl(), self.window.manager, self.window.config, self.pages[index])
-        self.currentPageHwnd = self.currentPage.CreateWindow()
-        self.currentPageIndex = index
-        return 0
-#
-    def addPage(self, item, idName, label):
-        format = "iiiiiii"
-        lbuf = win32gui.PyMakeBuffer(len(label)+1)
-        address,l = win32gui.PyGetBufferAddressAndLen(lbuf)
-        win32gui.PySetString(address, label)
-
-        buf = struct.pack(format,
-            commctrl.TCIF_TEXT, # mask
-            0, # state
-            0, # state mask
-            address,
-            0, #unused
-            0, #image
-            item
-            )
-        item = win32gui.SendMessage(self.GetControl(),
-                             commctrl.TCM_INSERTITEM,
-                             item,
-                             buf)
-        self.pages[item] = idName
-
-class DialogCommand(ButtonProcessor):
-    def __init__(self, window, control_ids, idd, func=None, args=()):
-        self.idd = idd
-        self.func = func
-        self.args = args
-        ButtonProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        self.id = id
-        if self.func:
-            args = (self, ) + self.args
-            self.func(*args)
-        parent = self.window.hwnd
-        self.window.SaveAllControls()
-        ShowDialog(parent, self.window.manager, self.window.config, self.idd)
-        self.window.LoadAllControls()
-
-    def GetPopupHelpText(self, id):
-        dd = self.window.manager.dialog_parser.dialogs[self.idd]
-        return "Displays the %s dialog" % dd.caption
-
-def TestConnection(btnProcessor,*args):
-    dbname = None
-    server = NewConn.getitem('_server')
-    port = NewConn.getitem('_port')
-    NewConn.GetDBList()
-    if str(NewConn.getitem('_running')) == 'False':
-        btnProcessor.window.LoadAllControls()
-        win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
-        return
-
-    dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    if not dbname:
-        try:
-            dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, 7000)
-            if not dbname:
-                win32ui.MessageBox("Authentication Error !\nBad Database Name !", "OpenERP Connection", flag_excl)
-                return
-        except Exception,e:
-            pass
-    if not dbname:
-        win32ui.MessageBox("No database found on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
-        return
-    uname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    pwd = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-
-    if not uname:
-        win32ui.MessageBox("Authentication Error !\nBad User Name !", "OpenERP Connection", flag_excl)
-        return
-    if not pwd:
-        win32ui.MessageBox("Authentication Error !\nBad Password !", "OpenERP Connection", flag_excl)
-        return
-
-    #Establish Connection
-    try:
-        uid = NewConn.login(dbname, uname, pwd)
-        if uid:
-            msg = "Connection Successful"
-            NewConn.setitem('_login', 'True')
-            NewConn.setitem('_uname', uname)
-            NewConn.setitem('_pwd', pwd)
-            NewConn.setitem('_uid', uid)
-            flag = flag_info
-            if not NewConn.IsCRMInstalled():
-                msg+= '\n\n'+" 'CRM' module is not installed. So CRM cases cannot be created."
-                NewConn.setitem('_iscrm', False)
-            else:
-                NewConn.setitem('_iscrm', True)
-        else:
-            msg = "Authentication Error !\nBad UserName or Password"
-            flag = flag_stop
-            NewConn.setitem('_login', 'False')
-    except Exception,e:
-        msg = "Authentication Error !\n Invalid Configuration Please check server parameters and database name."
-        flag = flag_error
-    win32ui.MessageBox(msg, "OpenERP Connection", flag)
-    return
-
-def BrowseCallbackProc(hwnd, msg, lp, data):
-    from win32com.shell import shell, shellcon
-    if msg== shellcon.BFFM_INITIALIZED:
-        win32gui.SendMessage(hwnd, shellcon.BFFM_SETSELECTION, 1, data)
-        win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 0)
-    elif msg == shellcon.BFFM_SELCHANGED:
-        # Set the status text of the
-        # For this message, 'lp' is the address of the PIDL.
-        pidl = shell.AddressAsPIDL(lp)
-        try:
-            path = shell.SHGetPathFromIDList(pidl)
-            if os.path.isdir(path):
-                win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 0)
-            else:
-                ext = path.split('.')[-1]
-                if ext not in ['gif', 'bmp', 'jpg', 'tif', 'ico', 'png']:
-                        win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 0)
-                else:
-                    win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 1)
-        except shell.error:
-            # No path for this PIDL
-            pass
-
-def GetImagePath(btnProcessor,*args):
-    from win32com.shell import shell, shellcon
-    ulFlags = shellcon.BIF_BROWSEINCLUDEFILES | BIF_NEWDIALOGSTYLE | BIF_NONEWFOLDERBUTTON
-    pidl, display_name, image_list=shell.SHBrowseForFolder(btnProcessor.window.hwnd, # parent HWND
-                            None, # root PIDL.
-                            "Get the image path", # title
-                            ulFlags, # flags
-                            BrowseCallbackProc, # callback function
-                            os.getcwd() # 'data' param for the callback
-                            )
-    if (pidl, display_name, image_list) == (None, None, None):
-      return
-    else:
-      path = shell.SHGetPathFromIDList (pidl)
-      win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], path)
-
-def AddNewObject(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-
-    #Check if title or object not specified
-    obj_title = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    obj_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    if not obj_title:
-        win32ui.MessageBox("No Title specified", "Documents Setting", flag_excl)
-        return
-    if not obj_name:
-        win32ui.MessageBox("No Document specified", "Documents Setting", flag_excl)
-        return
-
-    #Check if object does not exist in the database or it already exist in the list
-    try:
-        all_obj_list = NewConn.GetAllObjects()
-        curr_obj_list = [obj[1] for obj in NewConn.GetObjList()]
-        curr_title_list = [obj[0] for obj in NewConn.GetObjList()]
-        if obj_name not in all_obj_list:
-            win32ui.MessageBox("No such Document exists", "Documents Setting", flag_excl)
-            return
-        elif obj_name in curr_obj_list:
-            win32ui.MessageBox("Document already in the list", "Documents Setting", flag_info)
-            return
-        elif obj_title in curr_title_list:
-            win32ui.MessageBox("Title already in the list. Please give different title", "Documents Setting", flag_excl)
-            return
-
-        #extract image path and load the image
-        image_path=''
-        image_path = os.path.join(btnProcessor.window.manager.application_directory, "dialogs\\resources\\openerp_logo1.bmp")
-        path=win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-        if path:
-            image_path = path
-        load_bmp_flags=win32con.LR_LOADFROMFILE | win32con.LR_LOADTRANSPARENT
-        try:
-            hicon = win32gui.LoadImage(0, image_path,win32con.IMAGE_BITMAP, 40, 40, load_bmp_flags)
-        except Exception,e:
-            msg=getMessage(e)
-            hicon=None
-            win32ui.MessageBox(msg, "Load Image", flag_error)
-
-        #Add the object in the list
-        win32gui.ImageList_Add(il,hicon,0)
-        cnt = win32gui.ImageList_GetImageCount(il)
-
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-
-        item = LVITEM(text=obj_title, iImage=cnt-2, iItem = num_items)
-        new_index = win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-        win32gui.SendMessage(hwndList, commctrl.LVM_SETIMAGELIST, commctrl.LVSIL_SMALL, il)
-        item = LVITEM(text=obj_name, iItem = new_index, iSubItem = 1)
-        win32gui.SendMessage(hwndList, commctrl.LVM_SETITEM, 0, item.toparam())
-
-        NewConn.InsertObj(obj_title,obj_name,image_path)
-    except Exception, e:
-        msg = "Object not added\n\n" + getMessage(e)
-        win32ui.MessageBox(msg,"",flag_excl)
-        return
-
-    #Empty all the text controls
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], '')
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1], '')
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2], '')
-
-def DeleteSelectedObjects(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-
-    #Delete selected items
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    for i in range(0,sel_count):
-        sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, -1, commctrl.LVNI_SELECTED)
-        buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-        r = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-        sel_text = ''
-        for n in extra:
-            nombre = n.tostring()
-            sel_text = nombre[0:r]
-        try:
-            NewConn.DeleteObject(sel_text)
-        except Exception,e:
-            msg = "Documents '%s' not deleted\n\n"%sel_text + getMessage(e)
-            win32ui.MessageBox(msg,"Documents Setting",flag_excl)
-
-def GetMail(processor):
-    ex = processor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    return mail
-#get selected records from list
-def GetSelectedItems(hwndList):
-    r=[]
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel=-1
-    for i in range(0,sel_count):
-        sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-        buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-        size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-        sel_text = ''
-        for n in extra:
-            nombre = n.tostring()
-            sel_text = nombre[0:size]
-        for item in objects_with_match:
-            if item[2] == sel_text:
-                 r.append(item)
-    return r
-
-def MakeAttachment(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-    ex = btnProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    mail = GetMail(btnProcessor)
-    #get selected records
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    r = GetSelectedItems(hwndList)
-    if not r:
-        win32ui.MessageBox("No records selected", "Push to OpenERP", flag_info)
-        return
-    try:
-        flg = NewConn.ArchiveToOpenERP(r,mail)
-        if flg:
-            win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-            return
-    except Exception,e:
-        msg = "Attachment not created \n\n" + getMessage(e)
-        flag = flag_error
-        win32ui.MessageBox(msg, "Push to OpenERP", flag)
-    return
-
-def CreateCase(btnProcessor,*args):
-    try:
-        #Check if server running or user logged in
-        b = check()
-        if not b:
-            return
-
-        if str(NewConn.getitem('_iscrm')) == 'True':
-        #    Get the selected mail
-            ex = btnProcessor.window.manager.outlook.ActiveExplorer()
-            assert ex.Selection.Count == 1
-            mail = ex.Selection.Item(1)
-            section = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-            section = str(section)
-            section=section.lower().replace(' ','.')
-            if not section:
-                win32ui.MessageBox("Documents can not be created.", "Documents Setting", flag_excl)
-                return
-            hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-            partner_ids=[]
-            r = GetSelectedItems(hwndList)
-            for rec in r:
-                if rec[0] == 'res.partner':
-                    partner_ids.append(rec[1])
-            f = False
-            #Create new case
-            try:
-                f = NewConn.CreateCase(str(section), mail, partner_ids)
-                msg="New Document created."
-                flag=flag_info
-            except Exception,e:
-                msg="New Document not created \n\n"+str(e)
-                flag=flag_error
-            if f:
-                win32ui.MessageBox(msg, "Create Document", flag)
-                win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-                return
-            else:
-                win32ui.MessageBox("Error While creating document.\n Document can not be created.", "Create Document", flag_error)
-                return
-        else:
-            win32ui.MessageBox("Document can not be created. CRM not installed", "Create Object", flag_info)
-    except Exception, e:
-        win32ui.MessageBox(str(e), 'New Document')
-
-def GetSearchText(txtProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-    try:
-        global objects_with_match
-        list_hwnd = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-        objects_with_match = NewConn.SearchPartners()
-        setList(list_hwnd)
-    except Exception,e:
-        win32ui.MessageBox('Document can not be loaded.\n'+str(e), "Push", flag_error)
-    txtProcessor.init_done=True
-
-def SetNameColumn(listProcessor,*args):
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Document Type"
-    lvc.cx = 100
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-    lvc.iSubItem = 0
-    lvc.text = "Name"
-    lvc.cx = 240
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-    listProcessor.init_done = True
-
-def setList(list_hwnd):
-    # Set default list of objects
-    win32gui.SendMessage(list_hwnd, commctrl.LVM_DELETEALLITEMS)
-    for obj in objects_with_match:
-        num_items = win32gui.SendMessage(list_hwnd, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=obj[2],iItem = num_items)
-        new = win32gui.SendMessage(list_hwnd, commctrl.LVM_INSERTITEM, 0, item.toparam())
-        item = LVITEM(text=obj[3],iItem = new,  iSubItem = 1)
-        win32gui.SendMessage(list_hwnd, commctrl.LVM_SETITEM, 0, item.toparam())
-
-def SearchObjectsForText(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-
-    search_txt = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    # Get titles from list
-    obj_titles=[]
-    for ch in hwndChk_list:
-        id = ch[0]
-        hwnd = ch[1]
-        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
-        if chk:
-            txt = win32gui.GetDlgItemText(btnProcessor.window.hwnd,id)
-            obj_titles.append(txt)
-
-    # Prepare list of objects to search for the seach_keyword
-    obj_list = btnProcessor.window.manager.config['objects']
-    search_list = []
-    try:
-        all_obj_list = NewConn.GetAllObjects()
-        for title in obj_titles:
-            objname = [obj[1] for obj in obj_list if obj[0] == title]
-            if objname:
-                assert len(objname) == 1
-                if objname[0] in all_obj_list:
-                     search_list.append(objname[0])
-                else:
-                    win32ui.MessageBox("Module %s (%s) not installed. Please install it." \
-                                       %(title,objname[0]), "Push to OpenERP", flag_excl)
-                    return
-
-        #  Get the records by searching the objects in search_list for the search_keyword as objects_with_match
-        global objects_with_match
-        list_hwnd = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        if search_list:
-            objects_with_match = NewConn.GetObjectItems(search_list, search_txt)
-            if not objects_with_match:
-                win32ui.MessageBox("No matching records found in checked objects", "Push to OpenERP", flag_info)
-        else:
-            win32ui.MessageBox("No object selected", "Push to OpenERP", flag_info)
-            objects_with_match=[]
-        # Display the objects_with_match records in list
-        setList(list_hwnd)
-    except Exception,e:
-        msg=getMessage(e)
-        win32ui.MessageBox(msg, "Search Text", flag_error)
-
-def CreateContact(btnProcessor,*args):
-    b = check()
-    if not b:
-        return
-
-    partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
-    name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    email = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    office_no = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-    mobile_no = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
-    fax = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4])
-    street = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5])
-    street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
-    city = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7])
-    zip = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8])
-    state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
-    country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    if not name:
-        win32ui.MessageBox("Please enter name.", "Create Contact", flag_stop)
-        return
-
-    res = {
-           'partner_id':ustr(partner),
-           'name':ustr(name),
-           'email':ustr(email),
-           'phone':ustr(office_no),
-           'mobile':ustr(mobile_no),
-           'fax':ustr(fax),
-           'street':ustr(street),
-           'street2':ustr(street2),
-           'city':ustr(city),
-           'zip':ustr(zip),
-           'state_id':ustr(state),
-           'country_id':ustr(country)
-       }
-    if res.get('name').strip == '' or res.get('email').strip == '':
-        win32ui.MessageBox("Contact name or Email id is Missing\nPlease fill those information", "Create Contact", flag_error)
-        return
-    try:
-        NewConn.CreateContact(str(res))
-        if not partner:
-            msg="New contact created."
-        else:
-            msg="New contact created for partner '%s'."%partner
-    except Exception,e:
-        msg="Contact not created \n\n" + getMessage(e)
-        win32ui.MessageBox(msg, "Create Contact", flag_error)
-        return
-    win32ui.MessageBox(msg, "Create Contact", flag_info)
-    for i in range(0,9):
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], '')
-    win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
-
-def SetAllText(txtProcessor,*args):
-    url = NewConn.getitem('_uri')
-    tbox = txtProcessor.GetControl()
-    win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url))
-
-    uname = NewConn.getitem('_uname')
-    tbox = txtProcessor.GetControl(txtProcessor.other_ids[0])
-    win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(uname))
-
-    passbox = txtProcessor.GetControl(txtProcessor.other_ids[1])
-    pwd = NewConn.getitem('_pwd')
-    win32gui.SendMessage(passbox, win32con.WM_SETTEXT, 0, str(pwd))
-    serverBox = txtProcessor.GetControl(txtProcessor.other_ids[2])
-    webstr = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
-    win32gui.SendMessage(serverBox, win32con.WM_SETTEXT, 0, str(webstr))
-
-def SetDefaultList(listProcessor,*args):
-    import win32api
-    hwndList = listProcessor.GetControl()
-
-    # set full row select style
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Object Name"
-    lvc.cx = 315
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-    lvc.iSubItem = 0
-    lvc.text = "Document Title"
-    lvc.cx = 315
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    #create imagelist
-    global il
-    il = win32gui.ImageList_Create(
-                        win32api.GetSystemMetrics(win32con.SM_CXSMICON),
-                        win32api.GetSystemMetrics(win32con.SM_CYSMICON),
-                        commctrl.ILC_COLOR32 | commctrl.ILC_MASK,
-                        1, # initial size
-                        0) # cGrow
-
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETIMAGELIST,\
-                                 commctrl.LVSIL_SMALL, il)
-    # Set objects from config
-    objs = eval(NewConn.getitem('_obj_list'))
-    load_bmp_flags=win32con.LR_LOADFROMFILE | win32con.LR_LOADTRANSPARENT
-    for obj in objs:
-        image_path = os.path.join(listProcessor.window.manager.application_directory, "dialogs\\resources\\openerp_logo1.bmp")
-        path=obj[2]
-        if path:
-            image_path = path
-        try:
-            hicon = win32gui.LoadImage(0, image_path,win32con.IMAGE_BITMAP, 40, 40, load_bmp_flags)
-        except Exception, e:
-            msg = "Problem loading the image \n\n" + getMessage(e)
-            hicon = None
-            win32ui.MessageBox(msg, "Load Image", flag_error)
-
-        #Add the object in the list
-        win32gui.ImageList_Add(il,hicon,0)
-        cnt = win32gui.ImageList_GetImageCount(il)
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=obj[0],iImage=cnt-2, iItem = num_items)
-        new_index = win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-        item = LVITEM(text=obj[1], iItem = new_index, iSubItem = 1)
-        win32gui.SendMessage(hwndList, commctrl.LVM_SETITEM, 0, item.toparam())
-
-def SetDefaultContact(txtProcessor,*args):
-    # Acquiring the control of the text box
-    global name
-    global email
-    global partner_ref
-    global new_con_country
-    global new_con_state
-    global state_ref
-    global country_ref
-    state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
-    country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
-    if txtProcessor.init_done:
-        if new_con_country == "":
-            new_con_country = country
-        if new_con_state == "":
-            new_con_state = state
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1],partner_ref)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2],new_con_state)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3],new_con_country)
-        new_con_country = ""
-        new_con_state = ""
-        state_ref = ""
-        country_ref =""
-        return
-    #
-    try:
-        mail = GetMail(txtProcessor)
-        name = ustr(mail.SenderName).encode('iso-8859-1')
-        email = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-    except Exception:
-        pass
-
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
-
-    txtProcessor.init_done = True
-
-def setCheckList(groupProcessor,*args):
-    b = check()
-    if not b:
-        return
-    try:
-        hinst = win32gui.dllhandle
-        objs = groupProcessor.window.manager.config['objects']
-        ins_objs = NewConn.GetAllObjects()
-        left = 20
-        top = 60
-        cnt=0
-        id=4001
-        id1=6001
-        if groupProcessor.init_done:
-           return
-        else:
-           for obj in objs:
-             if obj[1] in ins_objs:
-                groupProcessor.init_done = True
-                #Add Checkbox
-                left+= 17
-                hwndChk = win32gui.CreateWindowEx(
-                                                    0,"BUTTON",obj[0],win32con.WS_VISIBLE | win32con.WS_CHILD | \
-                                                    win32con.BS_AUTOCHECKBOX | win32con.WS_TABSTOP | win32con.BST_CHECKED, \
-                                                    left, top, 130,20,groupProcessor.window.hwnd,id1,hinst,None
-                                                  )
-                if obj[1] in ['res.partner','res.partner.address']:
-                    win32gui.SendMessage(hwndChk , win32con.BM_SETCHECK, 1, 0);
-                hwndChk_list.append((id1,hwndChk))
-
-                cnt=cnt+1
-                id+=1
-                id1+=1
-                left+=17
-                left+=140
-                if cnt > 1:
-                    left = 20
-                    top+=18
-                    cnt=0
-    except Exception, e:
-        win32ui.MessageBox(str(e), 'Push to OpenERP')
-
-def CreatePartner(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-    global partner_ref
-    partner_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    if not partner_name:
-        win32ui.MessageBox("Please enter Partner name.", "Create Partner", flag_excl)
-        return
-    res = {'name':ustr(partner_name)}
-    try:
-        id = NewConn.CreatePartner(str(res))
-    except Exception,e:
-        msg="Partner not created \n\n" + getMessage(e)
-        win32ui.MessageBox(msg, "Create Partner", flag_error)
-        return
-    if id:
-        win32ui.MessageBox("New Partner '%s' created."%partner_name, "Create Partner", flag_info)
-        partner_ref = str(partner_name)
-        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
-    else:
-        win32ui.MessageBox("Partner '%s' already Exists."%partner_name, "Create Partner", flag_info)
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],'')
-
-def set_search_text(dialogProcessor,*args):
-    global search_text
-    search_text = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[0])
-    return
-
-def set_name_email(dialogProcessor,*args):
-    global name
-    global email
-    global partner_ref
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], ustr(partner_ref))
-    name = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[0])
-    email = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[1])
-
-#Function for Getting default mail when dialog is loaded and finding contact related to this
-#setting values to the appropriate text areas
-def GetDefaultEmail(txtProcessor,*args):
-
-    import win32con
-    b = check()
-    global partner_ref
-    global country_ref
-    global state_ref
-    global new_con_country
-    global new_con_state
-    partner_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0])
-    state_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10])
-    country_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11])
-    if partner_ref == "":
-        partner_ref = partner_n
-    if country_ref == "":
-        country_ref = country_n
-    if state_ref == "":
-        state_ref = state_n
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(partner_ref))
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(state_ref))
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
-    partner_ref = ""
-    country_ref = ""
-    state_ref = ""
-    new_con_country = ""
-    new_con_state = ""
-    if country_ref == None:
-        country_ref = ""
-
-
-    if not b:
-        return
-    #Acquiring control of the text box
-    search_partner_box = txtProcessor.GetControl()
-    global search_partner_text
-    if txtProcessor.init_done:
-        win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0,search_partner_text)
-        return
-    #Reading Current Selected Email.
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    #Fetching Sender MailID from Selected Mail
-    try:
-        search_partner_text = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-    except Exception:
-        win32ui.MessageBox("Error In reading email ID from Email ","Open Contact", flag_error)
-        pass
-    win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0, search_partner_text)
-    if search_partner_text.strip() == "":
-        search_partner_text = None
-        return
-    vals = []
-    #Searching the res.partner.address for contact based on Sender Mail ID.
-    vals = NewConn.SearchPartnerDetail(search_partner_text)
-    #If no user Found.
-    if vals == None:
-        for i in range(1,12):
-            win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[i], "")
-        win32ui.MessageBox("No matching records found for  : "+str(search_partner)+".","Open Contact", flag_excl)
-        return
-    else:
-        #If user Found than Setting the Value for the contact in fields.
-        for i in range(1,12):
-            win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[i], "")
-
-        for val in vals:
-            if val[0] == 'partner_id':
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(val[1][1]))
-
-            if val[0] == 'name' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1], ustr(val[1]))
-
-            if val[0] == 'street' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], ustr(val[1]))
-
-            if val[0] == 'street2' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3], ustr(val[1]))
-
-            if val[0] == 'zip' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[9], ustr(val[1]))
-
-            if val[0] == 'city' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[4], ustr(val[1]))
-
-            if val[0] == 'state_id' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(val[1][1]))
-
-            if val[0] == 'country_id' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(val[1][1]))
-                global search_country
-                search_country =  ustr(val[1][1])
-
-            if val[0] == 'phone' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[5], ustr(val[1]))
-
-            if val[0] == 'mobile' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[6], ustr(val[1]))
-
-            if val[0] == 'fax' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[7], ustr(val[1]))
-
-            if val[0] == 'email' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[8], ustr(val[1]))
-
-    txtProcessor.init_done=True
-
-def SearchPartner(btnProcessor,*args):
-    b = check()
-    global partner_ref
-    if not b:
-        return
-    try :
-        search_partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        if not search_partner:
-            win32ui.MessageBox("Please enter email id to search for.", "Open Contact", flag_excl)
-            return
-        vals = []
-        #Searching the contact.
-        vals = NewConn.SearchPartnerDetail(search_partner)
-        #if contact not found resetting all field to blank
-        if vals == None:
-            for i in range(1,13):
-                win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], "")
-            win32ui.MessageBox("No matching records found for  : "+str(search_partner)+".","Open Contact", flag_excl)
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], "<enter new search>")
-            return
-        #if contact found than setting the values for the contact.
-        else:
-            for i in range(1,13):
-                win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], "")
-            for val in vals:
-                if val[0] == 'partner_id':
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1], ustr(val[1][1]))
-
-                if val[0] == 'name' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2], ustr(val[1]))
-
-                if val[0] == 'street' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3], ustr(val[1]))
-
-                if val[0] == 'street2' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4], ustr(val[1]))
-
-                if val[0] == 'zip' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10], ustr(val[1]))
-
-                if val[0] == 'city' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5], ustr(val[1]))
-
-                if val[0] == 'state_id' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11], ustr(val[1][1]))
-
-                if val[0] == 'country_id' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[12], ustr(val[1][1]))
-                    global search_country
-                    search_country =  ustr(val[1][1])
-
-                if val[0] == 'phone' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6], ustr(val[1]))
-
-                if val[0] == 'mobile' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7], ustr(val[1]))
-
-                if val[0] == 'fax' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8], ustr(val[1]))
-
-                if val[0] == 'email' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9], ustr(val[1]))
-
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], "<Enter  new search>")
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Open Contact", flag_error)
-        pass
-
-def WritePartner(btnProcessor,*args):
-    new_vals=[]
-    #Reading new value of the fields.
-    partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    contect_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    street = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-    street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
-    city = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4])
-    state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5])
-    country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
-    phone = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7])
-    mobile = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8])
-    fax = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
-    email = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
-    zip = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    if contect_name.strip() == "":
-        win32ui.MessageBox("Please enter partner Contact Name name.", "Open Contact", flag_excl)
-        return
-    new_vals.append(['partner',partner])
-    new_vals.append(['name',contect_name])
-    new_vals.append(['street',street])
-    new_vals.append(['street2',street2])
-    new_vals.append(['city',city])
-    new_vals.append(['phone',phone])
-    new_vals.append(['mobile',mobile])
-    new_vals.append(['email',email])
-    new_vals.append(['fax',fax])
-    new_vals.append(['zip',zip])
-    new_vals.append(['state',state])
-    new_vals.append(['country',country])
-    new_vals.append(['state',state])
-    flag = 0
-    try:
-        #writing the updated values to the Server.
-        flag = NewConn.WritePartnerValues(new_vals)
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Open Contact", flag_error)
-        pass
-    if flag == 1:
-        win32ui.MessageBox("Changes have been Updated Successfully.", "Open Contact", flag_info)
-    elif flag == 0:
-        win32ui.MessageBox("Error in Updating the Changes.\n Please check the Database Connection.", "Open Contact", flag_error)
-    elif flag == -1:
-        win32ui.MessageBox("Contact can not be Save.\nFirst select partner using Search.","Open Contact", flag_info)
-
-def SetPartnerNameColumn(listProcessor,*args):
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Partner Name"
-    lvc.cx = 275
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    partners = list(NewConn.GetPartners(''))
-    win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-    if not partners:
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-        win32ui.MessageBox("No Partner found with name {0}.".format(search_partner),"Search Partner",flag_error)
-    for partner in partners[::-1]:
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=partner[1],iItem = num_items)
-        win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-
-    listProcessor.init_done = True
-
-def SelectPartnerFromList(btnProcessor,*args):
-
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel_text = ''
-    if sel_count == 1:
-        sel=-1
-        for i in range(0,sel_count):
-            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-            sel_text = ''
-            for n in extra:
-                nombre = n.tostring()
-                sel_text = nombre[0:size]
-        global partner_ref
-        if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid partner selected.","Search Partner")
-            return
-        try:
-            partner_ref = str(sel_text)
-        except Exception:
-            pass
-        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        return
-    elif sel_count < 1:
-        win32ui.MessageBox("You should select one partner.","Search Partner")
-        return
-    else:
-        win32ui.MessageBox("Multiple Selection is not allowed.","Search Partner")
-        return
-
-def SearchPartnerList(btnProcessor,*args):
-    b = check()
-    if not b:
-        return
-    try :
-        search_partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        #Searching the contact.
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        partners = list(NewConn.GetPartners(search_partner))
-        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-        if not partners:
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-            win32ui.MessageBox("No Partner found with name {0}.".format(search_partner),"Search Partner",flag_error)
-        for partner in partners[::-1]:
-            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-            item = LVITEM(text=partner[1],iItem = num_items)
-            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Search Partner", flag_error)
-        pass
-
-def ConnectWebServer(btnProcessor, *args):
-	b = check()
-	if not b:
-		return
-	server = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-	webbrowser.open_new(str(server)+"\\openerp\\")
-
-
-def OpenPartnerForm(txtProcessor,*args):
-    import win32con
-    b = check()
-    if not b:
-    	return
-    #Acquiring control of the text box
-    partner_link = txtProcessor.GetControl()
-    #Reading Current Selected Email.
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    partner_text = ""
-    try:
-    	partner_text = ustr(mail.SenderName).encode('iso-8859-1')
-        sender_mail = ustr(mail.SenderEmailAddress).strip()
-    except Exception:
-    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
-    	pass
-    vals = NewConn.SearchPartner(sender_mail)
-    if not vals:
-        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Their is contact related to "+str(partner_text)+"  email address, but no partner is linked to contact>")
-        txtProcessor.init_done=True
-        return
-
-    if NewConn.getitem('_webserver') == "" or NewConn.getitem('_webserver') in ["http:\\\\","https:\\\\"]:
-    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
-    	txtProcessor.init_done=True
-    	return
-    try:
-        import urllib
-        next =  urllib.urlencode({'next' : '/openerp/form/view?model=res.partner&id=' +str(vals) })
-        weburl = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
-        linktopartner = weburl + '?' + next
-        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, str(linktopartner))
-    except Exception,e:
-    	win32ui.MessageBox("Error While Opening Partner.\n"+str(e),"Open Partner", flag_error)
-    webbrowser.open_new(linktopartner)
-    txtProcessor.init_done=True
-
-def SerachOpenDocuemnt(txtProcessor,*args):
-    import win32con
-    import win32ui
-    import win32com
-    from win32com.mapi import  mapitags
-    b = check()
-    if not b:
-        return
-#    global web_server
-#    global web_server_port
-    #Reading Current Selected Email.
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    #Acquiring control of the text box
-    link_box = txtProcessor.GetControl()
-    #Checking for the web server Parameters
-    if NewConn.getitem('_webserver') == "" or NewConn.getitem('_webserver') in ["http:\\\\","https:\\\\"]:
-        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
-        txtProcessor.init_done=True
-        return
-    linktodoc = ""
-    message_id = None
-    try:
-        session = win32com.client.Dispatch("MAPI.session")
-        session.Logon('Outlook')
-        objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
-        objFields = objMessage.Fields
-        strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
-        strheader = ustr(strheader).encode('iso-8859-1')
-        headers = {}
-        strheader = strheader.replace("\n ", " ").splitlines()
-        for line in strheader:
-            split_here = line.find(":")
-            headers[line[:split_here]] = line[split_here:]
-        temp1 = headers.get('Message-ID')
-        temp2 = headers.get('Message-Id')
-        if temp1 == None:    message_id = temp2
-        if temp2 == None:    message_id = temp1
-        startCut = message_id.find("<")
-        endCut = message_id.find(">")
-        message_id = message_id[startCut:endCut+1]
-    except Exception,e:
-        win32ui.MessageBox(str(e),"Open Document")
-    vals = NewConn.SearchEmailResources(message_id)
-    if vals == None:
-        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, "< Mail is still not archived.>")
-        txtProcessor.init_done=True
-        return
-    try:
-        import urllib
-        next =  urllib.urlencode({'next' : '/openerp/form/view?model='+vals[0][1]+'&id='+str(vals[1][1])})
-        weburl = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
-        linktodoc = weburl + '?' + next
-        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
-    except Exception,e:
-        win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)
-    webbrowser.open_new(linktodoc)
-    txtProcessor.init_done=True
-
-def SearchCountry(btnProcessor, *args):
-    b = check()
-    if not b:
-        return
-    try :
-        search_country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        #Searching the contact.
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        countries = list(NewConn.GetCountry(search_country))
-        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-        if not countries:
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-            win32ui.MessageBox("No country found with name {0}.".format(search_country),"Search Country",flag_error)
-        for country in countries:
-            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-            item = LVITEM(text=country[1],iItem = num_items)
-            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Search Country", flag_error)
-        pass
-
-def SetCountryList(listProcessor,*args):
-
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Country Name"
-    lvc.cx = 275
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    countries = list(NewConn.GetCountry(''))
-    win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-    if not countries:
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-        win32ui.MessageBox("No country found with name {0}.".format(search_country),"Search Country",flag_error)
-    for country in countries:
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=country[1],iItem = num_items)
-        win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-
-    listProcessor.init_done = True
-
-def SelectCountryFromList(btnProcessor,*args):
-
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel_text = ''
-    if sel_count == 1:
-        sel=-1
-        for i in range(0,sel_count):
-            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-            sel_text = ''
-            for n in extra:
-                nombre = n.tostring()
-                sel_text = nombre[0:size]
-        global country_ref
-        global new_con_country
-        global search_country
-        if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid country selected.","Search Country")
-            return
-        try:
-            country_ref = str(sel_text)
-            new_con_country = str(sel_text)
-            search_country = str(sel_text)
-        except Exception:
-            pass
-        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        return
-    elif sel_count < 1:
-        win32ui.MessageBox("You must one country.","Search Country")
-        return
-    else:
-        win32ui.MessageBox("Multiple selection is not allowed.","Search Country")
-        return
-
-def SearchState(btnProcessor, *args):
-    b = check()
-    if not b:
-        return
-    try :
-        global new_con_country
-        global search_country
-        search_state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        #Searching the contact.
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        states = list(NewConn.GetStates(search_state, search_country))
-        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-        if not states:
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-            win32ui.MessageBox("No state found with name {0}.".format(search_state),"Search Fed.State",flag_error)
-        for state in states:
-            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-            item = LVITEM(text=state[1],iItem = num_items)
-            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Search Fed.State", flag_error)
-        pass
-
-def SetStateList(listProcessor,*args):
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Fed.State Name"
-    lvc.cx = 275
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    global new_con_country
-    global search_country
-    states = list(NewConn.GetStates('', search_country))
-    win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-    if not states:
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-        win32ui.MessageBox("No state found with name {0}.".format(search_state),"Search Fed.State",flag_error)
-    for state in states:
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=state[1],iItem = num_items)
-        win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    listProcessor.init_done = True
-
-def SelectStateFromList(btnProcessor,*args):
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel_text = ''
-    if sel_count == 1:
-        sel=-1
-        for i in range(0,sel_count):
-            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-            sel_text = ''
-            for n in extra:
-                nombre = n.tostring()
-                sel_text = nombre[0:size]
-        global state_ref
-        global new_con_state
-        if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid fed. state selected.","Search Fed.State")
-            return
-        try:
-            state_ref = str(sel_text)
-            new_con_state = str(sel_text)
-            win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        except Exception:
-            pass
-
-        return
-    elif sel_count < 1:
-        win32ui.MessageBox("You must select state.","Search Fed.State")
-        return
-    else:
-        win32ui.MessageBox("Multiple selection is not allowed.","Search Fed.State")
-        return
-
-def SetWebDefaultVals(txtProcessor,*args):
-    import win32con
-    #Acquiring control of the text box
-    chk_hwnd =  win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-    try:
-        web_server = NewConn.getitem('_webserver')
-        web_port =  NewConn.getitem('_webport')
-        web_protocol =  NewConn.getitem('_webprotocol')
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id, web_server)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], web_port)
-        if web_protocol == "https:\\\\":
-            win32gui.SendMessage(chk_hwnd , win32con.BM_SETCHECK, 1, 0);
-    except Exception, e:
-        txtProcessor.init_done=True
-    #Reading Current Selected Email.
-    txtProcessor.init_done=True
-
-def SetServerDefaultVals(txtProcessor,*args):
-    import win32con
-    select = 1
-    #Acquiring control of the text box
-    cbprotocol_hwnd =  win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-    try:
-        web_server = NewConn.getitem('_server')
-        web_port =  NewConn.getitem('_port')
-        web_protocol =  NewConn.getitem('protocol')
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id, web_server)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], web_port)
-        if web_protocol == "XML-RPCS":
-            select = 2
-        win32gui.SendMessage(cbprotocol_hwnd, win32con.CB_SETCURSEL, select, 0)
-    except Exception, e:
-        txtProcessor.init_done=True
-    #Reading Current Selected Email.
-    txtProcessor.init_done=True
-
-dialog_map = {
-                "IDD_MANAGER" :            (
-                    (CancelButtonProcessor,    "IDCANCEL", resetConnAttribs, ()),
-                    (TabProcessor,             "IDC_TAB IDC_LIST",
-                                               """IDD_GENERAL IDD_OBJECT_SETTINGS IDD_ABOUT"""),
-                    (DoneButtonProcessor,      "ID_DONE"),
-                ),
-
-                "IDD_GENERAL":             (
-                    (DBComboProcessor,          "ID_DB_DROPDOWNLIST", GetConn, ()),
-                    (TextProcessor,             "ID_SERVER_PORT ID_USERNAME ID_PASSWORD IDET_WED_SERVER", SetAllText, ()),
-                    (CommandButtonProcessor,    "ID_BUT_TESTCONNECTION ID_DB_DROPDOWNLIST ID_USERNAME \
-                                                ID_PASSWORD", TestConnection, ()),
-                    (DialogCommand,             "IDC_BUT_SET_SERVER_PORT", "IDD_SERVER_PORT_DIALOG"),
-                    (DialogCommand,            "ID_SET_WEB_CONNECTION", "IDD_WEB_SERVER_PORT_DIALOG" ),
-                	(CommandButtonProcessor,	"IDPB_WEB_CONNECTION IDET_WED_SERVER",  ConnectWebServer, ()),
-                ),
-
-                "IDD_OBJECT_SETTINGS" :    (
-                    (CommandButtonProcessor,   "IDC_BUT_LOAD_IMAGE IDC_IMAGE_PATH", GetImagePath, ()),
-                    (CommandButtonProcessor,   "IDC_BUT_SAVE_OBJECT IDC_OBJECT_TITLE IDC_OBJECT_NAME \
-                                                IDC_IMAGE_PATH IDC_LIST", AddNewObject, ()),
-                    (CommandButtonProcessor,   "IDC_BUT_DEL_OBJECT IDC_LIST", DeleteSelectedObjects, ()),
-                    (ListBoxProcessor,         "IDC_LIST", SetDefaultList, ())
-                ),
-
-                "IDD_ABOUT" :              (
-                    (ImageProcessor,          "IDB_OPENERPLOGO"),
-                    (MessageProcessor,        "IDC_ABOUT"),
-                ),
-
-                "IDD_SERVER_PORT_DIALOG" : (
-                    (TextProcessor,           "ID_SERVER ID_PORT ID_DROPDOWNLIST_PROTOCOL", SetServerDefaultVals, ()),
-                    (ProtocolComboProcessor,  "ID_DROPDOWNLIST_PROTOCOL", GetConn, ()),
-                    (CloseButtonProcessor,    "IDCANCEL"),
-                    (OKButtonProcessor,       "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL ID_DROPDOWNLIST_PROTOCOL"),
-#
-#                    (RadioButtonProcessor,    "IDR_XML_PROTOCOL", GetConn, ()),
-#                    (RadioButtonProcessor,    "IDR_XMLS_PROTOCOL", GetConn, ()),
-#                    (RadioButtonProcessor,    "IDR_NETRPC_PROTOCOL", GetConn, ()),
-                ),
-
-                "IDD_SYNC" :               (
-                    (CommandButtonProcessor,    "ID_SEARCH ID_SEARCH_TEXT IDC_NAME_LIST", SearchObjectsForText,()),
-                    (GroupProcessor,            "IDC_STATIC_GROUP", setCheckList, ()),
-                    (CSComboProcessor,          "ID_ATT_METHOD_DROPDOWNLIST", GetConn,()),
-                    (DialogCommand,             "ID_CREATE_CONTACT ID_SEARCH_TEXT", "IDD_NEW_CONTACT_DIALOG", set_search_text, ()),
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (CommandButtonProcessor,    "ID_MAKE_ATTACHMENT IDC_NAME_LIST IDD_SYNC", MakeAttachment, ()),
-                    (CommandButtonProcessor,    "ID_CREATE_CASE ID_ATT_METHOD_DROPDOWNLIST IDC_NAME_LIST IDD_SYNC", CreateCase, ()),
-                    (ListBoxProcessor,          "IDC_NAME_LIST", SetNameColumn, ()),
-                    (TextProcessor,             "ID_SEARCH_TEXT ID_SEARCH_TEXT IDC_NAME_LIST", GetSearchText, ()),
-
-                ),
-
-                "IDD_NEW_CONTACT_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (CommandButtonProcessor,    "ID_CONTACT_SAVE_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_CONTACT_OFFICE_TEXT ID_CONTACT_MOBILE_TEXT ID_FAX_TEXT ID_STREET_TEXT ID_STREET2_TEXT ID_PARTNER_CITY_TEXT ID_ZIP_TEXT ID_PARTNER_TEXT IDET_NC_PARTNER_STATE IDET_NC_PARTNER_COUNTRY", CreateContact, ()),
-                    (TextProcessor,             "ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_PARTNER_TEXT IDET_NC_PARTNER_STATE IDET_NC_PARTNER_COUNTRY" , SetDefaultContact, ()),
-                    (DialogCommand,             "ID_NEW_PARTNER_BUTTON", "IDD_SELECT_PARTNER"),
-                    (DialogCommand,             "IDPB_NEW_PARTNER_BUTTON", "IDD_NEW_PARTNER_DIALOG"),
-                    (DialogCommand,             "IDPB_NC_SEARCH_STATE1", "IDD_SELECT_STATE"),
-                    (DialogCommand,             "IDPB_NC_SEARCH_COUNTRY1", "IDD_SELECT_COUNTRY"),
-                ),
-
-                "IDD_NEW_PARTNER_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (CommandButtonProcessor,    "ID_SAVE_PARTNER_BUTTON ID_PARTNER_NAME_TEXT", CreatePartner, ()),
-                ),
-
-                "IDD_VIEW_PARTNER_DIALOG" : (
-                    (TextProcessor,             "IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", GetDefaultEmail, ()),
-                    (CommandButtonProcessor,    "IDPB_SEARCH_PARTNER IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", SearchPartner, ()),
-                    (CommandButtonProcessor,    "IDPB_WRITE_CHANGES IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_STATE IDET_PARTNER_COUNTRY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP", WritePartner, ()),
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (DialogCommand,             "ID_NEW_PART_BUTTON", "IDD_SELECT_PARTNER" ),
-                    (DialogCommand,             "IDPB_NEWPARTNER_BUTTON" , "IDD_NEW_CONTACT_DIALOG"),
-                    (DialogCommand,             "IDPB_NEW_PART_BUTTON", "IDD_NEW_PARTNER_DIALOG"),
-                    (DialogCommand,             "IDPB_SEARCH_COUNTRY1", "IDD_SELECT_COUNTRY"),
-                    (DialogCommand,             "IDPB_SEARCH_STATE1", "IDD_SELECT_STATE"),
-
-                ),
-                "IDD_SELECT_PARTNER" : (
-                    (ListBoxProcessor,          "IDC_LIST_PARTNER" ,SetPartnerNameColumn, ()),
-                    (CommandButtonProcessor,    "IDPB_PARTNER_SEARCH IDET_PARTNER_SEARCH_NAME IDC_LIST_PARTNER", SearchPartnerList,()),
-                    (CommandButtonProcessor,    "IDPB_SELECT_PARTNER IDC_LIST_PARTNER IDD_SELECT_PARTNER" , SelectPartnerFromList,()),
-                    (DialogCommand,             "IDPB_CREATE_NEW_PARTNER" , "IDD_NEW_PARTNER_DIALOG")
-                ),
-                "IDD_OPEN_PARTNER_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                	(TextProcessor,             "IDET_PARTNER_LINK_TEXT", OpenPartnerForm, ()),
-                ),
-                "IDD_OPEN_DOCUEMNT_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (TextProcessor,             "IDEB_OPENDOC_LINK_TEXT", SerachOpenDocuemnt,()),
-                ),
-                "IDD_WEB_SERVER_PORT_DIALOG" :(
-                     (TextProcessor,             "IDET_WEB_SERVER IDET_WEB_PORT IDCB_WEB_SECURE", SetWebDefaultVals, ()),
-                     (CloseButtonProcessor,      "IDCANCEL"),
-                     (WEBOKButtonProcessor,      "ID_WEB_OK IDET_WEB_SERVER IDET_WEB_PORT IDCB_WEB_SECURE"),
-                     (WEBCHKProcessor,           "IDCB_WEB_SECURE"),
-
-                ),
-                "IDD_SELECT_COUNTRY" : (
-                    (CommandButtonProcessor,     "IDPB_SEARCH_COUNTRY IDET_COUNTRY_SEARCH_NAME IDC_LIST_COUNTRY" , SearchCountry, ()),
-                    (ListBoxProcessor,           "IDC_LIST_COUNTRY" ,SetCountryList, ()),
-                    (CommandButtonProcessor,    "IDPB_SELECT_COUNTRY IDC_LIST_COUNTRY IDD_SELECT_COUNTRY" , SelectCountryFromList,()),
-                ),
-                "IDD_SELECT_STATE" : (
-                    (CommandButtonProcessor,     "IDPB_STATE_SEARCH IDET_STATE_SEARCH_NAME IDC_LIST_STATE" , SearchState, ()),
-                    (ListBoxProcessor,           "IDC_LIST_STATE" ,SetStateList, ()),
-                    (CommandButtonProcessor,     "IDPB_SELECT_STATE IDC_LIST_STATE IDD_SELECT_STATE" , SelectStateFromList,()),
-                ),
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
deleted file mode 100644
index bce802b5ed1..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# A core, data-driven dialog.
-# Driven completely by "Control Processor" objects.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-import win32gui, win32api, win32con
-import commctrl
-import struct, array
-
-from dlgutils import *
-# Isolate the nasty stuff for tooltips somewhere.
-class TooltipManager:
-    def __init__(self, dialog):
-        self.dialog = dialog
-        self.hwnd_tooltip = None
-        self.tooltip_tools = {}
-
-    def HideTooltip(self):
-        if self.hwnd_tooltip is not None:
-            win32gui.SendMessage(self.hwnd_tooltip, commctrl.TTM_TRACKACTIVATE, 0, 0)
-
-    def ShowTooltipForControl(self, control_id, text):
-        # Note sure this tooltip stuff is quite right!
-        # Hide an existing one, so the new one gets created.
-        # (new one empty is no big deal, but hiding the old one is, so
-        # we get re-queried for the text.
-        hwnd_dialog = self.dialog.hwnd
-        self.HideTooltip()
-        if self.hwnd_tooltip is None:
-            TTS_BALLOON = 0x40
-            self.hwnd_tooltip = win32gui.CreateWindowEx(0, "tooltips_class32", None,
-                                    win32con.WS_POPUP | TTS_BALLOON,
-                                    win32con.CW_USEDEFAULT, win32con.CW_USEDEFAULT,
-                                    win32con.CW_USEDEFAULT, win32con.CW_USEDEFAULT,
-                                    hwnd_dialog, 0, 0, None)
-            # 80 chars max for our tooltip
-            # hrm - how to measure this in pixels!
-            win32gui.SendMessage(self.hwnd_tooltip,
-                                 commctrl.TTM_SETMAXTIPWIDTH,
-                                 0, 300)
-
-        format = "iiiiiiiiiii"
-        tt_size = struct.calcsize(format)
-        buffer = array.array("c", text + "\0")
-        text_address, size = buffer.buffer_info()
-        uID = control_id
-        flags = commctrl.TTF_TRACK | commctrl.TTF_ABSOLUTE
-        data = struct.pack(format, tt_size, flags, hwnd_dialog, uID, 0,0,0,0, 0, text_address, 0)
-
-        # Add a tool for this control only if we haven't already
-        if control_id not in self.tooltip_tools:
-            win32gui.SendMessage(self.hwnd_tooltip,
-                                 commctrl.TTM_ADDTOOL,
-                                 0, data)
-            self.tooltip_tools[control_id] = 1
-
-        control = win32gui.GetDlgItem(hwnd_dialog, control_id)
-        child_rect = win32gui.GetWindowRect(control)
-        xOff = yOff = 15 # just below and right of the control
-
-        win32gui.SendMessage(self.hwnd_tooltip,
-                             commctrl.TTM_TRACKPOSITION,
-                             0,
-                             MAKELONG(child_rect[0]+xOff, child_rect[1]+yOff))
-        win32gui.SendMessage(self.hwnd_tooltip,
-                             commctrl.TTM_TRACKACTIVATE,
-                             1,data)
-
-# A base dialog class, that loads from resources.  Has no real smarts.
-class Dialog:
-    def __init__(self, parent, parser, idd):
-        win32gui.InitCommonControls()
-        self.hinst = win32api.GetModuleHandle(None)
-        self.parent = parent
-        self.dialog_parser = parser
-        self.template = parser.dialogs[idd]
-
-    def _GetIDName(self, cid):
-        return self.dialog_parser.names.get(cid, str(cid))
-
-    def CreateWindow(self):
-        return self._DoCreate(win32gui.CreateDialogIndirect)
-
-    def DoModal(self):
-        return self._DoCreate(win32gui.DialogBoxIndirect)
-
-    def GetMessageMap(self):
-        ret = {
-            win32con.WM_COMMAND: self.OnCommand,
-            win32con.WM_NOTIFY: self.OnNotify,
-            win32con.WM_INITDIALOG: self.OnInitDialog,
-            win32con.WM_CLOSE: self.OnClose,
-            win32con.WM_DESTROY: self.OnDestroy,
-            win32con.WM_RBUTTONUP: self.OnRButtonUp,
-        }
-        return ret
-
-    def DoInitialPosition(self):
-        # centre the dialog
-        desktop = win32gui.GetDesktopWindow()
-        l,t,r,b = win32gui.GetWindowRect(self.hwnd)
-        w = r-l
-        h = b-t
-        dt_l, dt_t, dt_r, dt_b = win32gui.GetWindowRect(desktop)
-        centre_x, centre_y = win32gui.ClientToScreen( desktop, ( (dt_r-dt_l)/2, (dt_b-dt_t)/2) )
-        win32gui.MoveWindow(self.hwnd, centre_x-(w/2), centre_y-(h/2), w, h, 0)
-
-    def OnInitDialog(self, hwnd, msg, wparam, lparam):
-        self.hwnd = hwnd
-        self.DoInitialPosition()
-
-    def OnCommand(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnNotify(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnClose(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnDestroy(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnRButtonUp(self, hwnd, msg, wparam, lparam):
-        pass
-
-    def _DoCreate(self, fn):
-        message_map = self.GetMessageMap()
-        return win32gui.DialogBoxIndirect(self.hinst, self.template, self.parent, message_map)
-    # A couple of helpers
-    def GetDlgItem(self, id):
-        if type(id)==type(''):
-            id = self.dialog_parser.ids[id]
-        return win32gui.GetDlgItem(self.hwnd, id)
-    def SetDlgItemText(self, id, text):
-        hchild = self.GetDlgItem(id)
-        win32gui.SendMessage(hchild, win32con.WM_SETTEXT, 0, text)
-
-# A dialog with a tooltip manager
-class TooltipDialog(Dialog):
-    def __init__(self, parent, parser, idd):
-        Dialog.__init__(self, parent, parser, idd)
-        self.tt = TooltipManager(self)
-
-    def GetMessageMap(self):
-        ret = Dialog.GetMessageMap(self)
-        ret.update( {
-            win32con.WM_HELP: self.OnHelp,
-            win32con.WM_LBUTTONDOWN: self.OnLButtonDown,
-            win32con.WM_ACTIVATE: self.OnActivate,
-        })
-        return ret
-
-    def OnLButtonDown(self, hwnd, msg, wparam, lparam):
-        self.tt.HideTooltip()
-
-    def OnActivate(self, hwnd, msg, wparam, lparam):
-        self.tt.HideTooltip()
-
-    def OnDestroy(self, hwnd, msg, wparam, lparam):
-        self.tt.HideTooltip()
-
-    def OnHelp(self, hwnd, msg, wparam, lparam):
-        format = "iiiiiii"
-        buf = win32gui.PyMakeBuffer(struct.calcsize(format), lparam)
-        cbSize, iContextType, iCtrlId, hItemHandle, dwContextID, x, y = \
-                struct.unpack(format, buf)
-        tt_text = self.GetPopupHelpText(iCtrlId)
-        if tt_text:
-            self.tt.ShowTooltipForControl(iCtrlId, tt_text)
-        else:
-            self.tt.HideTooltip()
-        return 1
-
-    def GetPopupHelpText(self, control_id):
-        return None
-
-# A "Processor Dialog" works with Command Processors, to link Outlook-Plugin
-# options with control IDS, giving a "data driven" dialog.
-class ProcessorDialog(TooltipDialog):
-    def __init__(self, parent, manager, config, idd, option_handlers):
-        TooltipDialog.__init__(self, parent, manager.dialog_parser, idd)
-        parser = manager.dialog_parser
-        self.manager = manager
-        self.config = config
-        self.command_processors = {}
-        self.processor_message_map = {}
-        self.all_processors = []
-        for data in option_handlers:
-            klass = data[0]
-            id_names = data[1]
-            rest = data[2:]
-            ids = id_names.split()
-            int_ids = [ parser.ids[id] for id in ids]
-            instance = klass(self,int_ids, *rest)
-            self.all_processors.append(instance)
-            for int_id in int_ids:
-                self.command_processors[int_id] = instance
-            for message in instance.GetMessages():
-                existing = self.processor_message_map.setdefault(message, [])
-                existing.append(instance)
-
-    def GetMessageMap(self):
-        ret = TooltipDialog.GetMessageMap(self)
-        for key in self.processor_message_map.keys():
-            if key in ret:
-                print "*** WARNING: Overwriting message!!!"
-            ret[key] = self.OnCommandProcessorMessage
-        return ret
-
-    def OnInitDialog(self, hwnd, msg, wparam, lparam):
-        TooltipDialog.OnInitDialog(self, hwnd, msg, wparam, lparam)
-        if __debug__: # this is just a debugging aid
-            for int_id in self.command_processors:
-                try:
-                    self.GetDlgItem(int_id)
-                except win32gui.error:
-                    print "ERROR: Dialog item %s refers to an invalid control" % \
-                          self._GetIDName(int_id)
-        self.LoadAllControls()
-
-    def GetPopupHelpText(self, iCtrlId):
-        cp = self.command_processors.get(iCtrlId)
-        tt_text = None
-        if cp is not None:
-            return cp.GetPopupHelpText(iCtrlId)
-
-        print "Can not get command processor for", self._GetIDName(iCtrlId)
-        return None
-    def OnRButtonUp(self, hwnd, msg, wparam, lparam):
-        for cp in self.command_processors.values():
-            cp.OnRButtonUp(wparam,lparam)
-
-    def OnCommandProcessorMessage(self, hwnd, msg, wparam, lparam):
-        for p in self.processor_message_map[msg]:
-            p.OnMessage(msg, wparam, lparam)
-
-    # Called back by a processor when it changes an option.  We tell all other
-    # options on our page that the value changed.
-    def OnOptionChanged(self, changed_by, option):
-        for p in self.all_processors:
-            if p is not changed_by:
-                p.OnOptionChanged(option)
-
-
-    def OnDestroy(self, hwnd, msg, wparam, lparam):
-        for p in self.all_processors:
-            p.Term()
-        TooltipDialog.OnDestroy(self, hwnd, msg, wparam, lparam)
-        self.command_processors = None
-        self.all_processors = None
-        self.processor_message_map = None
-
-    def LoadAllControls(self):
-        for p in self.all_processors:
-            p.Init()
-
-    def ApplyHandlingOptionValueError(self, func, *args):
-        try:
-            return func(*args)
-        except ValueError, why:
-            mb_flags = win32con.MB_ICONEXCLAMATION | win32con.MB_OK
-            win32gui.MessageBox(self.hwnd, str(why), "OpenERP Configuration", mb_flags)
-            return False
-
-    def SaveAllControls(self):
-        for p in self.all_processors:
-            if not self.ApplyHandlingOptionValueError(p.Done):
-                win32gui.SetFocus(p.GetControl())
-                return False
-        return True
-
-    def OnClose(self, hwnd, msg, wparam, lparam):
-        if TooltipDialog.OnClose(self, hwnd, msg, wparam, lparam):
-            return 1
-        if not self.SaveAllControls():
-            return 1
-        win32gui.EndDialog(hwnd, 0)
-
-    def OnNotify(self, hwnd, msg, wparam, lparam):
-        # Parse the NMHDR
-        TooltipDialog.OnNotify(self, hwnd, msg, wparam, lparam)
-        format = "iii"
-        buf = win32gui.PyMakeBuffer(struct.calcsize(format), lparam)
-        hwndFrom, idFrom, code = struct.unpack(format, buf)
-        code += 0x4f0000 # hrm - wtf - commctrl uses this, and it works with mfc.  *sigh*
-        # delegate rest to our commands.
-        self._GetIDName(idFrom)
-        if self.command_processors is not None:
-            handler = self.command_processors.get(idFrom)
-            if handler is None:
-                print "Ignoring OnNotify for", self._GetIDName(idFrom)
-                return
-            return handler.OnNotify( (hwndFrom, idFrom, code), wparam, lparam)
-        return
-
-    def OnCommand(self, hwnd, msg, wparam, lparam):
-        TooltipDialog.OnCommand(self, hwnd, msg, wparam, lparam)
-        id = win32api.LOWORD(wparam)
-        # Sometimes called after OnDestroy???
-        if self.command_processors is None:
-            print "Ignoring OnCommand for", self._GetIDName(id)
-            return
-        else:
-            handler = self.command_processors.get(id)
-            if handler is None:
-                print "Ignoring OnCommand for", self._GetIDName(id)
-                return
-
-        self.ApplyHandlingOptionValueError(handler.OnCommand, wparam, lparam)
-
-class ProcessorPage(ProcessorDialog):
-    def __init__(self, parent, manager, config, idd, option_handlers, yoffset):
-        ProcessorDialog.__init__(self, parent, manager, config, idd,option_handlers)
-        self.yoffset = yoffset
-    def DoInitialPosition(self):
-        # The hardcoded values are a bit of a hack.
-        win32gui.SetWindowPos(self.hwnd, win32con.HWND_TOP, 1, self.yoffset, 0, 0, win32con.SWP_NOSIZE)
-    def CreateWindow(self):
-        # modeless. Pages should have the WS_CHILD window style
-        message_map = self.GetMessageMap()
-        # remove frame from dialog and make sure it is a child
-        self.template[0][2] = self.template[0][2] & ~(win32con.DS_MODALFRAME|win32con.WS_POPUP|win32con.WS_OVERLAPPED|win32con.WS_CAPTION)
-        self.template[0][2] = self.template[0][2] | win32con.WS_CHILD
-        return win32gui.CreateDialogIndirect(self.hinst, self.template, self.parent, message_map)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
deleted file mode 100644
index bede3cd63c2..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generic utilities for dialog functions.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-def MAKELONG(l,h):
-    return ((h & 0xFFFF) << 16) | (l & 0xFFFF)
-
-MAKELPARAM=MAKELONG
-
-def SetWaitCursor(wait):
-    import win32gui, win32con
-    if wait:
-        hCursor = win32gui.LoadCursor(0, win32con.IDC_WAIT)
-    else:
-        hCursor = win32gui.LoadCursor(0, 0)
-    win32gui.SetCursor(hCursor)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
deleted file mode 100644
index 0a129423e29..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
+++ /dev/null
@@ -1,320 +0,0 @@
-# Option Control Processors for our dialog.
-# These are extensions to basic Control Processors that are linked with
-# Outlook-Plugin options.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 win32gui, win32api, win32con, win32ui
-import commctrl
-import struct, array
-from dlgutils import *
-import xmlrpclib
-import processors
-verbose = 0 # set to 1 to see option values fetched and set.
-# A ControlProcessor that is linked up with options.  These get a bit smarter.
-class OptionControlProcessor(processors.ControlProcessor):
-    def __init__(self, window, control_ids):
-        processors.ControlProcessor.__init__(self, window, control_ids)
-
-    def GetPopupHelpText(self, idFrom):
-        doc = " ".join(self.option.doc().split())
-        if self.option.default_value:
-            doc += " (the default value is %s)" % self.option.default_value
-        return doc
-
-    # We override Init, and break it into 2 steps.
-    def Init(self):
-        self.UpdateControl_FromValue()
-
-    def Done(self):
-        self.UpdateValue_FromControl()
-        return True
-
-#    # Only sub-classes know how to update their controls from the value.
-    def UpdateControl_FromValue(self):
-        raise NotImplementedError
-    def UpdateValue_FromControl(self):
-        raise NotImplementedError
-
-class ComboProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-    def OnCommand(self, wparam, lparam):
-        code = win32api.HIWORD(wparam)
-        if code == win32con.CBN_SELCHANGE:
-            self.UpdateValue_FromControl()
-    def Init(self):
-        self.UpdateControl_FromValue()
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-class DBComboProcessor(ComboProcessor):
-    def Init(self):
-        self.UpdateControl_FromValue()
-
-    def UpdateControl_FromValue(self):
-        combo = self.GetControl()
-        conn = self.func()
-        list = conn.GetDBList()
-        db = conn.getitem('_dbname')
-        if list == -1:
-            hinst = win32gui.dllhandle
-            parent = self.window.hwnd
-            dwStyle = win32con.WS_CHILD | win32con.WS_VISIBLE | win32con.WS_TABSTOP | win32con.WS_BORDER | \
-                        win32con.ES_AUTOHSCROLL | win32con.FF_ROMAN | win32con.FW_EXTRALIGHT
-
-            hwndImg = win32gui.CreateWindow (
-                                        "EDIT",
-                                        db,
-                                        dwStyle,
-                                        127,80,235,20,
-                                        parent,
-                                        7000,
-                                        0,
-                                        None);
-            self.active_control_id = 7000
-            win32gui.ShowWindow(combo, False)
-        else:
-            try:
-                txtbx = win32gui.GetDlgItem(self.window.hwnd, 7000)
-                win32gui.DestroyWindow(txtbx)
-            except Exception,e:
-                print "Exception : %s"%str(e)
-                pass
-            win32gui.ShowWindow(combo, True)
-            win32gui.SendMessage(combo, win32con.CB_RESETCONTENT,0, 0);
-            for item in list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
-            sel = win32gui.SendMessage(combo, win32con.CB_SELECTSTRING, 0, db)
-            dbb=win32gui.GetDlgItemText(self.window.hwnd, 2004)
-            if sel == -1:
-                win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 0, 0)
-            self.active_control_id = self.control_id
-
-    def UpdateValue_FromControl(self):
-        db = win32gui.GetDlgItemText(self.window.hwnd, self.active_control_id)
-        conn = self.func()
-        if conn.getitem('_dbname') != db:
-            conn.setitem('_dbname', db)
-            conn.setitem('_login', 'False')
-
-class PartnersComboProcessor(ComboProcessor):
-
-    def UpdateControl_FromValue(self):
-        from manager import ustr
-        import win32ui
-        combo = self.GetControl()
-        conn = self.func()
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT,0, 0);
-        id_list = {}
-        p_list=[]
-        try:
-            p_list = list(conn.GetPartners())
-            cnt=0
-            for item in p_list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, ustr(item[1]).encode('iso-8859-1'))
-                id_list[cnt] = item[0]
-                cnt+=1
-            conn.setitem('partner_id_list', str(id_list))
-            cnt = win32gui.SendMessage(combo, win32con.CB_GETCOUNT, 0, 0)
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1, 0)
-            return
-        except xmlrpclib.Fault,e:
-             msg = str(e.faultCode) or e.faultString or e.message or str(e)
-        except Exception,e:
-            msg = str(e)
-        win32ui.MessageBox(str(e),"Partners",win32con.MB_ICONEXCLAMATION)
-        win32gui.DestroyWindow(self.window.hwnd)
-
-    def UpdateValue_FromControl(self):
-        combo = self.GetControl()
-        conn = self.func()
-        sel = win32gui.SendMessage(combo, win32con.CB_GETCURSEL)
-        conn.setitem('sel_id', sel)
-
-class StateComboProcessor(ComboProcessor):
-
-     def Init(self):
-        self.UpdateControl_FromValue()
-
-     def UpdateControl_FromValue(self):
-        from manager import ustr
-        import win32ui
-        combo = self.GetControl()
-        conn = self.func()
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
-        id_list = {}
-        state_list=[]
-        try:
-            state_list = list(conn.GetAllState())
-            for item in state_list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, ustr(item[1]).encode('iso-8859-1'))
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1, 0)
-            cnt = win32gui.SendMessage(combo, win32con.CB_GETCOUNT, 0, 0)
-            return
-        except xmlrpclib.Fault,e:
-            msg = str(e.faultCode) or e.faultString or e.message or str(e)
-            win32ui.MessageBox(msg, "Open Partner")
-        except Exception,e:
-            win32ui.MessageBox(str(e), "Open Partner")
-     def UpdateValue_FromControl(self):
-        pass
-
-class CountryComboProcessor(ComboProcessor):
-
-     def Init(self):
-        self.UpdateControl_FromValue()
-
-     def UpdateControl_FromValue(self):
-        from manager import ustr
-        import win32ui
-        combo = self.GetControl()
-        conn = self.func()
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
-        id_list = {}
-        state_list=[]
-        try:
-            country_list = list(conn.GetAllCountry())
-            for item in country_list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, ustr(item[1]).encode('iso-8859-1'))
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1, 0)
-            cnt = win32gui.SendMessage(combo, win32con.CB_GETCOUNT, 0, 0)
-            return
-        except xmlrpclib.Fault,e:
-            msg = str(e.faultCode) or e.faultString or e.message or str(e)
-            win32ui.MessageBox(msg, "Open Partner")
-        except Exception,e:
-            win32ui.MessageBox(str(e), "Open Partner")
-     def UpdateValue_FromControl(self):
-        pass
-
-class CSComboProcessor(ComboProcessor):
-    def UpdateControl_FromValue(self):
-        combo = self.GetControl()
-        conn = self.func()
-        if str(conn.getitem('_iscrm')) == 'False':
-            win32gui.EnableWindow(combo, False)
-            return
-        try:
-            list=['CRM Lead']#, 'CRM Helpdesk', 'CRM Lead', 'CRM Meeting', 'CRM Opportunity', 'CRM Phonecall']
-            objlist = conn.GetAllObjects()
-            if'hr.applicant' in objlist:
-                list.append('HR Applicant')
-            if'project.issue' in objlist:
-                list.append('Project Issue')
-
-            win32gui.SendMessage(combo, win32con.CB_RESETCONTENT,0, 0);
-            for item in list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 0, 0)
-            return
-        except xmlrpclib.Fault,e:
-            win32ui.MessageBox(str(e.faultCode),"CRM Case",win32con.MB_ICONEXCLAMATION)
-        except Exception,e:
-            win32ui.MessageBox(str(e),"CRM Case",win32con.MB_ICONEXCLAMATION)
-
-    def UpdateValue_FromControl(self):
-        pass
-
-class TextProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-
-    def UpdateControl_FromValue(self):
-        args = (self,)+(self.window,) + self.args
-        self.func(*args)
-
-    def UpdateValue_FromControl(self):
-        pass
-
-class ListBoxProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-
-    def Init(self):
-        args = (self,)+(self.window,) + self.args
-        if not self.init_done:
-            self.func(*args)
-
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-class ListBoxProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-
-    def Init(self):
-        args = (self,)+(self.window,) + self.args
-        if not self.init_done:
-            self.func(*args)
-
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-class GroupProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-    def Init(self):
-        args = (self,)+(self.window,) + self.args
-        self.func(*args)
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-
-class ProtocolComboProcessor(ComboProcessor):
-    def Init(self):
-        self.UpdateControl_FromValue()
-
-    def UpdateControl_FromValue(self):
-        combo = self.GetControl()
-        list = ['XML-RPC', 'XML-RPCS']
-        win32gui.ShowWindow(combo, True)
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
-        for item in list:
-            win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
-        if sel == -1:
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 1, 0)
-        self.active_control_id = self.control_id
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
deleted file mode 100644
index 34af9e073a4..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# Control Processors for our dialog.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 win32gui, win32api, win32con
-import commctrl
-import struct, array
-from dlgutils import *
-import win32ui
-
-# Cache our leaky bitmap handles
-bitmap_handles = {}
-
-# A generic set of "ControlProcessors".  A control processor by itself only
-# does a few basic things.
-class ControlProcessor:
-    def __init__(self, window, control_ids):
-        self.control_id = control_ids[0]
-        self.other_ids = control_ids[1:]
-        self.window = window
-        self.init_done=False
-
-    def Init(self):
-        pass
-    def Done(self): # done with 'ok' - ie, save options.  May return false.
-        return True
-    def Term(self): # closing - can't fail.
-        pass
-    def GetControl(self, control_id = None):
-        control_id = control_id or self.control_id
-        try:
-            h = win32gui.GetDlgItem(self.window.hwnd, control_id)
-        except:
-            hparent = win32gui.GetParent(self.window.hwnd)
-            hparent = win32gui.GetParent(hparent)
-            h = win32gui.GetDlgItem(hparent, control_id)
-        return h
-    def GetPopupHelpText(self, idFrom):
-        return None
-    def OnCommand(self, wparam, lparam):
-        pass
-    def OnNotify(self, nmhdr, wparam, lparam):
-        pass
-    def GetMessages(self):
-        return []
-    def OnMessage(self, msg, wparam, lparam):
-        raise RuntimeError, "I don't hook any messages, so I shouldn't be called"
-    def OnOptionChanged(self, option):
-        pass
-    def OnRButtonUp(self, wparam, lparam):
-        pass
-
-class ImageProcessor(ControlProcessor):
-    def Init(self):
-        rcp = self.window.manager.dialog_parser;
-        bmp_id = int(win32gui.GetWindowText(self.GetControl()))
-        if bitmap_handles.has_key(bmp_id):
-            handle = bitmap_handles[bmp_id]
-        else:
-            import resources
-            mod_handle, mod_bmp, extra_flags = resources.GetImageParamsFromBitmapID(rcp, bmp_id)
-            load_flags = extra_flags|win32con.LR_COLOR|win32con.LR_SHARED
-            handle = win32gui.LoadImage(mod_handle, mod_bmp,win32con.IMAGE_BITMAP,0,0,load_flags)
-            bitmap_handles[bmp_id] = handle
-        win32gui.SendMessage(self.GetControl(), win32con.STM_SETIMAGE, win32con.IMAGE_BITMAP, handle)
-
-    def GetPopupHelpText(self, cid):
-        return None
-
-class ButtonProcessor(ControlProcessor):
-    def OnCommand(self, wparam, lparam):
-        code = win32api.HIWORD(wparam)
-        id = win32api.LOWORD(wparam)
-        if code == win32con.BN_CLICKED:
-            self.OnClicked(id)
-
-class RadioButtonProcessor(ControlProcessor):
-    def __init__(self, window, control_ids, func='', args=''):
-        self.func = func
-        self.args = args
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnCommand(self, wparam, lparam):
-        code = win32api.HIWORD(wparam)
-        id = win32api.LOWORD(wparam)
-        if code == win32con.BN_CLICKED:
-            text=win32gui.GetDlgItemText(self.window.hwnd, self.control_id)
-            conn = self.func()
-            conn.setitem('protocol', text)
-            p=conn.getitem('protocol')
-
-class CloseButtonProcessor(ButtonProcessor):
-    def OnClicked(self, id):
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class CancelButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        ControlProcessor.__init__(self, window, control_ids)
-    def OnClicked(self, id):
-        a=self.func(self.window)
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class CommandButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        # Bit of a hack - always pass the manager as the first arg.
-        self.id = id
-        args = (self, ) + self.args
-        self.func(*args)
-
-    def GetPopupHelpText(self, ctrlid):
-        assert ctrlid == self.control_id
-        doc = self.func.__doc__
-        if doc is None:
-            return ""
-        return " ".join(doc.split())
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
deleted file mode 100644
index c8bb6091839..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
+++ /dev/null
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
deleted file mode 100644
index cf3e416c209..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# Package that manages and defines dialog resources
-
-def GetImageParamsFromBitmapID(rc_parser, bmpid):
-    import os, sys
-    import win32gui, win32con, win32api
-    if type(bmpid)==type(0):
-        bmpid = rc_parser.names[bmpid]
-    int_bmpid = rc_parser.ids[bmpid]
-    # For both binary and source versions, we currently load from files.
-    # In future py2exe built binary versions we will be able to load the
-    # bitmaps directly from our DLL.
-    filename = rc_parser.bitmaps[bmpid]
-    if hasattr(sys, "frozen"):
-        # in our .exe/.dll - load from that.
-        if sys.frozen=="dll":
-            hmod = sys.frozendllhandle
-        else:
-            hmod = win32api.GetModuleHandle(None)
-        return hmod, int_bmpid, 0
-    else:
-        # source code - load the .bmp directly.
-        if not os.path.isabs(filename):
-            # In this directory
-            filename = os.path.join( os.path.dirname( __file__ ), filename)
-        return 0, filename, win32con.LR_LOADFROMFILE
-    assert 0, "not reached"
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
deleted file mode 100644
index 2bf0d1aec48..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
+++ /dev/null
@@ -1,224 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by dialogs.rc
-//
-#define IDD_MANAGER                     101
-#define IDD_TRAINING                    102
-#define IDD_FILTER                      103
-#define IDD_FILTER_NOW                  104
-#define IDD_FOLDER_SELECTOR             105
-#define IDD_ABOUT                    	106
-#define IDD_GENERAL                     108
-
-//#define IDD_FILTER_SPAM                 110
-#define IDD_FILTER_UNSURE               111
-#define IDD_DIAGNOSTIC                  113
-#define IDD_WIZARD                      114
-#define IDD_WIZARD_WELCOME              115
-#define IDD_WIZARD_FINISHED_UNTRAINED   116
-#define IDD_WIZARD_FOLDERS_REST         117
-#define IDD_WIZARD_FOLDERS_WATCH        118
-#define IDD_WIZARD_FINISHED_UNCONFIGURED 119
-#define IDD_WIZARD_FOLDERS_TRAIN        120
-#define IDD_WIZARD_TRAIN                121
-#define IDD_WIZARD_FINISHED_TRAINED     122
-#define IDD_WIZARD_TRAINING_IS_IMPORTANT 123
-#define IDD_WIZARD_FINISHED_TRAIN_LATER 124
-#define IDB_SBWIZLOGO                   125
-#define IDB_FOLDERS                     127
-#define IDC_PROGRESS                    1000
-#define IDC_PROGRESS_TEXT               1001
-#define IDC_STATIC_HAM                  1002
-#define IDC_STATIC_SPAM                 1003
-#define IDC_BROWSE_HAM                  1004
-#define IDC_BROWSE_SPAM                 1005
-#define IDC_START                       1006
-#define IDC_BUT_REBUILD                 1007
-#define IDC_BUT_RESCORE                 1008
-#define IDC_VERSION                     1009
-#define IDC_BUT_TRAIN_FROM_SPAM_FOLDER  1010
-#define IDC_BUT_TRAIN_TO_SPAM_FOLDER    1011
-#define IDC_BUT_TRAIN_NOW               1012
-#define IDC_BUT_FILTER_ENABLE           1013
-#define IDC_FILTER_STATUS               1014
-#define IDC_BUT_FILTER_DEFINE           1016
-#define IDC_BUT_ABOUT                   1017
-#define IDC_BUT_ACT_SCORE               1018
-#define IDC_BUT_ACT_ALL                 1019
-#define IDC_BUT_UNREAD                  1020
-#define IDC_BUT_UNSEEN                  1021
-#define IDC_SLIDER_CERTAIN              1023
-#define IDC_EDIT_CERTAIN                1024
-#define IDC_ACTION_CERTAIN              1025
-#define IDC_FOLDER_CERTAIN              1027
-#define IDC_BROWSE_CERTAIN              1028
-#define IDC_SLIDER_UNSURE               1029
-#define IDC_EDIT_UNSURE                 1030
-#define IDC_ACTION_UNSURE               1031
-#define IDC_FOLDER_UNSURE               1033
-#define IDC_BROWSE_UNSURE               1034
-#define IDC_TRAINING_STATUS             1035
-#define IDC_FOLDER_NAMES                1036
-#define IDC_BROWSE                      1037
-#define IDC_FOLDER_WATCH                1038
-#define IDC_BROWSE_WATCH                1039
-#define IDC_LIST_FOLDERS                1040
-#define IDC_BUT_SEARCHSUB               1041
-#define IDC_BUT_CLEARALL                1042
-#define IDC_STATUS1                     1043
-#define IDC_STATUS2                     1044
-#define IDC_BUT_NEW                     1046
-#define IDC_MARK_SPAM_AS_READ           1047
-#define IDC_SAVE_SPAM_SCORE             1048
-#define IDC_MARK_UNSURE_AS_READ         1051
-#define IDC_DELAY1_SLIDER               1056
-#define IDC_DELAY1_TEXT                 1057
-#define IDC_DELAY2_SLIDER               1058
-#define IDC_DELAY2_TEXT                 1059
-#define IDC_INBOX_TIMER_ONLY            1060
-#define IDC_VERBOSE_LOG                 1061
-#define IDB_OPENERPLOGO                 1062
-#define IDC_TAB                         1068
-#define IDC_BACK_BTN                    1069
-#define IDC_BUT_WIZARD                  1070
-#define IDC_SHOW_DATA_FOLDER            1071
-#define IDC_ABOUT_BTN                   1072
-#define IDC_BUT_RESET                   1073
-#define IDC_DEL_SPAM_RS                 1074
-#define IDC_RECOVER_RS                  1075
-#define IDC_FORWARD_BTN                 1077
-#define IDC_PAGE_PLACEHOLDER            1078
-#define IDC_BUT_SHOW_DIAGNOSTICS        1080
-#define IDC_BUT_PREPARATION             1081
-#define IDC_FOLDER_HAM                  1083
-#define IDC_BUT_UNTRAINED               1088
-#define IDC_BUT_TRAIN                   1089
-#define IDC_BUT_TIMER_ENABLED           1091
-#define IDC_WIZ_GRAPHIC                 1092
-#define IDC_BUT_VIEW_LOG                1093
-#define IDC_EDIT1                       1094
-#define IDC_STATISTICS                  1095
-
-#define ID_SERVER						2001
-#define ID_PORT							2002
-#define ID_SERVER_PORT					2003
-#define ID_DB_DROPDOWNLIST				2004
-#define ID_USERNAME						2005
-#define ID_PASSWORD						2006
-#define ID_BUT_TESTCONNECTION			2007
-#define ID_DONE							2008
-#define IDD_OBJECT_SETTINGS				2009
-#define IDC_BUT_LOAD_IMAGE				2010
-#define	IDC_BUT_SAVE_OBJECT				2011
-#define IDC_BUT_DEL_OBJECT				2012
-#define IDC_OBJECT_TITLE				2013
-#define IDC_OBJECT_NAME					2014
-#define IDC_IMAGE_PATH					2015
-#define IDC_LIST						2016
-#define IDC_HEADER						2017
-#define ID_CREATE_CONTACT				2018
-#define ID_MAKE_ATTACHMENT				2019
-#define ID_CREATE_CASE					2020
-#define IDC_BUT_SET_SERVER_PORT			2021
-#define IDD_SERVER_PORT_DIALOG			2022
-#define IDC_CHKBX						2023
-#define IDC_STATIC_GROUP				2024
-#define ID_ATT_METHOD_DROPDOWNLIST		2025
-#define IDC_NAME_LIST					2026
-#define IDD_ABOUT						2027
-#define IDC_ABOUT						2028
-#define IDC_CONTACT_LIST				2029
-#define ID_NAME_TEXT					2030
-#define IDD_NEW_CONTACT_DIALOG			2031
-#define ID_PARTNER_DROPDOWNLIST			2032
-#define ID_NEW_PARTNER_BUTTON			2033
-#define IDD_NEW_PARTNER_DIALOG			2034
-#define ID_SAVE_PARTNER_BUTTON			2035
-#define ID_PARTNER_NAME_TEXT			2036
-#define IDC_NAME_LIST1					2037
-#define IDC_RELOAD						2038
-#define ID_PROTOCOL_GRP					2040
-#define IDR_XML_PROTOCOL				2041
-#define IDR_XMLS_PROTOCOL				2042
-#define IDR_NETRPC_PROTOCOL				2043
-#define IDD_VIEW_PARTNER_DIALOG			2044
-#define IDET_PARTNER_NAME				2045
-#define IDET_PARTNER_CONTACT_NAME   	2046
-#define IDET_PARTNER_EMAIL				2047
-#define IDET_PARTNER_OFFICENO			2048
-#define	IDET_PARTNER_MOBILENO			2050
-#define IDET_SEARCH_PARTNER    			2051
-#define IDPB_SEARCH_PARTNER  			2052
-#define IDET_PARTNER_STREET				2053
-#define	IDET_PARTNER_STREET2			2054
-#define IDET_PARTNER_COUNTRY			2057
-#define IDET_PARTNER_FAX				2058
-#define IDPB_WRITE_CHANGES				2059
-#define ID_ALL_STATE_DROPDOWNLIST		2060
-#define ID_ALL_COUNTRY_DROPDOWNLIST		2061
-#define IDET_PARTNER_STATE				2062
-#define IDET_PARTNER_COUNTRY			2063
-#define IDET_PARTNER					2064
-//
-#define ID_STREET_TEXT					2062
-#define ID_STREET2_TEXT					2063
-#define ID_FED_STATE_DROPLIST			2064
-#define ID_COUNTRY_DROPLIST				2065
-#define ID_FAX_TEXT						2066
-#define ID_PARTNER_CITY_TEXT			2067
-#define ID_ZIP_TEXT						2068
-#define ID_PARTNER_DROPLIST				2069
-#define ID_NEW_PART_BUTTON				2070
-#define IDPB_NEWPARTNER_BUTTON			2071
-#define IDD_SELECT_PARTNER				2073
-#define IDC_LIST_PARTNER				2072
-#define IDPB_SELECT_PARTNER				2075
-#define IDET_PARTNER_SEARCH_NAME		2076
-#define IDPB_PARTNER_SEARCH				2077
-#define IDPB_CREATE_NEW_PARTNER			2078
-#define ID_PARTNER_TEXT					2079
-#define IDET_WED_SERVER					2080
-#define IDET_WEB_PORT					2081
-#define ID_SET_WEB_CONNECTION			2082
-#define IDPB_WEB_CONNECTION				2083
-#define IDD_OPEN_PARTNER_DIALOG			2084
-#define IDET_PARTNER_LINK_TEXT			2085
-#define IDEB_OPENDOC_LINK_TEXT			2086
-#define IDD_OPEN_DOCUEMNT_DIALOG		2087
-#define IDD_WEB_SERVER_PORT_DIALOG		2088
-#define IDET_WEB_SERVER					2089
-#define IDET_WEB_PORT					2090
-#define ID_WEB_OK						2091
-#define IDPB_NEW_PARTNER_BUTTON			2092
-#define IDPB_NEW_PART_BUTTON			2093
-#define	IDD_SELECT_COUNTRY				2094
-#define IDET_COUNTRY_SEARCH_NAME		2095
-#define IDC_LIST_COUNTRY				2096
-#define IDPB_SELECT_COUNTRY				2097
-#define IDPB_SEARCH_COUNTRY				2098
-#define	IDD_SELECT_STATE				2099
-#define IDET_STATE_SEARCH_NAME			2100
-#define IDC_LIST_STATE					2101
-#define IDPB_SELECT_STATE				2102
-#define IDPB_SEARCH_STATE				2103
-#define IDPB_SEARCH_STATE1				2104
-#define IDPB_SEARCH_COUNTRY1			2105
-
-#define IDET_NC_PARTNER_STATE			2106
-#define IDPB_NC_SEARCH_STATE1			2107
-#define IDET_NC_PARTNER_COUNTRY			2108
-#define IDPB_NC_SEARCH_COUNTRY1			2109
-#define ID_DROPDOWNLIST_PROTOCOL		2110
-#define IDCB_WEB_SECURE					2111
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        128
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1096
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
-
-
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
deleted file mode 100644
index e1e8bac21d7..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.py
-#This is a generated file. Please edit C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.rc instead.
-_rc_size_=16350
-_rc_mtime_=1296608638
-class FakeParser:
-	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, 'Connection Parameters', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 154, 40), 1344339971], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 343, 32), 1342177287], [130, 'Title:', -1, (5, 16, 30, 17), 1342177280], [129, '', 2013, (22, 14, 57, 12), 1350631552], [130, 'Document Name:', -1, (83, 16, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image:', -1, (200, 16, 22, 17), 1342177280], [129, '', 2015, (223, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (289, 13, 50, 15), 1342242816], [128, 'Add', 2011, (350, 13, 38, 15), 1342242816], [128, 'Delete', 2012, (392, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 80), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 50, 45, 14), 1342242816], [128, 'OK', 2091, (50, 50, 50, 14), 1342242817], [128, 'SSL (https)', 2111, (20, 35, 100, 14), 1342242819]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 134, 50, 15), 1342177280], [129, '', 2106, (76, 135, 54, 12), 1350568064], [128, 'Search', 2107, (135, 136, 40, 12), 1342242816], [130, 'Country :', -1, (18, 121, 35, 15), 1342177280], [129, '', 2108, (76, 122, 54, 12), 1350568064], [128, 'Search', 2109, (135, 121, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 90), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (45, 3, 100, 12), 1350631552], [130, '  Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (45, 18, 100, 12), 1350631552], [128, '', 2024, (5, 35, 150, 5), 1342177287], [130, 'Protocol Connection :', -1, (5, 45, 80, 17), 1342177280], [133, '', 2110, (75, 43, 75, 50), 1344339971], [128, 'Close', 2, (60, 70, 45, 14), 1342242816], [128, 'OK', 1, (110, 70, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a New Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a New Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
-	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'ID_DROPDOWNLIST_PROTOCOL': 2110, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDCB_WEB_SECURE': 2111, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
-	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 2110: 'ID_DROPDOWNLIST_PROTOCOL', 2111: 'IDCB_WEB_SECURE', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
-	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
-def ParseDialogs(s):
-	return FakeParser()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
deleted file mode 100644
index b402e4b7958..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ /dev/null
@@ -1,339 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "dialogs.h"
-
-IDB_OPENERPLOGO              BITMAP                  "OpenERP_Logo.bmp"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_MANAGER DIALOGEX 0, 0, 460, 260
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME
-CAPTION "OpenERP Configuration"
-FONT 8, "Tahoma", 1000, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "Close",ID_DONE,400,239,50,14//,WS_VISIBLE //| WS_TABSTOP
-    CONTROL         "",IDC_TAB,"SysTabControl32",0x0,8,7,440,228
-    CONTROL         "",IDC_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_REPORT | LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES,0,0,0,0
-END
-
-IDD_GENERAL DIALOGEX 0, 0, 430, 210
-STYLE DS_SETFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Connection Parameters"
-FONT 8, "Tahoma", 0, 0, 0x1
-BEGIN
-	GROUPBOX		"Connection Parameters",IDC_STATIC_GROUP, 10, 10,250,130
-    LTEXT           "Server   : ",IDC_STATIC,30,30,100,17
-    EDITTEXT        ID_SERVER_PORT,85,30,120,12,ES_READONLY | WS_VISIBLE | WS_TABSTOP// left top width height
-    PUSHBUTTON      "Change",IDC_BUT_SET_SERVER_PORT,210,30,30,13, WS_VISIBLE | WS_TABSTOP
-    LTEXT           "Database : ",IDC_STATIC,30,50,100,17
-    COMBOBOX        ID_DB_DROPDOWNLIST,85,50,154,40,CBS_DROPDOWNLIST |
-                    WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-
-    LTEXT           "Username : ",IDC_STATIC,30,70,100,17
-    EDITTEXT        ID_USERNAME,85,70,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP
-    LTEXT           "Password : ",IDC_STATIC,30,90,100,17
-    EDITTEXT        ID_PASSWORD,85,90,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
-    PUSHBUTTON      "Connect",ID_BUT_TESTCONNECTION,179,110,60,13, WS_VISIBLE | WS_TABSTOP
-
-	GROUPBOX		"WebServer Parameters",IDC_STATIC_GROUP, 270, 10,150,130
-    LTEXT           "Server : ",IDC_STATIC, 280, 30, 50, 15
-    EDITTEXT        IDET_WED_SERVER,310, 29, 90, 12,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "Change",ID_SET_WEB_CONNECTION, 295, 50, 50, 12 , WS_VISIBLE | WS_TABSTOP
-	PUSHBUTTON      "Connect",IDPB_WEB_CONNECTION, 350, 50, 50, 12 , WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_OBJECT_SETTINGS DIALOGEX 0, 0, 430, 210
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Documents Setting"
-FONT 8, "Tahoma", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Document Attributes",IDC_STATIC_GROUP, 2, 2, 343, 32
-
-    LTEXT           "Title:",IDC_STATIC,5,16,30,17
-    EDITTEXT        IDC_OBJECT_TITLE,22,14,57,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
-    LTEXT           "Document Name:",IDC_STATIC,83,16,60,17
-    EDITTEXT        IDC_OBJECT_NAME,138,14,57,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Image:",IDC_STATIC,200,16,22,17
-    EDITTEXT        IDC_IMAGE_PATH,223,14,57,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Load Image",IDC_BUT_LOAD_IMAGE,289,13,50,15,WS_TABSTOP
-    PUSHBUTTON      "Add",IDC_BUT_SAVE_OBJECT,350,13,38,15,WS_TABSTOP
-    PUSHBUTTON      "Delete",IDC_BUT_DEL_OBJECT,392,13,38,15,WS_TABSTOP
-    CONTROL         "List1",IDC_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,535,160
-END
-
-IDD_ABOUT DIALOGEX 0, 0, 430, 210
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "About"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    GROUPBOX        "About Plugin",IDC_STATIC,7,3,422,200
-    CONTROL         1062,IDB_OPENERPLOGO,"Static",SS_BITMAP | SS_REALSIZEIMAGE,60,30,20,20
-    LTEXT           "",IDC_ABOUT,80,90,300,100
-END
-
-IDD_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 90
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "OpenERP Connection"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Server : ",IDC_STATIC,5,3,150,17
-    EDITTEXT        ID_SERVER, 45, 3, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "  Port   : ",IDC_STATIC,5,18,100,17
-    EDITTEXT        ID_PORT, 45, 18, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-
-    GROUPBOX        "", IDC_STATIC_GROUP, 5, 35, 150, 5
-    LTEXT           "Protocol Connection :", IDC_STATIC, 5, 45, 80, 17
-    COMBOBOX        ID_DROPDOWNLIST_PROTOCOL, 75, 43, 75, 50, CBS_DROPDOWNLIST |WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-
-    PUSHBUTTON      "Close",IDCANCEL,60,70,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDOK,110,70,45,14,WS_TABSTOP
-END
-
-IDD_SYNC DIALOGEX 0, 0, 470, 320
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Push to OpenERP"
-FONT 8, "Tahoma", 1000, 0, 0x0
-BEGIN
-	GROUPBOX        "Link to an Existing Documents ", IDC_STATIC_GROUP, 8,5,250,290,WS_TABSTOP
-	LTEXT           "Search : ",IDC_STATIC,15,17,40,12
-	EDITTEXT        ID_SEARCH_TEXT,60,15,120,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
-    PUSHBUTTON   	"Search",ID_SEARCH,187,15,40,14,WS_TABSTOP
-	LTEXT           "Documents : ",IDC_STATIC,15,140,100,14
-    CONTROL         "List1",IDC_NAME_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | LVS_SHOWSELALWAYS | LVS_REPORT | WS_TABSTOP, 15,150,234,110
-    PUSHBUTTON      "Push",ID_MAKE_ATTACHMENT,160,270,85,14,WS_TABSTOP
-
-	GROUPBOX        " Create a New Document ", IDC_STATIC_GROUP, 263,5,202,100,WS_TABSTOP
-	LTEXT           "Type of Document : ",IDC_STATIC,266,25,100,12
-    COMBOBOX        ID_ATT_METHOD_DROPDOWNLIST,332,24,75,45,CBS_DROPDOWNLIST |
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Create",ID_CREATE_CASE,412,23,50,14,WS_TABSTOP
-
-	GROUPBOX        " Create a New Contact ", IDC_STATIC_GROUP, 263, 110,202,185,WS_TABSTOP
-	LTEXT           "Create a New Contact : ",IDC_STATIC,280,140,100,12
-    PUSHBUTTON   	"Create Contact",ID_CREATE_CONTACT,360,138,60,14,WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,385,300,60,14,WS_TABSTOP
-END
-
-IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 180
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Create a New Contact"
-FONT 8, "Tahoma", 1000, 0, 0x0
-BEGIN
-
-	LTEXT           "Select Partner : ",IDC_STATIC,13,20,50,17
-	EDITTEXT        ID_PARTNER_TEXT, 70, 18, 150, 12 , ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON   	"Search Partner",ID_NEW_PARTNER_BUTTON,225,17,60,14, WS_TABSTOP
-	PUSHBUTTON   	"New Partner",IDPB_NEW_PARTNER_BUTTON,290, 17, 50, 14, WS_TABSTOP
-
-    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,35,175,123
-	LTEXT           "Contact Name : ",IDC_STATIC, 18, 53, 100, 17
-	EDITTEXT        ID_CONTACT_NAME_TEXT, 76, 52, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Street : ",IDC_STATIC, 18, 67, 40, 17
-	EDITTEXT        ID_STREET_TEXT, 76, 66, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Street2 : ",IDC_STATIC, 18, 81, 40, 17
-	EDITTEXT        ID_STREET2_TEXT, 76, 80, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Zip : ",IDC_STATIC, 18, 94, 50, 17
-    EDITTEXT		ID_ZIP_TEXT,76, 93, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "City : ",IDC_STATIC, 18,106, 50, 17
-    EDITTEXT		ID_PARTNER_CITY_TEXT,76,107,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-
-
-    LTEXT           "Fed. State : ",IDC_STATIC,18, 134, 50, 15
-    EDITTEXT		IDET_NC_PARTNER_STATE, 76, 135, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-    PUSHBUTTON 		"Search", IDPB_NC_SEARCH_STATE1 ,135, 136, 40, 12, WS_TABSTOP
-
-	LTEXT           "Country :",IDC_STATIC, 18,121,35,15
-    EDITTEXT		IDET_NC_PARTNER_COUNTRY, 76, 122, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON 		"Search", IDPB_NC_SEARCH_COUNTRY1, 135, 121, 40, 12, WS_TABSTOP
-
-
-    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 35, 150, 123
-	LTEXT           "Office : ",IDC_STATIC,194, 53, 30, 17
-	EDITTEXT        ID_CONTACT_OFFICE_TEXT, 224, 52, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Mobile : ",IDC_STATIC,194, 67, 30, 17
-	EDITTEXT        ID_CONTACT_MOBILE_TEXT, 224, 66, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Fax : ",IDC_STATIC,194, 81, 30, 17
-	EDITTEXT        ID_FAX_TEXT, 224, 80, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Email  : ",IDC_STATIC, 194, 95, 30, 17
-	EDITTEXT        ID_CONTACT_EMAIL_TEXT, 224, 94, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-
-	PUSHBUTTON   	"Cancel",IDCANCEL,290,162,45,13, WS_TABSTOP
-	PUSHBUTTON   	"Save",ID_CONTACT_SAVE_BUTTON,240,162,45,13, WS_TABSTOP
-END
-
-IDD_NEW_PARTNER_DIALOG DIALOGEX 0, 0, 140,40
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Create a New Partner"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Name : ",IDC_STATIC,5,3,100,17
-    EDITTEXT        ID_PARTNER_NAME_TEXT,40,3,94,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Cancel",IDCANCEL,90,22,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "Save",ID_SAVE_PARTNER_BUTTON,40,22,45,14,WS_TABSTOP
-END
-
-IDD_VIEW_PARTNER_DIALOG DIALOGEX 0, 0, 350, 215
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Open Contact"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-	LTEXT           "Email ID : ",IDC_STATIC,32,17,40,12
-	EDITTEXT        IDET_SEARCH_PARTNER, 70, 15, 200, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON   	"Search Contact ",IDPB_SEARCH_PARTNER,280,15,60,14,WS_TABSTOP
-
-    LTEXT           "Partner Name : ",IDC_STATIC,13,42,50,17
-	EDITTEXT		IDET_PARTNER,70, 42, 150, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON   	"Search Partner",ID_NEW_PART_BUTTON,225,41,60,14, WS_TABSTOP
-	PUSHBUTTON   	"New Partner",IDPB_NEW_PART_BUTTON,290,41,50,14, WS_TABSTOP
-
-    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,65,175,125
-    LTEXT           "Contact Name : ",IDC_STATIC,18,83,50,17
-    EDITTEXT		IDET_PARTNER_CONTACT_NAME,76,82,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Street : ",IDC_STATIC,18,97,50,17
-    EDITTEXT		IDET_PARTNER_STREET,76,96,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Street2 : ",IDC_STATIC,18,112,50,17
-    EDITTEXT		IDET_PARTNER_STREET2, 76, 111, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT			"Zip : ",IDC_STATIC, 18, 126, 50,14
-	EDITTEXT		IDET_ZIP, 76, 125, 100, 12 , ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "City : ",IDC_STATIC,18,140,50,17
-    EDITTEXT		IDET_PARTNER_CITY,76,139,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-
-    LTEXT           "Fed. State : ",IDC_STATIC,18,154,50,17
-    EDITTEXT		IDET_PARTNER_STATE, 76, 153, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-    PUSHBUTTON 		"Search", IDPB_SEARCH_STATE1 ,135, 153, 40, 12, WS_TABSTOP
-
-	LTEXT           "Country :",IDC_STATIC, 18, 169, 35, 17
-    EDITTEXT		IDET_PARTNER_COUNTRY, 76, 168, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY1, 135, 168, 40, 12, WS_TABSTOP
-
-    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 65, 152, 125
-    LTEXT           "Phone : ",IDC_STATIC, 194, 83, 30, 17
-    EDITTEXT		IDET_PARTNER_OFFICENO, 224, 82, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Mobile : ",IDC_STATIC, 194, 97, 30, 17
-    EDITTEXT		IDET_PARTNER_MOBILENO, 224, 96, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Email : ",IDC_STATIC, 194, 111, 30, 17
-	EDITTEXT		IDET_PARTNER_FAX, 224, 110, 100, 12, ES_AUTOHSCROLL |ES_READONLY
-    LTEXT           "Fax : ",IDC_STATIC,194,125,30,17
-	EDITTEXT		IDET_PARTNER_EMAIL, 224, 124, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-
-	PUSHBUTTON		"Create a New Contact", IDPB_NEWPARTNER_BUTTON, 124, 195, 82, 14, WS_TABSTOP
-	PUSHBUTTON 		"Save", IDPB_WRITE_CHANGES, 213, 195, 60, 14, WS_TABSTOP
-    PUSHBUTTON      "Cancel", IDCANCEL, 281, 195, 60, 14, WS_TABSTOP
-END
-
-IDD_SELECT_PARTNER DIALOGEX 0, 0, 220, 250
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Partner"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-
-    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
-    EDITTEXT		IDET_PARTNER_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON 		"Search", IDPB_PARTNER_SEARCH, 160, 10, 50, 14, WS_TABSTOP
-
-    CONTROL         "List1",IDC_LIST_PARTNER,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
-	PUSHBUTTON 		"Create New Partner", IDPB_CREATE_NEW_PARTNER, 10, 230, 100, 14, WS_TABSTOP
-	PUSHBUTTON 		"Select", IDPB_SELECT_PARTNER, 170, 230, 40, 14, WS_TABSTOP
-END
-
-IDD_OPEN_PARTNER_DIALOG DIALOGEX 0, 0, 200,65
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Open Partner"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ",IDC_STATIC,5,3,190,25
-    EDITTEXT        IDET_PARTNER_LINK_TEXT,5,31,190,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Ok",IDCANCEL,150,45,45,13,WS_TABSTOP
-
-END
-
-IDD_OPEN_DOCUEMNT_DIALOG DIALOGEX 0, 0, 200,65
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Open Document"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ",IDC_STATIC,5,3,190,25
-    EDITTEXT        IDEB_OPENDOC_LINK_TEXT,5,31,190,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Ok",IDCANCEL,150,45,45,14,WS_TABSTOP
-END
-
-IDD_WEB_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 80
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "OpenERP Connection"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Server : ",IDC_STATIC,5,3,150,17
-    EDITTEXT        IDET_WEB_SERVER,40,3,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Port   : ",IDC_STATIC,5,18,100,17
-    EDITTEXT        IDET_WEB_PORT,40,18,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,110,50,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",ID_WEB_OK,50,50,50,14,WS_TABSTOP
-    PUSHBUTTON      "SSL (https)",IDCB_WEB_SECURE,20,35,100,14,BS_AUTOCHECKBOX | BST_CHECKED |WS_TABSTOP
-END
-
-IDD_SELECT_COUNTRY DIALOGEX 0, 0, 220, 250
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Country"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-
-    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
-    EDITTEXT		IDET_COUNTRY_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY, 160, 10, 50, 14, WS_TABSTOP
-    CONTROL         "List1",IDC_LIST_COUNTRY,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
-	PUSHBUTTON 		"Select", IDPB_SELECT_COUNTRY, 170, 230, 40, 14, WS_TABSTOP
-END
-
-IDD_SELECT_STATE DIALOGEX 0, 0, 220, 250
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Fed. State"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-
-    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
-    EDITTEXT		IDET_STATE_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON 		"Search", IDPB_STATE_SEARCH, 160, 10, 50, 14, WS_TABSTOP
-
-    CONTROL         "List1",IDC_LIST_STATE,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
-	PUSHBUTTON 		"Select", IDPB_SELECT_STATE, 170, 230, 40, 14, WS_TABSTOP
-END
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
deleted file mode 100644
index 1b7461953a1..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
+++ /dev/null
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
deleted file mode 100644
index 4e40d9e989a..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
+++ /dev/null
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
deleted file mode 100644
index 68d62fc7060..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# rc2py.py
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-__author__="Adam Walker"
-__doc__=""""
-Converts an .rc windows resource source file into a python source file
-with the same basic public interface as the rcparser module.
-"""
-import sys, os, stat
-import rcparser
-
-def convert(inputFilename = None, outputFilename = None):
-    """See the module doc string"""
-    if inputFilename is None:
-        inputFilename = "dialogs.rc"
-    if outputFilename is None:
-        outputFilename = "test.py"
-    rcp = rcparser.ParseDialogs(inputFilename)
-    in_stat = os.stat(inputFilename)
-
-    out = open(outputFilename, "wt")
-    out.write("#%s\n" % outputFilename)
-    out.write("#This is a generated file. Please edit %s instead.\n" % inputFilename)
-    out.write("_rc_size_=%d\n_rc_mtime_=%d\n" % (in_stat[stat.ST_SIZE], in_stat[stat.ST_MTIME]))
-    out.write("class FakeParser:\n")
-    out.write("\tdialogs = "+repr(rcp.dialogs)+"\n")
-    out.write("\tids = "+repr(rcp.ids)+"\n")
-    out.write("\tnames = "+repr(rcp.names)+"\n")
-    out.write("\tbitmaps = "+repr(rcp.bitmaps)+"\n")
-    out.write("def ParseDialogs(s):\n")
-    out.write("\treturn FakeParser()\n")
-    out.close()
-
-if __name__=="__main__":
-    if len(sys.argv)>1:
-        convert(sys.argv[1], sys.argv[2])
-    else:
-        convert()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
deleted file mode 100644
index ed20f80e3d4..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
+++ /dev/null
@@ -1,379 +0,0 @@
-# Windows dialog .RC file parser, by Adam Walker.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-__author__="Adam Walker"
-
-import sys, os, shlex
-import win32con
-#import win32gui
-import commctrl
-
-_controlMap = {"DEFPUSHBUTTON":0x80,
-               "PUSHBUTTON":0x80,
-               "Button":0x80,
-               "GROUPBOX":0x80,
-               "Static":0x82,
-               "CTEXT":0x82,
-               "RTEXT":0x82,
-               "LTEXT":0x82,
-               "LISTBOX":0x83,
-               "SCROLLBAR":0x84,
-               "COMBOBOX":0x85,
-               "EDITTEXT":0x81,
-               }
-
-_addDefaults = {"EDITTEXT":win32con.WS_BORDER,
-                "GROUPBOX":win32con.BS_GROUPBOX,
-                "LTEXT":win32con.SS_LEFT,
-                "DEFPUSHBUTTON":win32con.BS_DEFPUSHBUTTON,
-                "CTEXT":win32con.SS_CENTER,
-                "RTEXT":win32con.SS_RIGHT}
-
-defaultControlStyle = win32con.WS_CHILD | win32con.WS_VISIBLE
-class DialogDef:
-    name = ""
-    id = 0
-    style = 0
-    styleEx = None
-    caption = ""
-    font = "MS Sans Serif"
-    fontSize = 8
-    x = 0
-    y = 0
-    w = 0
-    h = 0
-    template = None
-    def __init__(self, n, i):
-        self.name = n
-        self.id = i
-        self.styles = []
-        self.stylesEx = []
-        self.controls = []
-        #print "dialog def for ",self.name, self.id
-    def createDialogTemplate(self):
-        t = None
-        self.template = [[self.caption, (self.x,self.y,self.w,self.h), self.style, self.styleEx, (self.fontSize, self.font)]]
-        # Add the controls
-        for control in self.controls:
-            self.template.append(control.createDialogTemplate())
-        return self.template
-
-class ControlDef:
-    id = ""
-    controlType = ""
-    subType = ""
-    idNum = 0
-    style = defaultControlStyle
-    label = ""
-    x = 0
-    y = 0
-    w = 0
-    h = 0
-    def __init__(self):
-        self.styles = []
-    def toString(self):
-        s = "<Control id:"+self.id+" controlType:"+self.controlType+" subType:"+self.subType\
-            +" idNum:"+str(self.idNum)+" style:"+str(self.style)+" styles:"+str(self.styles)+" label:"+self.label\
-            +" x:"+str(self.x)+" y:"+str(self.y)+" w:"+str(self.w)+" h:"+str(self.h)+">"
-        return s
-    def createDialogTemplate(self):
-        ct = self.controlType
-        if "CONTROL"==ct:
-            ct = self.subType
-        if ct in _addDefaults:
-            self.style |= _addDefaults[ct]
-        if ct in _controlMap:
-            ct = _controlMap[ct]
-        t = [ct, self.label, self.idNum, (self.x, self.y, self.w, self.h), self.style]
-        #print t
-        return t
-
-
-class RCParser:
-    next_id = 1001
-    dialogs = {}
-    _dialogs = {}
-    debugEnabled = False;
-    token = ""
-
-    def __init__(self):
-        self.ids = {"IDOK":1, "IDCANCEL":2, "IDC_STATIC": -1}
-        self.names = {1:"IDOK", 2:"IDCANCEL", -1:"IDC_STATIC"}
-        self.bitmaps = {}
-
-    def debug(self, *args):
-        if self.debugEnabled:
-            print args
-
-    def getToken(self):
-        self.token = self.lex.get_token()
-        self.debug("getToken returns:", self.token)
-        if self.token=="":
-            self.token = None
-        return self.token
-
-    def getCommaToken(self):
-        tok = self.getToken()
-        assert tok == ",", "Token '%s' should be a comma!" % tok
-
-    def loadDialogs(self, rcFileName):
-        """
-        RCParser.loadDialogs(rcFileName) -> None
-        Load the dialog information into the parser. Dialog Definations can then be accessed
-        using the "dialogs" dictionary member (name->DialogDef). The "ids" member contains the dictionary of id->name.
-        The "names" member contains the dictionary of name->id
-        """
-        hFileName = rcFileName[:-2]+"h"
-        try:
-            h = open(hFileName, "rU")
-            self.parseH(h)
-            h.close()
-        except OSError:
-            print "No .h file. ignoring."
-        f = open(rcFileName)
-        self.open(f)
-        self.getToken()
-        while self.token!=None:
-            self.parse()
-            self.getToken()
-        f.close()
-    def open(self, file):
-        self.lex = shlex.shlex(file)
-        self.lex.commenters = "//#"
-
-    def parseH(self, file):
-        lex = shlex.shlex(file)
-        lex.commenters = "//"
-        token = " "
-        while token is not None:
-            token = lex.get_token()
-            if token == "" or token is None:
-                token = None
-            else:
-                if token=='define':
-                    n = lex.get_token()
-                    i = int(lex.get_token())
-                    self.ids[n] = i
-                    if self.names.has_key(i):
-                        # ignore AppStudio special ones.
-                        if not n.startswith("_APS_"):
-                            print "Duplicate id",i,"for",n,"is", self.names[i]
-                    else:
-                        self.names[i] = n
-                    if self.next_id<=i:
-                        self.next_id = i+1
-
-    def parse(self):
-        deep = 0
-        if self.token == None:
-            more == None
-        elif "BEGIN" == self.token:
-            deep = 1
-            while deep!=0:
-                self.getToken()
-                if "BEGIN" == self.token:
-                    deep += 1
-                elif "END" == self.token:
-                    deep -= 1
-        elif "IDD_" == self.token[:4]:
-            possibleDlgName = self.token
-            #print "possible dialog:", possibleDlgName
-            self.getToken()
-            if "DIALOG" == self.token or "DIALOGEX" == self.token:
-                self.dialog(possibleDlgName)
-        elif "IDB_" == self.token[:4]:
-            possibleBitmap = self.token
-            self.getToken()
-            if "BITMAP" == self.token:
-                self.getToken()
-                if self.token=="MOVEABLE":
-                    self.getToken() # PURE
-                    self.getToken() # bmpname
-                bmf = self.token[1:-1] # quotes
-                self.bitmaps[possibleBitmap] = bmf
-                print "BITMAP", possibleBitmap, bmf
-                #print win32gui.LoadImage(0, bmf, win32con.IMAGE_BITMAP,0,0,win32con.LR_DEFAULTCOLOR|win32con.LR_LOADFROMFILE)
-
-    def addId(self, id_name):
-        if id_name in self.ids:
-            id = self.ids[id_name]
-        else:
-            id = self.next_id
-            self.next_id += 1
-            self.ids[id_name] = id
-            self.names[id] = id_name
-        return id
-
-    def lang(self):
-        while self.token[0:4]=="LANG" or self.token[0:7]=="SUBLANG" or self.token==',':
-            self.getToken();
-
-    def dialog(self, name):
-        dlg = DialogDef(name,self.addId(name))
-        assert len(dlg.controls)==0
-        self._dialogs[name] = dlg
-        extras = []
-        self.getToken()
-        while not self.token.isdigit():
-            self.debug("extra", self.token)
-            extras.append(self.token)
-            self.getToken()
-        dlg.x = int(self.token)
-        self.getCommaToken()
-        self.getToken() # number
-        dlg.y = int(self.token)
-        self.getCommaToken()
-        self.getToken() # number
-        dlg.w = int(self.token)
-        self.getCommaToken()
-        self.getToken() # number
-        dlg.h = int(self.token)
-        self.getToken()
-        while not (self.token==None or self.token=="" or self.token=="END"):
-            if self.token=="STYLE":
-                self.dialogStyle(dlg)
-            elif self.token=="EXSTYLE":
-                self.dialogExStyle(dlg)
-            elif self.token=="CAPTION":
-                self.dialogCaption(dlg)
-            elif self.token=="FONT":
-                self.dialogFont(dlg)
-            elif self.token=="BEGIN":
-                self.controls(dlg)
-            else:
-                break
-        self.dialogs[name] = dlg.createDialogTemplate()
-
-    def dialogStyle(self, dlg):
-        dlg.style, dlg.styles = self.styles( [], win32con.WS_VISIBLE | win32con.DS_SETFONT)
-    def dialogExStyle(self, dlg):
-        self.getToken()
-        dlg.styleEx, dlg.stylesEx = self.styles( [], 0)
-
-    def styles(self, defaults, defaultStyle):
-        list = defaults
-        style = defaultStyle
-
-        if "STYLE"==self.token:
-            self.getToken()
-        i = 0
-        Not = False
-        while ((i%2==1 and ("|"==self.token or "NOT"==self.token)) or (i%2==0)) and not self.token==None:
-            Not = False;
-            if "NOT"==self.token:
-                Not = True
-                self.getToken()
-            i += 1
-            if self.token!="|":
-                if self.token in win32con.__dict__:
-                    value = getattr(win32con,self.token)
-                else:
-                    if self.token in commctrl.__dict__:
-                        value = getattr(commctrl,self.token)
-                    else:
-                        value = 0
-                if Not:
-                    list.append("NOT "+self.token)
-                    self.debug("styles add Not",self.token, value)
-                    style &= ~value
-                else:
-                    list.append(self.token)
-                    self.debug("styles add", self.token, value)
-                    style |= value
-            self.getToken()
-        self.debug("style is ",style)
-
-        return style, list
-
-    def dialogCaption(self, dlg):
-        if "CAPTION"==self.token:
-            self.getToken()
-        self.token = self.token[1:-1]
-        self.debug("Caption is:",self.token)
-        dlg.caption = self.token
-        self.getToken()
-    def dialogFont(self, dlg):
-        if "FONT"==self.token:
-            self.getToken()
-        dlg.fontSize = int(self.token)
-        self.getCommaToken()
-        self.getToken() # Font name
-        dlg.font = self.token[1:-1] # it's quoted
-        self.getToken()
-        while "BEGIN"!=self.token:
-            self.getToken()
-    def controls(self, dlg):
-        if self.token=="BEGIN": self.getToken()
-        while self.token!="END":
-            control = ControlDef()
-            control.controlType = self.token;
-            #print self.token
-            self.getToken()
-            if self.token[0:1]=='"':
-                control.label = self.token[1:-1]
-                self.getCommaToken()
-                self.getToken()
-            elif self.token.isdigit():
-                control.label = self.token
-                self.getCommaToken()
-                self.getToken()
-            # msvc seems to occasionally replace "IDC_STATIC" with -1
-            if self.token=='-':
-                if self.getToken() != '1':
-                    raise RuntimeError, \
-                          "Negative literal in rc script (other than -1) - don't know what to do"
-                self.token = "IDC_STATIC"
-            control.id = self.token
-            control.idNum = self.addId(control.id)
-            self.getCommaToken()
-            if control.controlType == "CONTROL":
-                self.getToken()
-                control.subType = self.token[1:-1]
-                # Styles
-                self.getCommaToken()
-                self.getToken()
-                control.style, control.styles = self.styles([], defaultControlStyle)
-                #self.getToken() #,
-            # Rect
-            control.x = int(self.getToken())
-            self.getCommaToken()
-            control.y = int(self.getToken())
-            self.getCommaToken()
-            control.w = int(self.getToken())
-            self.getCommaToken()
-            self.getToken()
-            control.h = int(self.token)
-            self.getToken()
-            if self.token==",":
-                self.getToken()
-                control.style, control.styles = self.styles([], defaultControlStyle)
-            #print control.toString()
-            dlg.controls.append(control)
-def ParseDialogs(rc_file):
-    rcp = RCParser()
-    try:
-        rcp.loadDialogs(rc_file)
-    except:
-        lex = getattr(rcp, "lex", None)
-        if lex:
-            print "ERROR parsing dialogs at line", lex.lineno
-            print "Next 10 tokens are:"
-            for i in range(10):
-                print lex.get_token(),
-            print
-        raise
-
-    return rcp
-
-if __name__=='__main__':
-    rc_file = os.path.join(os.path.dirname(__file__), "dialogs.rc")
-    d = ParseDialogs(rc_file)
-    import pprint
-    for id, ddef in d.dialogs.items():
-        print "Dialog %s (%d controls)" % (id, len(ddef))
-        pprint.pprint(ddef)
-        print
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
deleted file mode 100644
index 47e66689c71..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/eml.py
+++ /dev/null
@@ -1,95 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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/>.
-#
-##############################################################################
-
- #!/usr/bin/python
- #-*- encoding: utf-8 -*-
-
-import sys
-import chilkat
-import os
-from manager import ustr
-import email
-cemail = chilkat.CkEmail()
-dt = chilkat.SYSTEMTIME()
-def generateEML(mail):
-    sub = (mail.Subject).replace(' ','')
-    body = mail.Body.encode("utf-8")
-    recipients = mail.Recipients
-    sender_email = mail.SenderEmailAddress
-    attachments=mail.Attachments
-
-    cemail = chilkat.CkEmail()
-    cemail.put_Subject (ustr(sub).encode('iso-8859-1'))
-    cemail.put_Body (ustr(body).encode('utf-8'))
-    cemail.put_FromAddress (ustr(sender_email).encode('iso-8859-1'))
-    cemail.put_From (ustr(sender_email).encode('iso-8859-1'))
-
-    for i in xrange(1, recipients.Count+1):
-        name = ustr(recipients.Item(i).Name).encode('iso-8859-1')
-        address = ustr(recipients.Item(i).Address).encode('iso-8859-1')
-        cemail.AddTo(name,address)
-
-    eml_name= ustr(sub).encode('iso-8859-1')+'-'+str(mail.EntryID)[-9:]
-    ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n']
-    mails_folder_path = os.path.abspath("%temp%\\dialogs\\resources\\mails\\")
-    attachments_folder_path = mails_folder_path + "\\attachments\\"
-    if not os.path.exists(attachments_folder_path):
-        os.makedirs(attachments_folder_path)
-    for i in xrange(1, attachments.Count+1):
-        fn = eml_name + '-' + ustr(attachments[i].FileName).encode('iso-8859-1')
-        for c in ls:
-            fn = fn.replace(c,'')
-        if len(fn) > 64:
-            l = 64 - len(fn)
-            f = fn.split('-')
-            fn = '-'.join(f[1:])
-            if len(fn) > 64:
-                l = 64 - len(fn)
-                f = fn.split('.')
-                fn = f[0][0:l] + '.' + f[-1]
-        att_file = os.path.join(attachments_folder_path, fn)
-        if os.path.exists(att_file):
-            os.remove(att_file)
-        attachments[i].SaveAsFile(att_file)
-        contentType = cemail.addFileAttachment(att_file)
-        if (contentType == None ):
-            print mail.lastErrorText()
-            sys.exit()
-
-
-    if not os.path.exists(mails_folder_path):
-        os.makedirs(mails_folder_path)
-    for c in ls:
-        eml_name = eml_name.replace(c,'')
-    if len(eml_name) > 64:
-       l = 64 - len(eml_name)
-       f = eml_name.split('-')
-       eml_name = f[0][0:l] + '.' + f[-1]
-    eml_path = ustr(os.path.join(mails_folder_path,eml_name+".eml")).encode('iso-8859-1')
-    success = cemail.SaveEml(eml_path)
-    fp = open(eml_path, 'rb')
-    new_mail = email.message_from_file(fp)
-    fp.close()
-    if (success == False):
-        print cemail.lastErrorText()
-        sys.exit()
-    return new_mail, eml_path
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
deleted file mode 100644
index 643a5c40e58..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/manager.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 os
-import sys
-import win32api, win32con
-import win32com.client
-import pythoncom
-
-try:
-    True, False
-except NameError:
-    # Maintain compatibility with Python 2.2
-    True, False = 1, 0
-
-try:
-    filesystem_encoding = sys.getfilesystemencoding()
-except AttributeError:
-    filesystem_encoding = "mbcs"
-
-# Work out our "application directory", which is
-# the directory of our main .py/.dll/.exe file we
-# are running from.
-if hasattr(sys, "frozen"):
-    assert sys.frozen == "dll", "outlook only supports inproc servers"
-    this_filename = win32api.GetModuleFileName(sys.frozendllhandle)
-else:
-    try:
-        this_filename = os.path.abspath(__file__)
-    except NameError: # no __file__ - means Py2.2 and __name__=='__main__'
-        this_filename = os.path.abspath(sys.argv[0])
-# See if we can use the new bsddb module. (The old one is unreliable
-# on Windows, so we don't use that)
-try:
-    import bsddb3 as bsddb
-    # bsddb3 is definitely not broken
-    use_db = True
-except ImportError:
-    # Not using the 3rd party bsddb3, so try the one in the std library
-    try:
-        import bsddb
-        use_db = hasattr(bsddb, "db") # This name is not in the old one.
-    except ImportError:
-        # No DB library at all!
-        assert not hasattr(sys, "frozen"), \
-               "Don't build binary versions without bsddb!"
-        use_db = False
-
-def ustr(value):
-    """This method is similar to the builtin `str` method, except
-    it will return Unicode string.
-
-    @param value: the value to convert
-
-    @rtype: unicode
-    @return: unicode string
-    """
-    if isinstance(value, unicode):
-        return value
-
-    if hasattr(value, '__unicode__'):
-        return unicode(value)
-    if not isinstance(value, str):
-        value = str(value)
-    try: # first try utf-8
-        return unicode(value, 'utf-8')
-    except:
-        pass
-
-    try: # then extened iso-8858
-        return unicode(value, 'iso-8859-15')
-    except:
-        pass
-    filesystem_encoding = sys.getfilesystemencoding()
-    d = unicode(value, filesystem_encoding)
-    return d
-
-class OpenERPManager:
-    def __init__(self, config_base="default", outlook=None, verbose=0):
-        self.outlook = outlook
-        self.dialog_parser = None
-        self.application_directory = os.path.dirname(this_filename)
-        self.windows_data_directory = self.LocateDataDirectory()
-        self.data_directory = self.windows_data_directory
-        self.default_objects = [('Partners','res.partner',''),('Account Invoices','account.invoice',''), \
-                                ('Products', 'product.product',''),('Sale Orders','sale.order',''), \
-                               ('Leads','crm.lead','')]
-
-        self.config=self.LoadConfig()
-
-    def WorkerThreadStarting(self):
-        pythoncom.CoInitialize()
-
-    def WorkerThreadEnding(self):
-        pythoncom.CoUninitialize()
-
-    def LocateDataDirectory(self):
-        # Locate the best directory for our data files.
-        from win32com.shell import shell, shellcon
-        try:
-            appdata = shell.SHGetFolderPath(0,shellcon.CSIDL_APPDATA,0,0)
-            path = os.path.join(appdata, "OpenERP-Plugin")
-            if not os.path.isdir(path):
-                os.makedirs(path)
-            return path
-        except pythoncom.com_error:
-            # Function doesn't exist on early win95,
-            # and it may just fail anyway!
-            return self.application_directory
-        except EnvironmentError:
-            # Can't make the directory.
-            return self.application_directory
-
-    def ShowManager(self, id="IDD_MANAGER"):
-        import dialogs
-        dialogs.ShowDialog(0, self, self.config, id)
-
-    def LoadConfig(self):
-        import win32ui
-        path = os.path.join(self.data_directory, 'tiny.ini')
-        data = {'server' : 'localhost', 'port' : '8069', 'protocol' : 'http://', 'database' : '', 'objects' : self.default_objects, 'uname':'admin', 'pwd':'a', 'login':False,'webserver':'localhost','webport':'8080', 'webprotocol' : 'http:\\'}
-        if os.path.exists(path):
-            fp = open(path, 'r')
-            data = fp.readlines()
-            try:
-                data = eval(data[0])
-                return data
-            except e:
-                return data
-        else:
-            return data
-
-    def SaveConfig(self):
-        path = os.path.join(self.data_directory, 'tiny.ini')
-        fp = open(path, 'w')
-        fp.write(str(self.config))
-        fp.close()
-_mgr = None
-
-def GetManager(outlook = None):
-    global _mgr
-    if _mgr is None:
-        if outlook is None:
-            outlook = win32com.client.Dispatch("Outlook.Application")
-        _mgr = OpenERPManager(outlook=outlook)
-    return _mgr
-
-def ShowManager(mgr):
-    mgr.c()
-
-def main(verbose_level = 1):
-    mgr = GetManager()
-    ShowManager(mgr)
-    return 0
-
-def usage():
-    print "Usage: manager [-v ...]"
-    sys.exit(1)
-
-if __name__=='__main__':
-    verbose = 1
-    import getopt
-    opts, args = getopt.getopt(sys.argv[1:], "v")
-    if args:
-        usage()
-    for opt, val in opts:
-        if opt=="-v":
-            verbose += 1
-        else:
-            usage()
-    sys.exit(main(verbose))
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/setup.iss b/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
deleted file mode 100644
index d19cc66f556..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
+++ /dev/null
@@ -1,105 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{AF02E62E-3A5A-4E86-B4CF-03F2B2AC25BF}
-AppName=Openerp Outlook Addin
-AppVersion=1.0
-AppVerName=Openerp Outlook Addin 1.0
-AppPublisher=Openerp SA
-AppPublisherURL=http://www.openerp.com/
-AppSupportURL=http://www.openerp.com/
-AppUpdatesURL=http://www.openerp.com/
-DefaultDirName={pf}\Openerp Outlook Addin
-DefaultGroupName=Openerp Outlook Addin
-DisableProgramGroupPage=true
-OutputBaseFilename=openerp-outlook-addin
-Compression=lzma
-SolidCompression=true
-UserInfoPage=true
-UninstallDisplayIcon={app}\*
-VersionInfoVersion=1.0
-VersionInfoCompany=OpenERP
-VersionInfoDescription=OpenERP Outlook Addin
-ChangesAssociations=true
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
-Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
-Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
-Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
-Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
-Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-
-[Files]
-Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Messages]
-AboutSetupNote=Inno Setup Preprocessor home page:%nhttp://ispp.sourceforge.net/
-
-
-[Run]
-Filename: "{app}\Register-plugin.bat"; StatusMsg: "Registering Outlook Addin";
-[UninstallDelete]
-Type: files; Name: "{app}\Openerp Outlook Addin\*"
-Type: dirifempty; Name: "{app}\Openerp Outlook Addin"
-
-[UninstallRun]
-Filename: "{app}\Unregister-plugin.bat"; StatusMsg: "Unregistering Outlook Addin";
-
-
-[Code]
-function InitializeSetup(): Boolean;
-begin
-    Result := true;
-
-    if not RegKeyExists( HKLM, 'Software\Python\PythonCore') then begin
-        Result := MsgBox(
-              'Python appears to not be installed.' + #13 + #13 +
-              'This addin requires Python 2.5 or above installed with compatible pywin32 for python for working.'+ #13 + #13 +
-              'If you know that Python is installed, you may with to continue.' + #13 + #13 +
-              'Continue with installation?',
-              mbConfirmation, MB_YESNO) = idYes;
-    end;
-    if not RegKeyExists( HKCU, 'Software\Microsoft\Office\Outlook') then begin
-        Result := MsgBox(
-              'Outlook appears to not be installed.' + #13 + #13 +
-              'This addin only works with Microsoft Outlook 2000 and later - it' + #13 +
-              'does not work with Outlook express.' + #13 + #13 +
-              'If you know that Outlook is installed, you may with to continue.' + #13 + #13 +
-              'Continue with installation?',
-              mbConfirmation, MB_YESNO) = idYes;
-    end;
-    while Result  do begin
-        if not CheckForMutexes('_outlook_mutex_') then
-            break;
-
-          Result := MsgBox(
-              'You must close Outlook before OpenERP Outlook Addin can be installed.' + #13 + #13 +
-              'Please close all Outlook Windows (using "File->Exit and Log off"' + #13 +
-              'if available) and click Retry, or click Cancel to exit the installation.'+ #13 + #13 +
-              'If this message persists after closing all Outlook windows, you may' + #13 +
-              'need to log off from Windows, and try again.',
-              mbConfirmation, MB_RETRYCANCEL) = idRetry;
-    end;
-end;
-
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
deleted file mode 100644
index 9cbcb14d40e..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ /dev/null
@@ -1,573 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 xmlrpclib
-import binascii
-import base64
-import sys
-import socket
-import os
-import time
-from manager import ustr
-from win32com.mapi import mapitags
-import pythoncom
-import win32com
-import win32ui
-waittime = 10
-wait_count = 0
-wait_limit = 12
-def execute(connector, method, *args):
-    global wait_count
-    res = False
-    try:
-        res = getattr(connector,method)(*args)
-    except socket.error,e:
-        if e.args[0] == 111:
-            if wait_count > wait_limit:
-               print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds."%(wait_limit)
-            clean()
-            sys.exit(1)
-            print 'Please wait %d sec to start server....'%(waittime)
-            wait_count += 1
-            time.sleep(waittime)
-            res = execute(connector, method, *args)
-        else:
-            return res
-    wait_count = 0
-    return res
-
-class XMLRpcConn(object):
-    __name__ = 'XMLRpcConn'
-    _com_interfaces_ = ['_IDTExtensibility2']
-    _public_methods_ = ['GetDBList', 'login', 'GetAllObjects', 'GetObjList', 'InsertObj', 'DeleteObject', 'GetCSList', \
-    'ArchiveToOpenERP', 'IsCRMInstalled', 'GetPartners', 'GetObjectItems', \
-    'CreateCase', 'MakeAttachment', 'CreateContact', 'CreatePartner', 'getitem', 'setitem', \
-    'SearchPartnerDetail', 'WritePartnerValues', 'GetAllState', 'GetAllCountry', 'SearchPartner', 'SearchEmailResources', \
-    'GetCountry', 'GetStates', 'FindCountryForState','CreateEmailAttachment','SearchPartners']
-    _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER
-    _reg_clsid_ = "{C6399AFD-763A-400F-8191-7F9D0503CAE2}"
-    _reg_progid_ = "Python.OpenERP.XMLRpcConn"
-    _reg_policy_spec_ = "win32com.server.policy.EventHandlerPolicy"
-    def __init__(self,server='localhost',port=8069,uri='http://localhost:8069',webserver='localhost', webport=8080):
-        self._server=server
-        self._port=port
-        self._uri=uri
-        self._webserver=webserver
-        self._webport=webport
-        self._obj_list=[]
-        self._dbname=''
-        self._uname='admin'
-        self._pwd='a'
-        self._login=False
-        self._running=False
-        self._uid=False
-        self._iscrm=True
-        self.partner_id_list=None
-        self.protocol=None
-        self._webprotocol=None
-        self._weburi=None
-
-    def getitem(self, attrib):
-        v=self.__getattribute__(attrib)
-        return str(v)
-
-    def setitem(self, attrib, value):
-    	return self.__setattr__(attrib, value)
-
-    def GetDBList(self):
-        conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/db')
-        try:
-            db_list = execute(conn, 'list')
-            if db_list == False:
-                self._running=False
-                return []
-            else:
-                self._running=True
-        except:
-            db_list=-1
-            self._running=True
-        return db_list
-
-    def login(self,dbname, user, pwd):
-        self._dbname = dbname
-        self._uname = user
-        self._pwd = pwd
-        conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
-        try:
-            uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
-        except:
-            return False
-        return uid
-
-    def GetAllObjects(self):
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
-        objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
-        obj_list = [item['model'] for item in objects]
-        return obj_list
-
-    def GetObjList(self):
-    	self._obj_list=list(self._obj_list)
-    	self._obj_list.sort(reverse=True)
-    	return self._obj_list
-
-    def InsertObj(self, obj_title,obj_name,image_path):
-    	self._obj_list=list(self._obj_list)
-    	self._obj_list.append((obj_title,obj_name,ustr(image_path)))
-    	self._obj_list.sort(reverse=True)
-
-    def DeleteObject(self,sel_text):
-    	self._obj_list=list(self._obj_list)
-    	for obj in self._obj_list:
-    		if obj[0] == sel_text:
-    			self._obj_list.remove(obj)
-    			break
-
-    def ArchiveToOpenERP(self, recs, mail):
-    	import win32con
-        import win32ui
-    	conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
-    	flag = False
-    	new_msg =  ext_msg =""
-    	message_id = referances  = None
-        context = {}
-    	try:
-            session = win32com.client.Dispatch("MAPI.session")
-            session.Logon('Outlook')
-            objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
-            objFields = objMessage.Fields
-            strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
-            strheader = ustr(strheader).encode('iso-8859-1')
-            headers = {}
-            strheader = strheader.replace("\n ", " ").splitlines()
-            for line in strheader:
-            	split_here = line.find(":")
-            	headers[line[:split_here]] = line[split_here:]
-            temp1 = headers.get('Message-ID')
-            temp2 = headers.get('Message-Id')
-            referances = headers.get('References')
-            if temp1 == None:    message_id = temp2
-            if temp2 == None:    message_id = temp1
-            startCut = message_id.find("<")
-            endCut = message_id.find(">")
-            message_id = message_id[startCut:endCut+1]
-            if not referances == None:
-            	startCut = referances.find("<")
-            	endCut = referances.find(">")
-            	referances = referances[startCut:endCut+1]
-    	except Exception,e:
-    		win32ui.MessageBox(str(e),"Archive To OpenERP")
-    		return
-    	attachments=mail.Attachments
-    	for rec in recs: #[('res.partner', 3, 'Agrolait')]
-            model = rec[0]
-            res_id = rec[1]
-            #Check if mail installed
-            object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mail.message')])
-            if not object_id:
-            	win32ui.MessageBox("Mail is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mail not installed",win32con.MB_ICONERROR)
-            	return
-            object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])
-            object_name  = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
-            #Reading the Object ir.model Name
-            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
-            if ext_ids:
-            	name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
-            	ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
-            	flag = True
-            	continue
-            msg = {
-            	'subject':mail.Subject,
-            	'date':str(mail.ReceivedTime),
-            	'body':mail.Body,
-            	'cc':mail.CC,
-            	'from':mail.SenderEmailAddress,
-            	'to':mail.To,
-            	'message-id':message_id,
-            	'references':ustr(referances),
-            }
-            result = {}
-            context['thread_model'] = model
-            if attachments:
-            	result = self.MakeAttachment([rec], mail)
-            execute(conn, 'execute', self. _dbname, int(self._uid), self._pwd,
-                    'mail.thread','message_append',[res_id],
-                    msg.get('subject', False),
-                    msg.get('body', False),
-                    msg.get('to', False),
-                    msg.get('from', False),
-                    msg.get('cc', False),
-                    False, # BCC
-                    False, #reply-to
-                    msg.get('date', False),
-                    msg.get('message-id'),\
-                    msg.get('references', False),
-                    result, #attachments
-                    #FIXME: properly handle plaintext/html body variants?
-                    False, #body_html
-                    False, #subtype
-                    False, #headers
-                    False, #original
-                    context)
-
-            new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
-            flag = True
-
-    	if flag:
-    		t = """Mail archived Successfully with attachments.\n"""+ext_msg
-    		t += "\n"+new_msg
-    		win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
-    	return flag
-
-    def IsCRMInstalled(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','crm.lead')])
-    	return id
-
-    def GetCSList(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(int(self._uid)),self._pwd,'crm.case.section','search',[])
-    	objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'crm.case.section','read',ids,['name'])
-    	obj_list = [ustr(item['name']).encode('iso-8859-1') for item in objects]
-    	return obj_list
-
-    def GetPartners(self, search_partner=''):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids=[]
-    	obj_list=[]
-    	domain = []
-    	if not search_partner.strip() == '':
-    		domain.append(('name','ilike',ustr(search_partner)))
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',domain)
-    	if ids:
-    		ids.sort()
-    		obj_list.append((-999, ustr('')))
-    		for id in ids:
-    			object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','read',[id],['id','name'])[0]
-    			obj_list.append((object['id'], ustr(object['name'])))
-    		obj_list.sort(lambda x, y: cmp(x[1],y[1]))
-    	return obj_list
-
-    def GetObjectItems(self, search_list=[], search_text=''):
-    	res = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	for obj in search_list:
-    		object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',obj)])
-    		object_name = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
-    		if obj == "res.partner.address":
-    			ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',['|',('name','ilike',ustr(search_text)),('email','ilike',ustr(search_text))])
-    			recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name','street','city'])
-    			for rec in recs:
-    				name = ustr(rec['name'])
-    				if rec['street']:
-    					name += ', ' + ustr(rec['street'])
-    				if rec['city']:
-    					name += ', ' + ustr(rec['city'])
-    				res.append((obj,rec['id'],name,object_name))
-    		else:
-    			ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',[('name','ilike',ustr(search_text))])
-    			recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name'])
-    			for rec in recs:
-    				name = ustr(rec['name'])
-    				res.append((obj,rec['id'],name,object_name))
-    	return res
-
-    def CreateCase(self, section, mail, partner_ids, with_attachments=True):
-    	import eml
-    	flag = False
-    	id = -1
-    	try:
-            conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-            email, path = eml.generateEML(mail)
-            message_id   = None
-            session = win32com.client.Dispatch("MAPI.session")
-            session.Logon('Outlook')
-            objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
-            objFields = objMessage.Fields
-            strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
-            strheader = ustr(strheader).encode('iso-8859-1')
-            headers = {}
-            strheader = strheader.replace("\n ", " ").splitlines()
-            for line in strheader:
-                split_here = line.find(":")
-                headers[line[:split_here]] = line[split_here:]
-            temp1 = headers.get('Message-ID')
-            temp2 = headers.get('Message-Id')
-            if temp1 == None:    message_id = temp2
-            if temp2 == None:    message_id = temp1
-            startCut = message_id.find("<")
-            endCut = message_id.find(">")
-            message_id = message_id[startCut:endCut+1]
-            email.replace_header('Message-Id',message_id)
-            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.thread','message_process',section, str(email))
-            if id > 0:
-            	flag = True
-            	return flag
-            else:
-            	flag = False
-            	return flag
-        except Exception,e:
-    		win32ui.MessageBox("Create Case\n"+str(e),"Mail Reading Error")
-    		return flag
-
-    def MakeAttachment(self, recs, mail):
-        attachments = mail.Attachments
-        attachment = {}
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
-        if not os.path.exists(att_folder_path):
-    		os.makedirs(att_folder_path)
-    	for rec in recs: #[('res.partner', 3, 'Agrolait')]
-            obj = rec[0]
-            obj_id = rec[1]
-            for i in xrange(1, attachments.Count+1):
-            	fn = ustr(attachments[i].FileName)
-            	if len(fn) > 64:
-            		l = 64 - len(fn)
-            		f = fn.split('.')
-            		fn = f[0][0:l] + '.' + f[-1]
-                att_path = os.path.join(att_folder_path,fn)
-                attachments[i].SaveAsFile(att_path)
-                f=open(att_path,"rb")
-                content = "".join(f.readlines())
-                f.close()
-                attachment[fn] = content
-        return attachment
-
-    def CreateContact(self, res=None):
-    	res=eval(str(res))
-    	partner = res['partner_id']
-    	state = res['state_id']
-    	country = res['country_id']
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	if not partner.strip() == '':
-    		partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
-    		res.update({'partner_id' : partner_id[0]})
-    	else:
-    		res.pop('partner_id')
-    	if not state == "":
-    		country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country))])
-    		res.update({'country_id' : country_id[0]})
-    	else:
-    		res.pop('country_id')
-    	if not country == "":
-    		state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state))])
-    		res.update({'state_id' : state_id[0]})
-    	else:
-    		res.pop('state_id')
-    	id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner.address','create',res)
-    	return id
-
-    def CreatePartner(self, res):
-    	res=eval(str(res))
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',[('name','=',res['name'])])
-    	if ids:
-    		return False
-    	id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','create',res)
-    	return id
-
-    def SearchPartnerDetail(self, search_email_id):
-    	res_vals = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	address_id = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','ilike',ustr(search_email_id))])
-    	if not address_id :
-    		return
-    	address = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','name','street','street2','city','state_id','country_id','phone','mobile','email','fax','zip'])
-    	for key, vals in address.items():
-    		res_vals.append([key,vals])
-    	return res_vals
-
-    def WritePartnerValues(self, new_vals):
-    	flag = -1
-    	new_dict = dict(new_vals)
-    	email=new_dict['email']
-    	partner = new_dict['partner']
-    	country_val = new_dict['country']
-    	state_val = new_dict['state']
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
-    	country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country_val))])
-    	state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state_val))])
-    	address_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(email))])
-    	if not partner_id or not address_id or not country_id or not state_id:
-    		return flag
-    	vals_res_address={
-    					   'partner_id' : partner_id[0],
-    					   'name' : new_dict['name'],
-    					   'street':new_dict['street'],
-    					   'street2' : new_dict['street2'],
-    					   'city' : new_dict['city'],
-    					   'phone' : new_dict['phone'],
-    					   'mobile' : new_dict['mobile'],
-    					   'fax' : new_dict['fax'],
-    					   'zip' : new_dict['zip'],
-    					   'country_id' : country_id[0],
-    					   'state_id' : state_id[0]
-    					 }
-    	temp = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'write', address_id, vals_res_address)
-    	if temp:
-    		flag=1
-    	else:
-    		flag=0
-    	return flag
-
-    def GetAllState(self):
-    	state_list = []
-    	state_ids = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	state_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [])
-    	for state_id in state_ids:
-    		obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'read', [state_id],['id','name'])[0]
-    		state_list.append((obj['id'], ustr(obj['name'])))
-    	return state_list
-
-    def GetAllCountry(self):
-    	country_list = []
-    	country_ids = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	country_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [])
-    	for country_id in country_ids:
-    		obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country','read', [country_id], ['id','name'])[0]
-    		country_list.append((obj['id'], ustr(obj['name'])))
-    	return country_list
-
-    def SearchPartner(self, mail_id = ""):
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])
-        if not address:
-        	return False
-        add_rec = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'read', address[0])
-        partner = add_rec.get('partner_id',False)
-        if partner:  return partner[0]
-        else:  return partner
-
-    def SearchEmailResources(self, message_id):
-        import win32ui
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	res_vals = []
-    	mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('message_id','=',message_id)])
-        ref_mail_id = None
-    	if not mail_id:
-            ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('references','like','%'+message_id+'%')])
-            if ref_mail_id:
-                address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',ref_mail_id[0],['model','res_id'])
-                for key, vals in address.items():
-                    res_vals.append([key,vals])
-                return res_vals
-            return None
-    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',mail_id[0],['model','res_id'])
-    	for key, vals in address.items():
-    		res_vals.append([key,vals])
-    	return res_vals
-
-
-    def GetCountry(self, country_search=''):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids=[]
-    	obj_list=[]
-    	domain = []
-    	if not country_search.strip() == '':
-    		domain.append(('name','ilike',ustr(country_search)))
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',domain)
-    	if ids:
-    		ids.sort()
-    		for id in ids:
-    			object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','read',[id],['id','name'])[0]
-    			obj_list.append((object['id'], ustr(object['name'])))
-    		obj_list.sort(lambda x, y: cmp(x[1],y[1]))
-    	return obj_list
-
-    def GetStates(self, state_search='', country=None):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = []
-    	c_id = []
-    	obj_list = []
-    	domain = []
-    	if not state_search.strip() == '':
-    		domain.append(('name','ilike',ustr(state_search)))
-
-    	if country == None:
-    		ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
-    	if not country == None:
-    		c_id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',[('name','=',ustr(country))])
-    		domain.append(('country_id','=',c_id[0]))
-    		ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
-    	if ids:
-    		ids.sort()
-    		for id in ids:
-    			object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',[id],['id','name'])[0]
-    			obj_list.append((object['id'], ustr(object['name'])))
-    		obj_list.sort(lambda x, y: cmp(x[1],y[1]))
-    	return obj_list
-
-    def FindCountryForState(self, state_search=''):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))])
-    	if not ids:
-    		return None
-    	object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',ids)[0]
-    	country = object['country_id'][1]
-    	return country
-
-    def CreateEmailAttachment(self, rec, mail):
-        import eml
-        email, path = eml.generateEML(mail)
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        obj = rec[0]
-        obj_id = rec[1]
-        res = {}
-        res['res_model'] = obj
-        ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n',':','~']
-        fn = (mail.Subject).replace(' ','')
-        for c in ls:
-        	fn = fn.replace(c,'')
-        if len(fn) > 64:
-        	l = 64 - len(fn)
-        	f = fn.split('-')
-        	fn = '-'.join(f[1:])
-        	if len(fn) > 64:
-        		l = 64 - len(fn)
-        		f = fn.split('.')
-        		fn = f[0][0:l] + '.' + f[-1]
-        fn = fn[:-4]+".eml"
-        f = open(path)
-        content = "".join(f.readlines()).encode('base64')
-        f.close()
-        res['name'] = fn
-        res['datas_fname'] = fn
-        res['datas'] = content
-        res['res_id'] = obj_id
-        id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
-        return id
-
-    def SearchPartners(self):
-        res = []
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        obj = 'res.partner'
-        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',[])
-        recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name'])
-        for rec in recs:
-            name = ustr(rec['name'])
-            res.append((obj,rec['id'],name,obj))
-        return res
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll b/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll
new file mode 100644
index 00000000000..be76352b13d
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
new file mode 100644
index 00000000000..e163b5442a4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
@@ -0,0 +1,78 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Linq;
+
+namespace OpenERPClient
+{
+    public class Model
+    {
+        public string model;
+        public string name;
+        protected OpenERPConnect openerp_connect;
+        public OpenERPConnect Connection
+        {
+            set
+            {
+                this.openerp_connect = value;
+            }
+            get
+            {
+                return this.openerp_connect;
+            }
+        }
+        public Model()
+        {
+        }
+        public Model(string model)
+        {
+            /*
+            It gives the model name only.
+            :param model : madel name
+            */
+
+            this.model = model;
+        }
+        public Model(string model, string name)
+        {
+            /*
+            It gives the model names with their descriptions.
+            :param model : model name
+            :param name : description of model
+            */
+
+            this.name = name;
+            this.model = model;
+        }
+        public override string ToString()
+        {
+            /*
+            It overrides the name of model into ToString.
+            
+            :return : String
+            */ 
+
+            if (this.name != null) return this.name;
+            return this.model;
+        }
+      
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
new file mode 100644
index 00000000000..75fe271e5d6
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenERPClient</RootNamespace>
+    <AssemblyName>OpenERPClient</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="CookComputing.XmlRpcV2, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\OpenERPOutlookPlugin\bin\Release\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Model.cs" />
+    <Compile Include="OpenERPConnect.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Record.cs" />
+    <Compile Include="XMLRPCClient.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
new file mode 100644
index 00000000000..d6672828ed0
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
@@ -0,0 +1,397 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Windows.Forms;
+using System.Collections;
+using CookComputing.XmlRpc;
+
+namespace OpenERPClient
+{
+    public class ServiceUrl : System.Attribute
+    {
+        string _url;
+        public ServiceUrl(string url)
+        {
+            /*
+            It will contain the ServiceUrl.
+            :param url : url with server and port.
+            */
+
+            this._url = url;
+        }
+        public string Url
+        {
+            /*
+            It will get and return the Url for the connection.
+             
+            :return : String 
+            */
+
+            get
+            {
+                return _url;
+            }
+        }
+        public override string ToString()
+        {
+            /*
+            It will override the Tostring and return the _url.
+            */
+
+            return this._url;
+        }
+    }
+    public enum OpenERPService
+    {
+        [ServiceUrl("/xmlrpc/object")]
+        Object = 1,
+        [ServiceUrl("/xmlrpc/db")]
+        DB = 2,
+        [ServiceUrl("/xmlrpc/common")]
+        Common = 3
+    }
+    public class OpenERPConnect
+    {
+        int uid;
+        string url;
+        string dbname;
+        string login;
+        string pwd;
+        bool chkpwd;
+        string password;
+        public string URL
+        {
+            /*
+            It will get and set the value of the url.
+            
+            :return : String
+            */
+
+            get
+            {
+                return url;
+            }
+            set
+            {
+                url = value;
+            }
+        }
+        public string DBName
+        {
+            /*
+            It will get and set the value of the Database Name.
+            
+            :return : String
+            */
+
+            get
+            {
+                return dbname;
+            }
+            set
+            {
+                dbname = value;
+            }
+        }
+        public string UserId
+        {
+            /*
+            It will get and set the value of the UserId.
+            
+            :return : String
+            */
+
+            get
+            {
+                return login;
+            }
+            set
+            {
+                login = value;
+            }
+        }
+        public string pswrd
+        {
+            /*
+            It will get and set the value of the Password.
+            
+            :return : String
+            */
+
+            get
+            {
+                return password;
+            }
+            set
+            {
+                password = value;
+            }
+        }
+
+        public bool rempwd
+        {
+            /*
+            It will get and set the value of the Remember Password.
+            
+            :return : True or False
+            */
+
+            get
+            {
+                return chkpwd;
+            }
+            set
+            {
+                chkpwd = value;
+            }
+        }
+
+        public string version;
+        XMLRPCClient rpcclient;
+
+        public void Open(Enum service)
+        {
+            /*
+            It opens the connetion by the url and service url.
+            :param service : enum service.
+            */
+
+            string url = null;
+            Type type = service.GetType();
+
+            ServiceUrl[] _urls =
+               type.GetField(service.ToString()).GetCustomAttributes(typeof(ServiceUrl),
+                                       false) as ServiceUrl[];
+            if (_urls.Length > 0)
+            {
+                url = _urls[0].Url;
+            }
+
+            this.Open(url);
+
+
+        }
+
+        void Open(string service_url)
+        {
+            /*
+            It opens rpcclient by service url.
+            :param service_url : service url
+            */
+
+            this.rpcclient = new XMLRPCClient(this.url + service_url);
+
+        }
+        void Close()
+        {
+            /*
+            It closes rpcclient.
+            */
+
+            this.rpcclient = null;
+
+        }
+        public OpenERPConnect()
+        {
+        }
+        public OpenERPConnect(string url)
+        {
+            /*
+             It will contain the url wit the server and port.
+             :param url : url with the server and port.
+            */
+
+            this.url = url;
+        }
+        public OpenERPConnect(string url, string dbname, string login, string pwd)
+        {
+            /*
+             It will do the connection with OpenERP server.
+             :param url : url with the server and port.
+             :param dbname : the list of database.
+             :param login : user name.
+             :param pwd : password.
+            */
+
+            this.url = url;
+            this.dbname = dbname;
+            this.login = login;
+            this.pwd = pwd;
+            this.version = ServerVersion();
+        }
+        public Boolean isLoggedIn
+        {
+            /*
+            It will check whether successfully login to OpenERP is done or not.
+            
+            :return : True or False.
+            */
+
+            get
+            {
+                if (this.uid > 0) { return true; }
+                return false;
+            }
+        }
+
+        public int Login(string dbname, string userid, string pwd)
+        {
+            /*
+             It will check whether the entered dbname, userid and password are correct or not
+             and on that basis it will allow the user for connecting to OpenERP.
+             :param dbname : list of database
+             :param userid : userid 
+             :param pwd : password of the user
+             
+             :return : Integer
+            */
+
+            this.Open(OpenERPClient.OpenERPService.Common);
+            object isLogin = this.rpcclient.Login(dbname, userid, pwd);
+            this.uid = 0;
+            if (Convert.ToBoolean(isLogin))
+            {
+                this.uid = Convert.ToInt32(isLogin);
+            }
+            this.pwd = pwd;
+            if (this.uid <= 0)
+            {
+                MessageBox.Show("Authentication Error!\nBad username and password.", Form.ActiveForm.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            this.Close();
+            return this.uid;
+
+        }
+        XmlRpcStruct ConvertAs(Hashtable value)
+        {
+            /*
+             It will convert the Hashtable into XmlRpcStruct and vise-versa.
+             
+             :param value : Hasheable value.
+              
+             :retutn : Hashtable values and vise versa the XmlRpcStruct value.
+            */
+
+            XmlRpcStruct new_value;
+            new_value = new XmlRpcStruct();
+            foreach (string key in value.Keys)
+            {
+                object res;
+                if (value[key] == null)
+                {
+                    res = "";
+                }
+                if (value[key].GetType() == typeof(Hashtable))
+                {
+                    res = this.ConvertAs((Hashtable)value[key]);
+                }
+                else
+                {
+                    res = value[key];
+                }
+                new_value.Add(key, res);
+            }
+            return new_value;
+        }
+        object[] ConvertArgs(object[] args)
+        {
+            /*
+            It will convert the arguments which are of type Hashtable into new arguments.
+            
+            :param args : Objet value of arguments
+              
+            :return : Object value of arguments.
+            */
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                object arg = args[i];
+                XmlRpcStruct new_arg;
+                if (arg.GetType() == typeof(Hashtable))
+                {
+                    new_arg = this.ConvertAs((Hashtable)arg);
+                    args[i] = new_arg;
+                }
+            }
+            return args;
+        }
+        public object Execute(string model, string method, params object[] args)
+        {
+            /*
+            It executes the model name, the method name and also the list of arrays arguments.
+            :param model : model name.
+            :param method : method name.
+            :params args : list of arrays of arguments.
+            
+            :return : Object
+            */
+
+            args = this.ConvertArgs(args);
+            this.Open(OpenERPClient.OpenERPService.Object);
+
+            object res = this.rpcclient.Execute(this.dbname, this.uid, this.pwd, model, method, args);
+            this.Close();
+            return res;
+        }
+        public object[] DBList()
+        {
+            /*
+            It will return the list of the database which will be created.
+             
+            :return : Database List 
+            */
+
+            this.Open(OpenERPClient.OpenERPService.DB);
+            object[] res = this.rpcclient.DBList();
+            this.Close();
+            return res;
+        }
+        public string ServerVersion()
+        {
+            /*
+            It will give the version of the server which the user is using.
+              
+            :return : String
+            */
+
+            this.Open(OpenERPClient.OpenERPService.DB);
+            string version = this.rpcclient.ServerVersion();
+            this.Close();
+            return version;
+        }
+
+        public bool check_connectivity()
+        {
+            /*
+            It will check connection on given server url.
+        	
+            :return : True or False.
+            */
+
+            this.Open(OpenERPClient.OpenERPService.Common);
+            bool flag = this.rpcclient.check_connectivity();
+            this.Close();
+            return flag;
+        }
+
+
+    }
+
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..def21a9bf91
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenERPClient")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenERPClient")]
+[assembly: AssemblyCopyright("Copyright ©  2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0b69b9a4-1bfc-45d5-9788-983fbf57a505")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
new file mode 100644
index 00000000000..4069b43f74c
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
@@ -0,0 +1,69 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System.Collections;
+
+namespace OpenERPClient
+{
+    public class Record
+    {
+        public long id;
+        public string name;
+        public Model model;
+        public Hashtable columns;
+        public Record(long id, string name, Model model)
+        {
+            /*
+            It gives the record of id, name and model.
+            :param id : record id.
+            :param name : record name.
+            :param model : model name.
+            */
+
+            this.id = id;
+            this.name = name;
+            this.model = model;
+        }
+        public Record(Hashtable columns, Model model)
+        {
+            /*
+            It gives the records in hashtable columns and also model name.
+            :param columns : hashtable column values.
+            :param model : model name.
+            */
+
+            this.id = long.Parse(columns["id"].ToString());
+            if (columns.ContainsKey("name"))
+            {
+                this.name = columns["name"].ToString();
+            }
+            this.model = model;
+            this.columns = columns;
+        }
+        public override string ToString()
+        {
+            /*
+            It will override the Tostring.
+            */
+
+            if (this.name != null) return this.name;
+            return this.id.ToString();
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
new file mode 100644
index 00000000000..ebe9ec142e2
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
@@ -0,0 +1,388 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Text;
+using CookComputing.XmlRpc;
+
+namespace OpenERPClient
+{
+    public interface IOpenERPCommon : IXmlRpcProxy
+    {
+        [XmlRpcMethod("login")]
+        object Login(string dbname, string username, string pwd);
+
+    }
+    public interface IOpenERPObject : IXmlRpcProxy
+    {
+
+        [XmlRpcMethod("execute")]
+        Object Execute(string dbName, long userId, string pwd, string model, string method, params Object[] args);
+
+
+
+    }
+    public interface IOpenERPDB : IXmlRpcProxy
+    {
+
+        [XmlRpcMethod("list")]
+        Object[] DBList();
+
+        [XmlRpcMethod("server_version")]
+        string ServerVersion();
+
+        [XmlRpcMethod("check_connectivity")]
+        bool check_connectivity();
+
+
+    }
+    public interface Ixmlrpcconnect : IOpenERPCommon, IOpenERPDB, IOpenERPObject
+    {
+    }
+    public class XMLRPCClient : Ixmlrpcconnect
+    {
+        Ixmlrpcconnect rpcclient = (Ixmlrpcconnect)XmlRpcProxyGen.Create(typeof(Ixmlrpcconnect));
+        public XMLRPCClient(string ServiceUrl)
+        {
+            rpcclient.Url = ServiceUrl;
+        }
+
+        #region Ixmlrpcconnect Members
+
+        public object Login(string dbname, string username, string pwd)
+        {
+            return rpcclient.Login(dbname, username, pwd);
+        }
+
+        public object Execute(string dbName, long userId, string pwd, string model, string method, params object[] args)
+        {
+            return rpcclient.Execute(dbName, userId, pwd, model, method, args);
+        }
+
+        public object[] DBList()
+        {
+            return rpcclient.DBList();
+        }
+
+        public string ServerVersion()
+        {
+            return rpcclient.ServerVersion();
+        }
+
+        public bool check_connectivity()
+        {
+            return rpcclient.check_connectivity();
+        }
+        #endregion
+
+
+        #region IXmlRpcProxy Members
+
+        public bool AllowAutoRedirect
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string ConnectionGroupName
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.CookieContainer CookieContainer
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public System.Net.ICredentials Credentials
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool EnableCompression
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool Expect100Continue
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.WebHeaderCollection Headers
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public Guid Id
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public int Indentation
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool KeepAlive
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public XmlRpcNonStandard NonStandard
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool PreAuthenticate
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public Version ProtocolVersion
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.IWebProxy Proxy
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.CookieCollection ResponseCookies
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public System.Net.WebHeaderCollection ResponseHeaders
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public int Timeout
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string Url
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseEmptyParamsTag
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseIndentation
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseIntTag
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseStringTag
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string UserAgent
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public Encoding XmlEncoding
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string XmlRpcMethod
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string[] SystemListMethods()
+        {
+            throw new NotImplementedException();
+        }
+
+        public object[] SystemMethodSignature(string MethodName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string SystemMethodHelp(string MethodName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public event XmlRpcRequestEventHandler RequestEvent;
+
+        public event XmlRpcResponseEventHandler ResponseEvent;
+
+        #endregion
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
new file mode 100644
index 00000000000..f4705664cf4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
@@ -0,0 +1,30 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenERPOutlookPlugin", "OpenERPOutlookPlugin\OpenERPOutlookPlugin.csproj", "{F4B2219B-F235-400F-81B4-92F15250BBA4}"
+EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "OpenERPOutlookPluginSetup", "OpenERPOutlookPluginSetup\OpenERPOutlookPluginSetup.vdproj", "{96333293-0156-4998-9065-42721CEB0368}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenERPClient", "OpenERPClient\OpenERPClient.csproj", "{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96333293-0156-4998-9065-42721CEB0368}.Debug|Any CPU.ActiveCfg = Debug
+		{96333293-0156-4998-9065-42721CEB0368}.Release|Any CPU.ActiveCfg = Release
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
new file mode 100644
index 00000000000..6f5be64b3ae
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Revision
+//      Build Number
+//
+// You can specify all the value or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified - the assembly cannot be signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. 
+//   (*) If the key file and a key name attributes are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP - that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the file is installed into the CSP and used.
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
new file mode 100644
index 00000000000..b4e4d25d3f4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
@@ -0,0 +1,55 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System.Collections;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    static public  class Cache
+    {
+        static private OpenERPOutlookPlugin _openerp;
+        static public OpenERPOutlookPlugin OpenERPOutlookPlugin
+        {
+            get
+            {
+                return _openerp;
+            }
+            set
+            {
+
+                _openerp = value;
+            }
+        }
+        static private Model[] document_models;
+        static public Model[] DocumentModelList
+        {
+            get
+            {
+                return document_models;
+            }
+            set
+            {
+
+                document_models = value;
+            }
+        }        
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
new file mode 100644
index 00000000000..6ce61be577b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
@@ -0,0 +1,109 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Windows.Forms;
+using System.Text.RegularExpressions;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public class ConfigManager
+    {
+        string openerp_config_file = "openerp_config.ini";
+
+        public void SaveConfigurationSetting()
+        {
+            string filepath = Tools.GetAppFolderPath();
+            OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+            OpenERPConnect openerp_connect = openerp_outlook.Connection;
+            filepath = Path.Combine(filepath, openerp_config_file);
+            string[] datas = { "url=" + openerp_connect.URL, "userid=" + openerp_connect.UserId, "dbname=" + openerp_connect.DBName,"rempwd="+openerp_connect.rempwd,"pswrd=" + openerp_connect.pswrd };
+            StreamWriter userfile = new StreamWriter(filepath, false);
+
+            foreach (string data in datas)
+            {
+                userfile.WriteLine(data);
+            }
+            userfile.Close();
+
+        }
+        public void LoadConfigurationSetting()
+        {
+
+            string filePath = Tools.GetAppFolderPath();
+            filePath = Path.Combine(filePath, this.openerp_config_file);
+            OpenERPConnect openerp_connect=null;
+            OpenERPOutlookPlugin openerp_outlook=null;
+            openerp_outlook = Cache.OpenERPOutlookPlugin;
+            if (openerp_outlook == null)
+            {
+
+                openerp_outlook = new OpenERPOutlookPlugin(openerp_connect);
+            }
+                openerp_connect = openerp_outlook.Connection;
+                if (openerp_connect == null)
+            {
+               openerp_connect = new OpenERPConnect();
+            }
+            
+            if (File.Exists(filePath))
+            {
+
+                string line;
+
+                using (StreamReader file = new StreamReader(filePath))
+                {
+                    while ((line = file.ReadLine()) != null)
+                    {
+                        char[] delimiters = new char[] { '=' };
+                        string[] parts = line.Split(delimiters, 2);
+
+                        for (int i = 0; i < parts.Length; i += 2)
+                        {
+                            if (parts[i] == "url")
+                                openerp_connect.URL = parts[i + 1].Trim();
+                            else if (parts[i] == "userid")
+                                openerp_connect.UserId = parts[i + 1].Trim();
+                            else if (parts[i] == "dbname")
+                                openerp_connect.DBName = parts[i + 1].Trim();                          
+                            else if (parts[i] == "pswrd")
+                                openerp_connect.pswrd = parts[i + 1].Trim();
+                            else if (parts[i] == "rempwd")
+                            {
+                                openerp_connect.rempwd = false;
+                                if (parts[i + 1].Trim().ToLower() == "true")
+                                    openerp_connect.rempwd = true;
+                            }
+
+                        }
+                    }
+                    file.Close();
+                }
+            }
+            openerp_outlook.Connection = openerp_connect;
+            Cache.OpenERPOutlookPlugin = openerp_outlook;
+        }        
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
new file mode 100644
index 00000000000..1336c7f7695
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
@@ -0,0 +1,354 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+
+namespace OpenERPOutlookPlugin
+{
+    using System;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Windows.Forms;
+    using office = Microsoft.Office.Core;
+    using outlook = Microsoft.Office.Interop.Outlook;
+    using OpenERPClient;
+
+
+    
+
+    #region Read me for Add-in installation and setup information.
+    // When run, the Add-in wizard prepared the registry for the Add-in.
+    // At a later time, if the Add-in becomes unavailable for reasons such as:
+    //   1) You moved this project to a computer other than which is was originally created on.
+    //   2) You chose 'Yes' when presented with a message asking if you wish to remove the Add-in.
+    //   3) Registry corruption.
+    // you will need to re-register the Add-in by building the OpenERPOutlookPluginSetup project, 
+    // right click the project in the Solution Explorer, then choose install.
+    #endregion
+
+    /// <summary>
+    ///   The object for implementing an Add-in.
+    /// </summary>
+    /// <seealso class='IDTExtensibility2' />
+
+    [GuidAttribute("C86B5760-1254-4F40-BD25-2094A2A678C4"), ProgId("OpenERPOutlookPlugin.Connect")]
+    public class Connect : Object, Extensibility.IDTExtensibility2
+    {
+        /// <summary>
+        ///		Implements the constructor for the Add-in object.
+        ///		Place your initialization code within this method.
+        /// </summary>
+
+        public Connect()
+        {
+
+        }
+
+        public int cnt_mail = 0;
+
+        /// <summary>
+        ///      Implements the OnConnection method of the IDTExtensibility2 interface.
+        ///      Receives notification that the Add-in is being loaded.
+        /// </summary>
+        /// <param term='application'>
+        ///      Root object of the host application.
+        /// </param>
+        /// <param term='connectMode'>
+        ///      Describes how the Add-in is being loaded.
+        /// </param>
+        /// <param term='addInInst'>
+        ///      Object representing this Add-in.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        public void OnConnection(object application, Extensibility.ext_ConnectMode connectMode, object addInInst, ref System.Array custom)
+        {
+            applicationObject = application;
+            addInInstance = addInInst;
+
+            if (connectMode != Extensibility.ext_ConnectMode.ext_cm_Startup)
+            {
+                OnStartupComplete(ref custom);
+                
+            }
+        }
+
+        /// <summary>
+        ///     Implements the OnDisconnection method of the IDTExtensibility2 interface.
+        ///     Receives notification that the Add-in is being unloaded.
+        /// </summary>
+        /// <param term='disconnectMode'>
+        ///      Describes how the Add-in is being unloaded.
+        /// </param>
+        /// <param term='custom'>
+        ///      Array of parameters that are host application specific.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        public void OnDisconnection(Extensibility.ext_DisconnectMode disconnectMode, ref System.Array custom)
+        {
+            if (disconnectMode != Extensibility.ext_DisconnectMode.ext_dm_HostShutdown)
+            {
+                OnBeginShutdown(ref custom);
+            }
+            applicationObject = null;
+        }
+
+        /// <summary>
+        ///      Implements the OnAddInsUpdate method of the IDTExtensibility2 interface.
+        ///      Receives notification that the collection of Add-ins has changed.
+        /// </summary>
+        /// <param term='custom'>
+        ///      Array of parameters that are host application specific.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        public void OnAddInsUpdate(ref System.Array custom)
+        {
+        }
+
+        /// <summary>
+        ///      Implements the OnStartupComplete method of the IDTExtensibility2 interface.
+        ///      Receives notification that the host application has completed loading.
+        /// </summary>
+        /// <param term='custom'>
+        ///      Array of parameters that are host application specific.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        /// 
+        private office.CommandBarButton btn_open_partner;
+        private office.CommandBarButton btn_open_document;
+        private office.CommandBarButton btn_open_configuration_form;
+        private office.CommandBars oCommandBars;
+        private office.CommandBar menuBar;
+        private office.CommandBarPopup newMenuBar;
+
+        public int countMail()
+        {
+            /*
+             
+             * Gives the number of selected mail.
+             * returns: Number of selected mail.
+             
+             */
+            cnt_mail = 0;
+            Microsoft.Office.Interop.Outlook.Application app = null;
+
+            app = new Microsoft.Office.Interop.Outlook.Application();
+            foreach (var selection in app.ActiveExplorer().Selection)
+            {
+                cnt_mail = app.ActiveExplorer().Selection.Count;
+            }
+
+            return cnt_mail;
+        }
+      
+        public void OnStartupComplete(ref System.Array custom)
+        {
+            /*
+             
+             * When outlook is opened it loads a Menu if Outlook plugin is installed.
+             * OpenERP - > Push, Partner ,Documents, Configuration
+             
+             */
+            Microsoft.Office.Interop.Outlook.Application app = null;
+            try
+            {
+                app = new Microsoft.Office.Interop.Outlook.Application();
+                object omissing = System.Reflection.Missing.Value;
+                menuBar = app.ActiveExplorer().CommandBars.ActiveMenuBar;
+                ConfigManager config = new ConfigManager();
+                config.LoadConfigurationSetting();
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                try
+                {
+                    if (openerp_connect.URL != null && openerp_connect.DBName != null && openerp_connect.UserId != null && openerp_connect.pswrd != "")
+                    {                        
+                        string decodpwd = Tools.DecryptB64Pwd(openerp_connect.pswrd);
+                        openerp_connect.Login(openerp_connect.DBName, openerp_connect.UserId, decodpwd);                            
+                    }
+                }
+                catch(Exception )
+                {
+                    MessageBox.Show("Unable to connect remote Server ' " + openerp_connect.URL + " '.", "OpenERP Connection",MessageBoxButtons.OK,MessageBoxIcon.Exclamation);
+                }
+                newMenuBar = (office.CommandBarPopup)menuBar.Controls.Add(office.MsoControlType.msoControlPopup, omissing, omissing, omissing, true);
+                if (newMenuBar != null)
+                {
+                    newMenuBar.Caption = "OpenERP";
+                    newMenuBar.Tag = "My";
+
+                    btn_open_partner = (office.CommandBarButton)newMenuBar.Controls.Add(office.MsoControlType.msoControlButton, omissing, omissing, 1, true);
+                    btn_open_partner.Style = office.MsoButtonStyle.msoButtonIconAndCaption;
+                    btn_open_partner.Caption = "Contact";
+                    //Face ID will use to show the ICON in the left side of the menu.
+                    btn_open_partner.FaceId = 3710;
+                    newMenuBar.Visible = true;
+                    btn_open_partner.Click += new Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler(this.btn_open_partner_Click);
+
+                    btn_open_document = (office.CommandBarButton)newMenuBar.Controls.Add(office.MsoControlType.msoControlButton, omissing, omissing, 2, true);
+                    btn_open_document.Style = office.MsoButtonStyle.msoButtonIconAndCaption;
+                    btn_open_document.Caption = "Documents";
+                    //Face ID will use to show the ICON in the left side of the menu.
+                    btn_open_document.FaceId = 258;
+                    newMenuBar.Visible = true;
+                    btn_open_document.Click += new Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler(this.btn_open_document_Click);
+
+                    btn_open_configuration_form = (office.CommandBarButton)newMenuBar.Controls.Add(office.MsoControlType.msoControlButton, omissing, omissing, 3, true);
+                    btn_open_configuration_form.Style = office.MsoButtonStyle.msoButtonIconAndCaption;
+                    btn_open_configuration_form.Caption = "Configuration";
+                    //Face ID will use to show the ICON in the left side of the menu.
+                    btn_open_configuration_form.FaceId = 5644;
+                    newMenuBar.Visible = true;
+                    btn_open_configuration_form.Click += new Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler(this.btn_open_configuration_form_Click);
+
+                }
+
+            }
+            catch (Exception)
+            {
+                object oActiveExplorer;
+                oActiveExplorer = applicationObject.GetType().InvokeMember("ActiveExplorer", BindingFlags.GetProperty, null, applicationObject, null);
+                oCommandBars = (office.CommandBars)oActiveExplorer.GetType().InvokeMember("CommandBars", BindingFlags.GetProperty, null, oActiveExplorer, null);
+            }
+                 
+
+        }
+
+        void btn_open_configuration_form_Click(Microsoft.Office.Core.CommandBarButton Ctrl, ref bool CancelDefault)
+        {
+            frm_openerp_configuration frm_config = new frm_openerp_configuration();
+            frm_config.Show();
+
+        }
+
+
+        public static bool isLoggedIn()
+        {
+            /*
+             
+             * This will check that it is connecting with server or not.
+             * If wrong server name or port is given then it will throw the message.
+             * returns true If conneted with server, otherwise False.
+             
+             */
+            if (Cache.OpenERPOutlookPlugin == null || Cache.OpenERPOutlookPlugin.isLoggedIn == false)
+            {
+                throw new Exception("OpenERP Server is not connected!\nPlease connect OpenERP Server from Configuration Menu.");
+
+            }
+            return true;
+        }
+
+        public static void handleException(Exception e)
+        {
+            string Title;
+            if (Form.ActiveForm != null)
+            {
+                Title = Form.ActiveForm.Text;
+            }
+            else
+            {
+                Title = "OpenERP Addin";
+            }
+            MessageBox.Show(e.Message, Title, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+        }
+        public static void displayMessage(string message)
+        {
+            string Title;
+            if (Form.ActiveForm != null)
+            {
+                Title = Form.ActiveForm.Text;
+            }
+            else
+            {
+                Title = "OpenERP Addin";
+            }
+            MessageBox.Show(message, Title, MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+        public void CheckMailCount()
+        {
+            if (countMail() == 0)
+            {
+                throw new Exception("No email selected.\nPlease select one email.");
+            }
+            if (countMail() > 1)
+            {
+                throw new Exception("Multiple selction is not allowed.\nPlease select only one email.");
+            }
+
+        }
+       
+        void btn_open_partner_Click(Microsoft.Office.Core.CommandBarButton Ctrl, ref bool CancelDefault)
+        {
+            try
+            {
+                Connect.isLoggedIn();
+                this.CheckMailCount(); 
+                if (countMail() == 1)
+                {
+
+                    foreach (outlook.MailItem mailitem in Tools.MailItems())
+                    {
+
+                        Object[] contact = Cache.OpenERPOutlookPlugin.RedirectPartnerPage(mailitem);
+                        if ((int)contact[1] > 0)
+                        {
+                            Cache.OpenERPOutlookPlugin.RedirectWeb(contact[2]);
+                        }
+                        else
+                        {
+                            frm_contact contact_form = new frm_contact(mailitem.SenderName, mailitem.SenderEmailAddress);
+                            contact_form.Show();
+                        }
+
+                    }
+                }
+
+            }
+            catch (Exception e)
+            {
+                Connect.handleException(e);
+            }
+
+        }
+
+        void btn_open_document_Click(Microsoft.Office.Core.CommandBarButton Ctrl, ref bool CancelDefault)
+        {
+            try
+            {
+                Connect.isLoggedIn();
+                this.CheckMailCount(); 
+                if (countMail() == 1)
+                {
+                    frm_choose_document_opt frm_doc = new frm_choose_document_opt();    
+                }
+            }
+            catch (Exception e)
+            {
+                Connect.handleException(e);
+            }
+
+        }
+
+        
+        public void OnBeginShutdown(ref System.Array custom)
+        {
+        }
+        private object applicationObject;
+        private object addInInstance;
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
new file mode 100644
index 00000000000..cf1578d903b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
@@ -0,0 +1,223 @@
+/*
+
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Linq;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+using System.Windows.Forms;
+namespace OpenERPOutlookPlugin
+{
+
+    public class OpenERPOutlookPlugin : Model
+    {
+        public Boolean isLoggedIn
+        {
+            /*
+             
+             * This will check that user is logged in or not and gets the value
+             * returns : True if loggedIn, False otherwise.
+             
+             */
+            get
+            {
+                if (this.Connection != null) { return this.Connection.isLoggedIn; }
+                return false;
+            }
+        }
+
+        public OpenERPOutlookPlugin(OpenERPConnect connection)
+        {
+            this.Connection = connection;
+            //this.set_server_method();
+        }
+
+        public Record[] SearchRecord(string name,string model)
+        {
+            /*
+             * Gives name and model for search record.
+             */
+            ArrayList object_list = new ArrayList();
+            Model parent_model;
+            parent_model = new Model(model);
+            ArrayList args = new ArrayList();
+            args.Add(parent_model.model);
+            if (name != null)
+            {
+                args.Add(name);
+            }
+            else
+            {
+                args.Add("");
+            }
+            object[] objects = (object[])this.openerp_connect.Execute("plugin.handler", "list_document_get", args.ToArray());
+            foreach (object obj in objects)
+            {
+                Hashtable document = new Hashtable();
+                object[] names = (object[])obj;
+                document.Add("id", names[0].ToString());
+                document.Add("name", names[1].ToString());
+                object_list.Add(new Record(document,parent_model));
+            }
+            return (Record[])object_list.ToArray(typeof(Record));            
+        }
+
+        public string Name_get(outlook.MailItem mail)
+        {
+
+                string email = Tools.GetHeader(mail);
+                object doc = this.openerp_connect.Execute("plugin.handler", "document_get", email);
+                object[] name = (object[])doc;
+                return name[3].ToString();
+     
+        }
+
+        public void RedirectWeb(object web_url)
+        {
+            /*
+             * Will open the url into the web browser.
+             */
+
+            System.Diagnostics.Process.Start(web_url.ToString());
+        }
+
+
+        public object[] RedirectPartnerPage(outlook.MailItem mail)
+        {
+            /*
+             
+             * Will Redirect to the web-browser and open partner.
+             * If it will not found partner in res.partner.address (in contact) then 
+               it will open the contact form to create a partner.
+               :Param outlook.MailItem mailItem : Outlook Mail item
+             */
+            string email_id = mail.SenderEmailAddress.ToString();
+            Object[] contact = (Object[])this.openerp_connect.Execute("plugin.handler", "partner_get", email_id);
+            return contact;
+
+        }
+
+        public void Open_Document(outlook.MailItem mail)
+        {
+            /*
+             * To open document attached in a url.returns the model_id and res_id of the document
+               :Param outlook.MailItem mail: Outlook mails.
+             */
+
+            string email = Tools.GetHeader(mail);
+            object doc = this.openerp_connect.Execute("plugin.handler", "document_get", email);
+            object[] url = (object[])doc;            
+            this.RedirectWeb(url[2].ToString());
+        }       
+
+        public Boolean PushMail(outlook.MailItem mail, string model, int thread_id)
+        {
+            /*
+             
+              * This will push the mail as per the selected items from the list.
+                :Param outlook.MailItem mail: selected mail from the outlook.
+                :Param string model : Model name to push.
+                :Param int thread_id : Thread id of the mail.
+              * If mail pushed successfully then it returns true.
+              * return False if mail Already Exist.
+             
+             */
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                ArrayList args = new ArrayList();               
+                Hashtable vals = new Hashtable();
+                string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+                args.Add(model);
+                args.Add(email.ToString());
+                args.Add(thread_id);              
+                Hashtable attachments = Tools.GetAttachments(mail);                
+                args.Add(mail.Body);
+                args.Add(mail.HTMLBody);
+                args.Add(attachments);
+                object push_mail = this.Connection.Execute("plugin.handler", "push_message_outlook", args.ToArray());
+                object[] push = (object[])push_mail;
+                this.RedirectWeb(push[2].ToString());               
+                return true;            
+
+        }       
+        public long CreatePartnerRecord(string name)
+        {
+            /*
+             
+             * Creates a partner record in res.partner as per the name given in the plugin form.
+               :Param String name: Name given to create a partner in the database.
+             * Returns a Long value : Partner id.
+             
+             */
+            Record[] partenr_list = this.SearchRecord(name,"res.partner");
+            int partner_id = 0;
+            foreach (Record partner in partenr_list)
+            {
+                partner_id = Convert.ToInt16(partner.id);
+            }
+
+            return partner_id;
+        }
+        public void CreateContactRecord(int partner_id, string name, string email_id)
+        {
+            /*
+             
+            * Creates a Contact record in the res.partner.address as per the details given in the 
+              plugin form of openERP outlook Plugin.
+              :Param string partner_id : Partner id for which it creates a contact
+              :Param string name : Contact name 
+              :Param string email_id : Email address 
+           
+            */
+            Hashtable values = new Hashtable();
+            values.Add("name", name);
+            values.Add("email", email_id);            
+            ArrayList args = new ArrayList();
+            args.Add(values);
+            args.Add(partner_id);
+            object[] contact = (object[])this.openerp_connect.Execute("plugin.handler", "contact_create", args.ToArray());
+            this.RedirectWeb(contact[2].ToString());
+
+          }
+   
+        public Model[] GetMailModels()
+        {
+            /*
+             
+            * function to get objects to display in combo box
+            * returns the Array list of models.
+            
+           */
+            ArrayList obj_list = new ArrayList();
+            object mail_models = this.Connection.Execute("plugin.handler", "document_type");           
+            foreach (object model in (object[])mail_models)
+            {
+                Model open_model;
+                string[] models = (string[])model;
+                open_model = new Model(models[0], models[1]);
+                open_model.Connection = this.Connection;
+                obj_list.Add(open_model);
+            }
+            return (Model[])obj_list.ToArray(typeof(Model));
+        }
+    }
+
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
new file mode 100644
index 00000000000..8fbcb0a2ec4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F4B2219B-F235-400F-81B4-92F15250BBA4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <StartupObject>
+    </StartupObject>
+    <NoStandardLibraries>false</NoStandardLibraries>
+    <AssemblyName>OpenERPOutlookPlugin</AssemblyName>
+    <RootNamespace>OpenERPOutlookPlugin</RootNamespace>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <OutputPath>.\bin\Debug\</OutputPath>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <IncrementalBuild>false</IncrementalBuild>
+    <RegisterForComInterop>true</RegisterForComInterop>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>true</Optimize>
+    <OutputPath>.\bin\Release\</OutputPath>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <IncrementalBuild>false</IncrementalBuild>
+    <RegisterForComInterop>true</RegisterForComInterop>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="System">
+      <HintPath>System.dll</HintPath>
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data">
+      <HintPath>System.Data.dll</HintPath>
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML">
+      <HintPath>System.XML.dll</HintPath>
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Cache.cs" />
+    <Compile Include="ConfigManager.cs" />
+    <Compile Include="frm_contact.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_contact.designer.cs">
+      <DependentUpon>frm_contact.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_create_doc.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_create_doc.Designer.cs">
+      <DependentUpon>frm_create_doc.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_openerp_connection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_openerp_connection.Designer.cs">
+      <DependentUpon>frm_openerp_connection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_push_mail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_push_mail.designer.cs">
+      <DependentUpon>frm_push_mail.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_select_partner.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_select_partner.Designer.cs">
+      <DependentUpon>frm_select_partner.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_choose_document_opt.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_choose_document_opt.Designer.cs">
+      <DependentUpon>frm_choose_document_opt.cs</DependentUpon>
+    </Compile>
+    <Compile Include="OpenERPOutlookPlugin.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Tools.cs" />
+    <Compile Include="Connect.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="frm_openerp_configuration.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_openerp_configuration.Designer.cs">
+      <DependentUpon>frm_openerp_configuration.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frm_contact.resx">
+      <DependentUpon>frm_contact.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_create_doc.resx">
+      <DependentUpon>frm_create_doc.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_openerp_configuration.resx">
+      <DependentUpon>frm_openerp_configuration.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_openerp_connection.resx">
+      <DependentUpon>frm_openerp_connection.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_push_mail.resx">
+      <DependentUpon>frm_push_mail.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_select_partner.resx">
+      <DependentUpon>frm_select_partner.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_choose_document_opt.resx">
+      <DependentUpon>frm_choose_document_opt.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Core">
+      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>4</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Outlook">
+      <Guid>{00062FFF-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>9</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="stdole">
+      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\195737_152643643962_3595480_n.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Account.png" />
+    <Content Include="Resources\Archive.png" />
+    <Content Include="Resources\Case.png" />
+    <Content Include="Resources\Contact.png" />
+    <Content Include="Resources\Create.png" />
+    <Content Include="Resources\developped_by.png" />
+    <Content Include="Resources\Error.gif" />
+    <Content Include="Resources\Invoice.png" />
+    <Content Include="Resources\logo.png" />
+    <Content Include="Resources\Move.gif" />
+    <Content Include="Resources\MoveDown.png" />
+    <Content Include="Resources\MoveLeft.png" />
+    <Content Include="Resources\openerp.png" />
+    <Content Include="Resources\Partner.png" />
+    <Content Include="Resources\perform.gif" />
+    <Content Include="Resources\Product.png" />
+    <Content Include="Resources\Project.png" />
+    <Content Include="Resources\Sale.png" />
+    <Content Include="Resources\Search.gif" />
+    <Content Include="Resources\settings.png" />
+    <Content Include="Resources\Success.gif" />
+    <Content Include="Resources\Task.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
+      <Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
+      <Name>OpenERPClient</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
new file mode 100644
index 00000000000..be11fa35423
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <StartWorkingDirectory>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\</StartWorkingDirectory>
+    <StartProgram>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe</StartProgram>
+    <StartAction>Program</StartAction>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <StartWorkingDirectory>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\</StartWorkingDirectory>
+    <StartProgram>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe</StartProgram>
+    <StartAction>Program</StartAction>
+  </PropertyGroup>
+</Project>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..5135996facd
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
@@ -0,0 +1,119 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenERPOutlookPlugin.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenERPOutlookPlugin.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap _195737_152643643962_3595480_n {
+            get {
+                object obj = ResourceManager.GetObject("195737_152643643962_3595480_n", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Archive {
+            get {
+                object obj = ResourceManager.GetObject("Archive", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Create {
+            get {
+                object obj = ResourceManager.GetObject("Create", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Error {
+            get {
+                object obj = ResourceManager.GetObject("Error", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap MoveDown {
+            get {
+                object obj = ResourceManager.GetObject("MoveDown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap MoveLeft {
+            get {
+                object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Search {
+            get {
+                object obj = ResourceManager.GetObject("Search", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Success {
+            get {
+                object obj = ResourceManager.GetObject("Success", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
new file mode 100644
index 00000000000..c43e150f921
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MoveLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MoveLeft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Archive.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Create" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Create.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Success" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Success.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="195737_152643643962_3595480_n" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\195737_152643643962_3595480_n.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Error.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MoveDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MoveDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
new file mode 100644
index 00000000000..125ba326671
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3053
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenERPOutlookPlugin.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
new file mode 100644
index 00000000000..15034e76c4c
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
new file mode 100644
index 00000000000..610defc9232
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico
new file mode 100644
index 00000000000..acea3ab0169
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
new file mode 100644
index 00000000000..b13f2b0f523
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
new file mode 100644
index 00000000000..5aa6a958d37
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
new file mode 100644
index 00000000000..9b950b8ea9d
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
new file mode 100644
index 00000000000..9bd6f9f6059
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
new file mode 100644
index 00000000000..1ab240c32cb
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
new file mode 100644
index 00000000000..38c3523781b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
new file mode 100644
index 00000000000..4551107ec3b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
new file mode 100644
index 00000000000..401bf861213
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
new file mode 100644
index 00000000000..3761ff1e747
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
new file mode 100644
index 00000000000..031d7532673
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico
new file mode 100644
index 00000000000..8f6dc9edabc
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
new file mode 100644
index 00000000000..c661339598e
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
new file mode 100644
index 00000000000..51451e422ae
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
new file mode 100644
index 00000000000..0f8ea2af8f5
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
new file mode 100644
index 00000000000..1b0b44f890e
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
new file mode 100644
index 00000000000..b29c3cf1054
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
new file mode 100644
index 00000000000..fb3bff729c5
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
new file mode 100644
index 00000000000..52056b1e713
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
new file mode 100644
index 00000000000..e4004e3d178
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
new file mode 100644
index 00000000000..d6dbd9d83d1
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
new file mode 100644
index 00000000000..326798df2ec
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
new file mode 100644
index 00000000000..16cc3873858
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
new file mode 100644
index 00000000000..ad0298af667
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
new file mode 100644
index 00000000000..5d102c73dd2
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
@@ -0,0 +1,173 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.IO;
+using outlook = Microsoft.Office.Interop.Outlook;
+
+
+namespace OpenERPOutlookPlugin
+{
+    static public class Tools
+    {
+        static public outlook.MailItem[] MailItems()
+        {
+            Microsoft.Office.Interop.Outlook.Application app = null;
+            app = new Microsoft.Office.Interop.Outlook.Application();
+            ArrayList mailItems = new ArrayList();
+            foreach (var selection in app.ActiveExplorer().Selection)
+            {
+                if (selection is outlook.MailItem)
+                {
+                    mailItems.Add((outlook.MailItem)selection);
+                }
+            }
+            return (outlook.MailItem[])mailItems.ToArray(typeof(outlook.MailItem));
+        }
+        
+        static public string[] SplitURL(string url)
+        {
+            /*
+             
+             * Split the url in three parts protocal host and port number.
+               :Param string url : url to split.
+             * returnts the string array which contains the protocol, host name and port number.
+             
+             */
+            string protocall = "";
+            string host = "localhost";
+            string port = "8069";
+            if (url != "")
+            {
+                string[] server = url.Split("://".ToCharArray());
+                protocall = server[0];
+
+                host = server[3];
+                port = "";
+                if (server.Length > 4) port = server[4];
+            }
+            return new string[] { protocall, host, port };
+
+        }
+        static public string JoinURL(string host, string port, bool ssl)
+        {
+            /*
+             
+             * Join the url as per the host, port and protocols are given.
+               :Param string host : host name  
+               :Param string port : port number 
+               :Param boolean ssl : protocol
+             * reruns a string url combination of host, port and protocol.
+             
+             */
+            string protocall = "http";
+            if (ssl) protocall = "https";
+            string url = protocall + "://" + host;
+            if (port != "") url += ":" + port;
+            return url;
+        }
+        static public Hashtable GetAttachments(outlook.MailItem mail)
+        {
+            /*
+             
+             * Gets the attachments of selected mail of outlook mail items.
+               :Param outlook.MailItem mail : gives the selected mail item from the outlook.
+             * returns the hashtable (dictionary) value of the attachemts.
+             */
+            System.IO.FileStream inFile;
+            Hashtable attach = new Hashtable();
+            string[] strattch = new string[4];
+            foreach (outlook.Attachment attach1 in mail.Attachments)
+            {
+                string filename = Tools.GetAppFolderPath() + attach1.FileName;
+                attach1.SaveAsFile(filename);
+                inFile = new System.IO.FileStream(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+                byte[] datas = new Byte[inFile.Length];
+                long bytesRead = inFile.Read(datas, 0, (int)inFile.Length);
+                inFile.Close();
+                string fdata = System.Convert.ToBase64String(datas);
+                attach.Add(attach1.FileName, fdata);
+                strattch[0] = attach1.FileName;
+                System.IO.File.Delete(filename);
+            }
+            return attach;
+        }
+        static public string GetAppFolderPath()
+        {
+            /*
+             
+             * Gets the path of Applicaion folder.
+             * returns String value of file path.
+              
+            */
+            string filePath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            filePath = System.IO.Path.Combine(filePath, "OpenERPOutlook");
+            if (!Directory.Exists(filePath))
+            {
+                Directory.CreateDirectory(filePath);
+            }
+            return filePath;
+        }        
+
+        static public string GetMessageId(outlook.MailItem mail)
+        {
+            var propertyAccessor = mail.PropertyAccessor;
+            string message_id = propertyAccessor.GetProperty("http://schemas.microsoft.com/mapi/proptag/0x1035001E").ToString();
+            return message_id;
+        }
+        static public string GetHeader(outlook.MailItem mail)
+        {
+            var propertyAccessor = mail.PropertyAccessor;
+            //string HEADERS = propertyAccessor.GetProperty("http://schemas.microsoft.com/mapi/string/{3f0a69e0-7f56-11d2-b536-00aa00bbb6e6}/urn:schemas:httpmail:content-disposition-type").ToString(); 
+            string HEADERS = propertyAccessor.GetProperty("http://schemas.microsoft.com/mapi/proptag/0x007D001E").ToString();
+            return HEADERS;
+
+        }
+      
+        static public string EncryptB64Pwd(string pwd)
+        {
+            /*
+             
+             * Accepts the string password and encrypt it into the base64 format.
+               :Param string pwd : A normal string Password.
+             * returns the encrypted base64 passwod from the normal string value.
+             
+             */
+            byte[] encbuff = System.Text.Encoding.UTF8.GetBytes(pwd);
+            string encodepwd = Convert.ToBase64String(encbuff);
+            return "[" + encodepwd + "]";
+
+        }
+        static public string DecryptB64Pwd(string pwd)
+        {
+            /*
+             
+             * Accept the base64 fromat string value and decrypt it to normal string. 
+               :Param : string pwd : A base64 value password.
+             * returns the decrypted string value from the base64 value.
+             */
+            string pswd = pwd.Substring(1, (pwd.Length - 2));
+            byte[] decbuff = Convert.FromBase64String(pswd);
+            string decodpwd = System.Text.Encoding.UTF8.GetString(decbuff);
+            return decodpwd;
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
new file mode 100644
index 00000000000..396ed9ef0f9
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
@@ -0,0 +1,137 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_choose_document_opt
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_choose_document_opt));
+            this.btn_doc = new System.Windows.Forms.Button();
+            this.btn_cncl = new System.Windows.Forms.Button();
+            this.btn_push = new System.Windows.Forms.Button();
+            this.btn_newdoc = new System.Windows.Forms.Button();
+            this.lbl_docname = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // btn_doc
+            // 
+            this.btn_doc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_doc.Image = global::OpenERPOutlookPlugin.Properties.Resources.Archive;
+            this.btn_doc.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_doc.Location = new System.Drawing.Point(31, 146);
+            this.btn_doc.Name = "btn_doc";
+            this.btn_doc.Size = new System.Drawing.Size(169, 32);
+            this.btn_doc.TabIndex = 0;
+            this.btn_doc.Text = "&Open an existing Document";
+            this.btn_doc.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btn_doc.UseVisualStyleBackColor = true;
+            this.btn_doc.Click += new System.EventHandler(this.btn_doc_Click);
+            // 
+            // btn_cncl
+            // 
+            this.btn_cncl.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.btn_cncl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_cncl.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_cncl.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_cncl.Location = new System.Drawing.Point(463, 146);
+            this.btn_cncl.Name = "btn_cncl";
+            this.btn_cncl.Size = new System.Drawing.Size(105, 32);
+            this.btn_cncl.TabIndex = 1;
+            this.btn_cncl.Text = "&Cancel";
+            this.btn_cncl.UseVisualStyleBackColor = true;
+            this.btn_cncl.Click += new System.EventHandler(this.btn_cncl_Click);
+            // 
+            // btn_push
+            // 
+            this.btn_push.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.btn_push.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_push.Image = ((System.Drawing.Image)(resources.GetObject("btn_push.Image")));
+            this.btn_push.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_push.Location = new System.Drawing.Point(231, 146);
+            this.btn_push.Name = "btn_push";
+            this.btn_push.Size = new System.Drawing.Size(199, 32);
+            this.btn_push.TabIndex = 2;
+            this.btn_push.Text = "P&ush to an existing Document";
+            this.btn_push.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btn_push.UseVisualStyleBackColor = true;
+            this.btn_push.Click += new System.EventHandler(this.btn_push_Click);
+            // 
+            // btn_newdoc
+            // 
+            this.btn_newdoc.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_newdoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_newdoc.Image = global::OpenERPOutlookPlugin.Properties.Resources.Create;
+            this.btn_newdoc.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_newdoc.Location = new System.Drawing.Point(31, 146);
+            this.btn_newdoc.Name = "btn_newdoc";
+            this.btn_newdoc.Size = new System.Drawing.Size(169, 32);
+            this.btn_newdoc.TabIndex = 3;
+            this.btn_newdoc.Text = "Create a &new Document";
+            this.btn_newdoc.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btn_newdoc.UseVisualStyleBackColor = true;
+            this.btn_newdoc.Click += new System.EventHandler(this.btn_newdoc_Click);
+            // 
+            // lbl_docname
+            // 
+            this.lbl_docname.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.lbl_docname.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lbl_docname.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbl_docname.Location = new System.Drawing.Point(12, 20);
+            this.lbl_docname.Name = "lbl_docname";
+            this.lbl_docname.Size = new System.Drawing.Size(570, 94);
+            this.lbl_docname.TabIndex = 7;
+            this.lbl_docname.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // frm_choose_document_opt
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(594, 204);
+            this.Controls.Add(this.lbl_docname);
+            this.Controls.Add(this.btn_newdoc);
+            this.Controls.Add(this.btn_push);
+            this.Controls.Add(this.btn_cncl);
+            this.Controls.Add(this.btn_doc);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_choose_document_opt";
+            this.Text = "Document";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_doc;
+        private System.Windows.Forms.Button btn_cncl;
+        private System.Windows.Forms.Button btn_push;
+        private System.Windows.Forms.Button btn_newdoc;
+        private System.Windows.Forms.Label lbl_docname;
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
new file mode 100644
index 00000000000..e364922844b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
@@ -0,0 +1,98 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+using System.Collections;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_choose_document_opt : Form
+    {
+        public frm_choose_document_opt()
+        {
+            InitializeComponent();
+            try
+            {
+                foreach (outlook.MailItem mail in Tools.MailItems())
+                {
+
+                    string name_get = Cache.OpenERPOutlookPlugin.Name_get(mail);
+                    this.Show();
+                    if (name_get != "")
+                    {
+                        lbl_docname.Text = name_get;
+                        btn_newdoc.Visible = false;
+
+                    }
+                    else
+                    {
+                        lbl_docname.Text = mail.Subject;
+                        btn_doc.Visible = false;
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+
+        }
+
+        private void btn_doc_Click(object sender, EventArgs e)
+        {
+            foreach (outlook.MailItem mailitem in Tools.MailItems())
+            {
+                Cache.OpenERPOutlookPlugin.Open_Document(mailitem);
+               
+            }
+            this.Close();
+        }
+
+
+        private void btn_push_Click(object sender, EventArgs e)
+        {
+            frm_push_mail frm_push_mail = new frm_push_mail();
+            frm_push_mail.Show();
+            this.Close();
+        }
+
+        private void btn_cncl_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btn_newdoc_Click(object sender, EventArgs e)
+        {
+            frm_create_doc create_doc = new frm_create_doc();
+            create_doc.Show();
+            this.Close();
+        }
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
new file mode 100644
index 00000000000..bbe4f00b972
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btn_push.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMAAG3E8G2t10a17BaL0ymp6kq78SB7uHa75UCr4zSi4R12sxZmpTy08B6Z3n7J8AAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIZwAfCBxIsKDBgwgHBjCQsKCBAwwb
+        CjQAAEBEggsNaNQIgIBFhwEOiHTgQAABBg4uPjAQYMCABgROFiggIOVAli9lzhQgAMGCmwcSIBAwc6dP
+        jAqSKqV5tKGCnj8lPo0qMQBViVizBgQAOw==
+</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAACAgICAAAAKwAAAGw8PDykT09Pu1BQULpAQEChAAAAYgAAAB0AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAFBQUNAAAAanFxcdygoaH/l5eX/5OTk/+ZmJj/o6Kj/6alpv93d3jbCAgIVwkJ
+        CQMAAAAAAAAAAAAAAAAHBwcKIyQkhLCwr/2IiIv+Q0NH/zc4PP9KSlD/b29w/3l5eP+VlJX/srKy/rCw
+        sf87OztxEBAQAgAAAAD///8ADQ0NYMfGxf5lZXv+BwdS/hISdv8MDGb/EBBw/wgIUf8rK0D/X19g/4yM
+        jP7CwsL+xsbG/ywsLEYAAAAAAAAAFqioqdykpLn+ERGH/hsbo/8vMEj/srK5/4OEpP8cHJr/GRmh/w8P
+        Qv9RUVP/nJuc/trZ2f69vb7aAAAAAiQkI1D49/X/YWGp/yUlzv8WFo3/bW1w/9vb2//x8O//oqPH/yUl
+        xv8jI87/Dw9C/2loaP/Ly8v/8vLy/3FxcD2jo6OR/////1tbyf8uLuf/HByh/2VlaP/e3t7//f39////
+        //9dXc//LS3n/yIi0f8rKzj/pqal//7+/v/W1taEycnJqv////9wcOX/ODj3/ygoz/9ERE3/xMTE//v7
+        +//+/v//09Pz/zMz8v80NPn/EBBx/4KCgf/09PT/7e3to9bW1qn/////oqL6/0JC//9BQf//Hx9G/5aW
+        lP/u7u7///////////9MTPf/Ojr8/yIivv9hYWv/7u7u//X19aTY2NmI//////Hx/P84OPD/QED7/xkZ
+        kf9iYmb/xcXF//r6+v//////fX3n/zc3+/8pKdz/WVlm//Pz8//6+vmIvb29O//////////+jIzV/zMz
+        6P8rK+H/KChP/4yMiv/X19f/+Pj4/42Nyf8pKev/ICDN/3JygP7/////9/f3PgAAAAD5+fnd/////v//
+        //9SUqn/JCTH/xUVmv9SUmn/pqaj/8nJxv9LS4H/Hh7P/w4Oj/7KytH+/v7+5QAAAAAAAAAA5OTkNP//
+        ///+/v7//////2Fhkv8PD4T/DQ1//yYmXP8xMVz/DAyA/xAQmf9iYob///////z8/DsAAAAAAAAAAAAA
+        AAD8/Pxc/v7+//7+/v7////+xcXL/0xMbP8ICEf/AAA+/xISS/6AgJD+//////7+/mgAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPv7+zX+/v7m//////7+/v/////+/////v//////////////7P7+/j4AAAAA+fn5AAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAP7+/kj+/v6S/v7+s/7+/rT+/v6U/v7+TQAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/D8AAPAPAADABwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAH
+        AADwDwAA/D8AAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
new file mode 100644
index 00000000000..e984c8d711b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
@@ -0,0 +1,77 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_contact : Form
+    {
+
+        public frm_contact()
+        {
+            InitializeComponent();
+        }
+
+        public frm_contact(string contact_name, string email_id)
+        {
+            InitializeComponent();
+            txt_contactname_create_contact.Text = contact_name;
+            txtemail.Text = email_id;
+
+        }
+      
+        private void btncancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnCreate_partner_Click(object sender, EventArgs e)
+        {
+
+            try
+            {
+                Cache.OpenERPOutlookPlugin.CreateContactRecord(0, txt_contactname_create_contact.Text, txtemail.Text);
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnLink_partner_Click(object sender, EventArgs e)
+        {
+            frm_select_partner select_partner = new frm_select_partner();
+            select_partner.parent_form = this;
+            select_partner.Show();
+            this.Close();
+        }
+
+       
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
new file mode 100644
index 00000000000..af6c4756875
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
@@ -0,0 +1,166 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_contact
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_contact));
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnCreate_partner = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtemail = new System.Windows.Forms.TextBox();
+            this.lblemail = new System.Windows.Forms.Label();
+            this.txt_contactname_create_contact = new System.Windows.Forms.TextBox();
+            this.lblname = new System.Windows.Forms.Label();
+            this.btnLink_partner = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCancel.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btnCancel.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btnCancel.Location = new System.Drawing.Point(306, 127);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(70, 23);
+            this.btnCancel.TabIndex = 14;
+            this.btnCancel.Text = "&Cancel ";
+            this.btnCancel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnCreate_partner
+            // 
+            this.btnCreate_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCreate_partner.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btnCreate_partner.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.btnCreate_partner.Location = new System.Drawing.Point(189, 127);
+            this.btnCreate_partner.Name = "btnCreate_partner";
+            this.btnCreate_partner.Size = new System.Drawing.Size(109, 23);
+            this.btnCreate_partner.TabIndex = 15;
+            this.btnCreate_partner.Text = "Create &Partner";
+            this.btnCreate_partner.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnCreate_partner.UseVisualStyleBackColor = true;
+            this.btnCreate_partner.Click += new System.EventHandler(this.btnCreate_partner_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.txtemail);
+            this.groupBox1.Controls.Add(this.lblemail);
+            this.groupBox1.Controls.Add(this.txt_contactname_create_contact);
+            this.groupBox1.Controls.Add(this.lblname);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(12, 9);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(369, 110);
+            this.groupBox1.TabIndex = 16;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Address Detail";
+            // 
+            // txtemail
+            // 
+            this.txtemail.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtemail.Location = new System.Drawing.Point(97, 66);
+            this.txtemail.Name = "txtemail";
+            this.txtemail.Size = new System.Drawing.Size(255, 20);
+            this.txtemail.TabIndex = 35;
+            // 
+            // lblemail
+            // 
+            this.lblemail.AutoSize = true;
+            this.lblemail.Location = new System.Drawing.Point(59, 69);
+            this.lblemail.Name = "lblemail";
+            this.lblemail.Size = new System.Drawing.Size(41, 13);
+            this.lblemail.TabIndex = 34;
+            this.lblemail.Text = "Email:";
+            // 
+            // txt_contactname_create_contact
+            // 
+            this.txt_contactname_create_contact.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_contactname_create_contact.Location = new System.Drawing.Point(97, 26);
+            this.txt_contactname_create_contact.Name = "txt_contactname_create_contact";
+            this.txt_contactname_create_contact.Size = new System.Drawing.Size(255, 20);
+            this.txt_contactname_create_contact.TabIndex = 33;
+            // 
+            // lblname
+            // 
+            this.lblname.AutoSize = true;
+            this.lblname.Location = new System.Drawing.Point(9, 29);
+            this.lblname.Name = "lblname";
+            this.lblname.Size = new System.Drawing.Size(91, 13);
+            this.lblname.TabIndex = 27;
+            this.lblname.Text = "Contact Name:";
+            // 
+            // btnLink_partner
+            // 
+            this.btnLink_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnLink_partner.Image = global::OpenERPOutlookPlugin.Properties.Resources.Search;
+            this.btnLink_partner.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btnLink_partner.Location = new System.Drawing.Point(63, 127);
+            this.btnLink_partner.Name = "btnLink_partner";
+            this.btnLink_partner.Size = new System.Drawing.Size(118, 23);
+            this.btnLink_partner.TabIndex = 19;
+            this.btnLink_partner.Text = "&Link To Partner";
+            this.btnLink_partner.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnLink_partner.UseVisualStyleBackColor = true;
+            this.btnLink_partner.Click += new System.EventHandler(this.btnLink_partner_Click);
+            // 
+            // frm_contact
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(394, 159);
+            this.Controls.Add(this.btnLink_partner);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btnCreate_partner);
+            this.Controls.Add(this.btnCancel);
+            this.Cursor = System.Windows.Forms.Cursors.Default;
+            this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_contact";
+            this.Text = "Create Contact";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnCreate_partner;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox txt_contactname_create_contact;
+        private System.Windows.Forms.Label lblname;
+        private System.Windows.Forms.TextBox txtemail;
+        private System.Windows.Forms.Label lblemail;
+        private System.Windows.Forms.Button btnLink_partner;
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
new file mode 100644
index 00000000000..9477f7baa89
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
new file mode 100644
index 00000000000..88ed53cbe94
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
@@ -0,0 +1,127 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_create_doc
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_create_doc));
+            this.grp_create_bx = new System.Windows.Forms.GroupBox();
+            this.btn_main_close = new System.Windows.Forms.Button();
+            this.cmboboxcreate = new System.Windows.Forms.ComboBox();
+            this.btn_create_doc = new System.Windows.Forms.Button();
+            this.lbtypedoc = new System.Windows.Forms.Label();
+            this.grp_create_bx.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // grp_create_bx
+            // 
+            this.grp_create_bx.Controls.Add(this.btn_main_close);
+            this.grp_create_bx.Controls.Add(this.cmboboxcreate);
+            this.grp_create_bx.Controls.Add(this.btn_create_doc);
+            this.grp_create_bx.Controls.Add(this.lbtypedoc);
+            this.grp_create_bx.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.grp_create_bx.Location = new System.Drawing.Point(12, 12);
+            this.grp_create_bx.Name = "grp_create_bx";
+            this.grp_create_bx.Size = new System.Drawing.Size(438, 104);
+            this.grp_create_bx.TabIndex = 0;
+            this.grp_create_bx.TabStop = false;
+            this.grp_create_bx.Text = "Create Document";
+            // 
+            // btn_main_close
+            // 
+            this.btn_main_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_main_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_main_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_main_close.Location = new System.Drawing.Point(353, 63);
+            this.btn_main_close.Name = "btn_main_close";
+            this.btn_main_close.Size = new System.Drawing.Size(63, 23);
+            this.btn_main_close.TabIndex = 9;
+            this.btn_main_close.Text = "&Close ";
+            this.btn_main_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_main_close.UseVisualStyleBackColor = true;
+            this.btn_main_close.Click += new System.EventHandler(this.btn_main_close_Click);
+            // 
+            // cmboboxcreate
+            // 
+            this.cmboboxcreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmboboxcreate.FormattingEnabled = true;
+            this.cmboboxcreate.Items.AddRange(new object[] {
+            ""});
+            this.cmboboxcreate.Location = new System.Drawing.Point(127, 30);
+            this.cmboboxcreate.Name = "cmboboxcreate";
+            this.cmboboxcreate.Size = new System.Drawing.Size(289, 21);
+            this.cmboboxcreate.TabIndex = 6;
+            // 
+            // btn_create_doc
+            // 
+            this.btn_create_doc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_create_doc.Image = global::OpenERPOutlookPlugin.Properties.Resources.Archive;
+            this.btn_create_doc.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_create_doc.Location = new System.Drawing.Point(279, 63);
+            this.btn_create_doc.Name = "btn_create_doc";
+            this.btn_create_doc.Size = new System.Drawing.Size(68, 23);
+            this.btn_create_doc.TabIndex = 5;
+            this.btn_create_doc.Text = "&Create ";
+            this.btn_create_doc.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_create_doc.UseVisualStyleBackColor = true;
+            this.btn_create_doc.Click += new System.EventHandler(this.btn_create_doc_Click);
+            // 
+            // lbtypedoc
+            // 
+            this.lbtypedoc.AutoSize = true;
+            this.lbtypedoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbtypedoc.Location = new System.Drawing.Point(6, 33);
+            this.lbtypedoc.Name = "lbtypedoc";
+            this.lbtypedoc.Size = new System.Drawing.Size(119, 13);
+            this.lbtypedoc.TabIndex = 4;
+            this.lbtypedoc.Text = "Type of Document :";
+            // 
+            // frm_create_doc
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(462, 135);
+            this.Controls.Add(this.grp_create_bx);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "frm_create_doc";
+            this.Text = "Create new Document";
+            this.grp_create_bx.ResumeLayout(false);
+            this.grp_create_bx.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox grp_create_bx;
+        private System.Windows.Forms.ComboBox cmboboxcreate;
+        private System.Windows.Forms.Button btn_create_doc;
+        private System.Windows.Forms.Label lbtypedoc;
+        private System.Windows.Forms.Button btn_main_close;
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
new file mode 100644
index 00000000000..d35e6524a68
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
@@ -0,0 +1,79 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_create_doc : Form
+    {
+        public frm_create_doc()
+        {
+            InitializeComponent();           
+            
+            foreach (Model model in Cache.OpenERPOutlookPlugin.GetMailModels())
+            {
+                if (model.ToString() != "")
+                {                   
+                    cmboboxcreate.Items.Add(model);
+                    cmboboxcreate.Items.Remove("");
+                }
+            }
+        }
+
+        private void btn_create_doc_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (cmboboxcreate.SelectedItem == null)
+                {
+                    throw new Exception("Please select a document from the document list.");
+                }
+                else
+                {
+                    frm_push_mail pushmail = new frm_push_mail();
+                    Model model = (Model)cmboboxcreate.SelectedItem;
+                    pushmail.push_mail(model.model, 0);
+                    this.Close();
+                }
+
+            }
+
+            catch (Exception ex)
+            {
+
+                Connect.handleException(ex);
+            }
+
+        }
+
+        private void btn_main_close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
new file mode 100644
index 00000000000..3c294eb0444
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAACAgICAAAAKwAAAGw8PDykT09Pu1BQULpAQEChAAAAYgAAAB0AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAFBQUNAAAAanFxcdygoaH/l5eX/5OTk/+ZmJj/o6Kj/6alpv93d3jbCAgIVwkJ
+        CQMAAAAAAAAAAAAAAAAHBwcKIyQkhLCwr/2IiIv+Q0NH/zc4PP9KSlD/b29w/3l5eP+VlJX/srKy/rCw
+        sf87OztxEBAQAgAAAAD///8ADQ0NYMfGxf5lZXv+BwdS/hISdv8MDGb/EBBw/wgIUf8rK0D/X19g/4yM
+        jP7CwsL+xsbG/ywsLEYAAAAAAAAAFqioqdykpLn+ERGH/hsbo/8vMEj/srK5/4OEpP8cHJr/GRmh/w8P
+        Qv9RUVP/nJuc/trZ2f69vb7aAAAAAiQkI1D49/X/YWGp/yUlzv8WFo3/bW1w/9vb2//x8O//oqPH/yUl
+        xv8jI87/Dw9C/2loaP/Ly8v/8vLy/3FxcD2jo6OR/////1tbyf8uLuf/HByh/2VlaP/e3t7//f39////
+        //9dXc//LS3n/yIi0f8rKzj/pqal//7+/v/W1taEycnJqv////9wcOX/ODj3/ygoz/9ERE3/xMTE//v7
+        +//+/v//09Pz/zMz8v80NPn/EBBx/4KCgf/09PT/7e3to9bW1qn/////oqL6/0JC//9BQf//Hx9G/5aW
+        lP/u7u7///////////9MTPf/Ojr8/yIivv9hYWv/7u7u//X19aTY2NmI//////Hx/P84OPD/QED7/xkZ
+        kf9iYmb/xcXF//r6+v//////fX3n/zc3+/8pKdz/WVlm//Pz8//6+vmIvb29O//////////+jIzV/zMz
+        6P8rK+H/KChP/4yMiv/X19f/+Pj4/42Nyf8pKev/ICDN/3JygP7/////9/f3PgAAAAD5+fnd/////v//
+        //9SUqn/JCTH/xUVmv9SUmn/pqaj/8nJxv9LS4H/Hh7P/w4Oj/7KytH+/v7+5QAAAAAAAAAA5OTkNP//
+        ///+/v7//////2Fhkv8PD4T/DQ1//yYmXP8xMVz/DAyA/xAQmf9iYob///////z8/DsAAAAAAAAAAAAA
+        AAD8/Pxc/v7+//7+/v7////+xcXL/0xMbP8ICEf/AAA+/xISS/6AgJD+//////7+/mgAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPv7+zX+/v7m//////7+/v/////+/////v//////////////7P7+/j4AAAAA+fn5AAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAP7+/kj+/v6S/v7+s/7+/rT+/v6U/v7+TQAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/D8AAPAPAADABwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAH
+        AADwDwAA/D8AAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
new file mode 100644
index 00000000000..547cdab9354
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
@@ -0,0 +1,334 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_openerp_configuration
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_openerp_configuration));
+            this.btn_main_close = new System.Windows.Forms.Button();
+            this.tbabout = new System.Windows.Forms.TabPage();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.tbconfigsetting = new System.Windows.Forms.TabPage();
+            this.pnconfig = new System.Windows.Forms.Panel();
+            this.chkpwd = new System.Windows.Forms.CheckBox();
+            this.txt_dbname = new System.Windows.Forms.TextBox();
+            this.combo_config_database = new System.Windows.Forms.ComboBox();
+            this.btn_openerp_connect = new System.Windows.Forms.Button();
+            this.txt_password = new System.Windows.Forms.TextBox();
+            this.txt_username = new System.Windows.Forms.TextBox();
+            this.btn_open_server_url_form = new System.Windows.Forms.Button();
+            this.txt_server_config = new System.Windows.Forms.TextBox();
+            this.lbn_password = new System.Windows.Forms.Label();
+            this.lbn_username = new System.Windows.Forms.Label();
+            this.lbn_dbname = new System.Windows.Forms.Label();
+            this.lbn_server = new System.Windows.Forms.Label();
+            this.tb1 = new System.Windows.Forms.TabControl();
+            this.tbabout.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.tbconfigsetting.SuspendLayout();
+            this.pnconfig.SuspendLayout();
+            this.tb1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btn_main_close
+            // 
+            this.btn_main_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_main_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_main_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_main_close.Location = new System.Drawing.Point(801, 420);
+            this.btn_main_close.Name = "btn_main_close";
+            this.btn_main_close.Size = new System.Drawing.Size(63, 23);
+            this.btn_main_close.TabIndex = 8;
+            this.btn_main_close.Text = "Close ";
+            this.btn_main_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_main_close.UseVisualStyleBackColor = true;
+            this.btn_main_close.Click += new System.EventHandler(this.btn_main_close_Click);
+            // 
+            // tbabout
+            // 
+            this.tbabout.Controls.Add(this.groupBox3);
+            this.tbabout.Location = new System.Drawing.Point(4, 22);
+            this.tbabout.Name = "tbabout";
+            this.tbabout.Padding = new System.Windows.Forms.Padding(3);
+            this.tbabout.Size = new System.Drawing.Size(434, 315);
+            this.tbabout.TabIndex = 2;
+            this.tbabout.Text = "About";
+            this.tbabout.UseVisualStyleBackColor = true;
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.pictureBox1);
+            this.groupBox3.Controls.Add(this.richTextBox1);
+            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox3.Location = new System.Drawing.Point(3, 3);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(428, 309);
+            this.groupBox3.TabIndex = 0;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "OpenERP Outlook Plugin";
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(109, 92);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(194, 50);
+            this.pictureBox1.TabIndex = 1;
+            this.pictureBox1.TabStop = false;
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox1.Location = new System.Drawing.Point(3, 16);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.ReadOnly = true;
+            this.richTextBox1.Size = new System.Drawing.Size(422, 290);
+            this.richTextBox1.TabIndex = 0;
+            this.richTextBox1.Text = resources.GetString("richTextBox1.Text");
+            this.richTextBox1.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBox1_LinkClicked);
+            // 
+            // tbconfigsetting
+            // 
+            this.tbconfigsetting.Controls.Add(this.pnconfig);
+            this.tbconfigsetting.Location = new System.Drawing.Point(4, 22);
+            this.tbconfigsetting.Name = "tbconfigsetting";
+            this.tbconfigsetting.Padding = new System.Windows.Forms.Padding(3);
+            this.tbconfigsetting.Size = new System.Drawing.Size(434, 315);
+            this.tbconfigsetting.TabIndex = 0;
+            this.tbconfigsetting.Text = "Configuration Settings";
+            this.tbconfigsetting.UseVisualStyleBackColor = true;
+            // 
+            // pnconfig
+            // 
+            this.pnconfig.Controls.Add(this.chkpwd);
+            this.pnconfig.Controls.Add(this.txt_dbname);
+            this.pnconfig.Controls.Add(this.combo_config_database);
+            this.pnconfig.Controls.Add(this.btn_openerp_connect);
+            this.pnconfig.Controls.Add(this.txt_password);
+            this.pnconfig.Controls.Add(this.txt_username);
+            this.pnconfig.Controls.Add(this.btn_open_server_url_form);
+            this.pnconfig.Controls.Add(this.txt_server_config);
+            this.pnconfig.Controls.Add(this.lbn_password);
+            this.pnconfig.Controls.Add(this.lbn_username);
+            this.pnconfig.Controls.Add(this.lbn_dbname);
+            this.pnconfig.Controls.Add(this.lbn_server);
+            this.pnconfig.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnconfig.Location = new System.Drawing.Point(3, 3);
+            this.pnconfig.Name = "pnconfig";
+            this.pnconfig.Size = new System.Drawing.Size(428, 309);
+            this.pnconfig.TabIndex = 53;
+            // 
+            // chkpwd
+            // 
+            this.chkpwd.AutoSize = true;
+            this.chkpwd.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.chkpwd.Location = new System.Drawing.Point(105, 142);
+            this.chkpwd.Name = "chkpwd";
+            this.chkpwd.Size = new System.Drawing.Size(143, 17);
+            this.chkpwd.TabIndex = 67;
+            this.chkpwd.Text = "Remember Password";
+            this.chkpwd.UseVisualStyleBackColor = true;
+            // 
+            // txt_dbname
+            // 
+            this.txt_dbname.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_dbname.Location = new System.Drawing.Point(105, 57);
+            this.txt_dbname.Name = "txt_dbname";
+            this.txt_dbname.Size = new System.Drawing.Size(269, 20);
+            this.txt_dbname.TabIndex = 58;
+            this.txt_dbname.Visible = false;
+            // 
+            // combo_config_database
+            // 
+            this.combo_config_database.AllowDrop = true;
+            this.combo_config_database.Location = new System.Drawing.Point(105, 57);
+            this.combo_config_database.Name = "combo_config_database";
+            this.combo_config_database.Size = new System.Drawing.Size(269, 21);
+            this.combo_config_database.TabIndex = 59;
+            // 
+            // btn_openerp_connect
+            // 
+            this.btn_openerp_connect.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_openerp_connect.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btn_openerp_connect.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_openerp_connect.Location = new System.Drawing.Point(295, 137);
+            this.btn_openerp_connect.Name = "btn_openerp_connect";
+            this.btn_openerp_connect.Size = new System.Drawing.Size(79, 23);
+            this.btn_openerp_connect.TabIndex = 62;
+            this.btn_openerp_connect.Text = "C&onnect ";
+            this.btn_openerp_connect.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_openerp_connect.UseVisualStyleBackColor = true;
+            this.btn_openerp_connect.Click += new System.EventHandler(this.btn_openerp_connect_Click);
+            // 
+            // txt_password
+            // 
+            this.txt_password.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_password.Location = new System.Drawing.Point(105, 111);
+            this.txt_password.Name = "txt_password";
+            this.txt_password.PasswordChar = '*';
+            this.txt_password.Size = new System.Drawing.Size(269, 20);
+            this.txt_password.TabIndex = 61;
+            // 
+            // txt_username
+            // 
+            this.txt_username.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_username.Location = new System.Drawing.Point(105, 84);
+            this.txt_username.Name = "txt_username";
+            this.txt_username.Size = new System.Drawing.Size(269, 20);
+            this.txt_username.TabIndex = 60;
+            // 
+            // btn_open_server_url_form
+            // 
+            this.btn_open_server_url_form.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_open_server_url_form.Image = global::OpenERPOutlookPlugin.Properties.Resources.Search;
+            this.btn_open_server_url_form.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_open_server_url_form.Location = new System.Drawing.Point(299, 28);
+            this.btn_open_server_url_form.Name = "btn_open_server_url_form";
+            this.btn_open_server_url_form.Size = new System.Drawing.Size(75, 23);
+            this.btn_open_server_url_form.TabIndex = 57;
+            this.btn_open_server_url_form.Text = "C&hange ";
+            this.btn_open_server_url_form.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_open_server_url_form.UseVisualStyleBackColor = true;
+            this.btn_open_server_url_form.Click += new System.EventHandler(this.btn_open_server_url_form_Click);
+            // 
+            // txt_server_config
+            // 
+            this.txt_server_config.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_server_config.Location = new System.Drawing.Point(105, 30);
+            this.txt_server_config.Name = "txt_server_config";
+            this.txt_server_config.ReadOnly = true;
+            this.txt_server_config.Size = new System.Drawing.Size(186, 20);
+            this.txt_server_config.TabIndex = 56;
+            this.txt_server_config.TabStop = false;
+            this.txt_server_config.TextChanged += new System.EventHandler(this.txt_server_config_TextChanged);
+            // 
+            // lbn_password
+            // 
+            this.lbn_password.AutoSize = true;
+            this.lbn_password.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_password.Location = new System.Drawing.Point(33, 114);
+            this.lbn_password.Name = "lbn_password";
+            this.lbn_password.Size = new System.Drawing.Size(69, 13);
+            this.lbn_password.TabIndex = 66;
+            this.lbn_password.Text = "Password :";
+            // 
+            // lbn_username
+            // 
+            this.lbn_username.AutoSize = true;
+            this.lbn_username.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_username.Location = new System.Drawing.Point(34, 86);
+            this.lbn_username.Name = "lbn_username";
+            this.lbn_username.Size = new System.Drawing.Size(71, 13);
+            this.lbn_username.TabIndex = 65;
+            this.lbn_username.Text = "Username :";
+            // 
+            // lbn_dbname
+            // 
+            this.lbn_dbname.AutoSize = true;
+            this.lbn_dbname.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_dbname.Location = new System.Drawing.Point(34, 57);
+            this.lbn_dbname.Name = "lbn_dbname";
+            this.lbn_dbname.Size = new System.Drawing.Size(69, 13);
+            this.lbn_dbname.TabIndex = 64;
+            this.lbn_dbname.Text = "Database :";
+            // 
+            // lbn_server
+            // 
+            this.lbn_server.AutoSize = true;
+            this.lbn_server.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_server.Location = new System.Drawing.Point(34, 30);
+            this.lbn_server.Name = "lbn_server";
+            this.lbn_server.Size = new System.Drawing.Size(72, 13);
+            this.lbn_server.TabIndex = 63;
+            this.lbn_server.Text = "Server      :";
+            // 
+            // tb1
+            // 
+            this.tb1.Controls.Add(this.tbconfigsetting);
+            this.tb1.Controls.Add(this.tbabout);
+            this.tb1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tb1.Location = new System.Drawing.Point(0, 0);
+            this.tb1.Name = "tb1";
+            this.tb1.SelectedIndex = 0;
+            this.tb1.Size = new System.Drawing.Size(442, 341);
+            this.tb1.TabIndex = 40;
+            this.tb1.Tag = "";
+            // 
+            // frm_openerp_configuration
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(442, 341);
+            this.Controls.Add(this.btn_main_close);
+            this.Controls.Add(this.tb1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_openerp_configuration";
+            this.Text = "OpenERP Configuration";
+            this.Load += new System.EventHandler(this.frm_openerp_configuration_Load);
+            this.tbabout.ResumeLayout(false);
+            this.groupBox3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.tbconfigsetting.ResumeLayout(false);
+            this.pnconfig.ResumeLayout(false);
+            this.pnconfig.PerformLayout();
+            this.tb1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_main_close;
+        private System.Windows.Forms.TabPage tbabout;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.TabPage tbconfigsetting;
+        private System.Windows.Forms.Panel pnconfig;
+        private System.Windows.Forms.CheckBox chkpwd;
+        private System.Windows.Forms.TextBox txt_dbname;
+        private System.Windows.Forms.ComboBox combo_config_database;
+        private System.Windows.Forms.Button btn_openerp_connect;
+        private System.Windows.Forms.TextBox txt_password;
+        private System.Windows.Forms.TextBox txt_username;
+        private System.Windows.Forms.Button btn_open_server_url_form;
+        private System.Windows.Forms.TextBox txt_server_config;
+        private System.Windows.Forms.Label lbn_password;
+        private System.Windows.Forms.Label lbn_username;
+        private System.Windows.Forms.Label lbn_dbname;
+        private System.Windows.Forms.Label lbn_server;
+        private System.Windows.Forms.TabControl tb1;
+
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
new file mode 100644
index 00000000000..f5f4909511d
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
@@ -0,0 +1,216 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Diagnostics;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+
+
+    public partial class frm_openerp_configuration : Form
+    {
+        public string combodb_val;
+        public string url;
+        private ConfigManager config_manager;
+        
+        public frm_openerp_configuration()
+        {
+            InitializeComponent();
+
+        }            
+            
+        void load_dbname_list()
+        {            
+            combo_config_database.Items.Clear();            
+            OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+            OpenERPConnect openerp_connect = openerp_outlook.Connection;
+            try
+            {
+                if (openerp_connect.URL != null && openerp_connect.URL != "")
+                {
+                    object[] res_dblist = openerp_connect.DBList();
+                    foreach (var selection in res_dblist)
+                    {
+                        combo_config_database.Items.Add(selection);
+                    }
+                }
+            }
+            catch
+            {
+                this.setdblist(openerp_connect.DBName);
+            }
+        }
+        public void setdblist(string dbname)
+        {
+            txt_dbname.Visible = true;
+            txt_dbname.Text = dbname;
+            combo_config_database.Visible = false;
+        }
+        private void frm_openerp_configuration_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                this.config_manager = new ConfigManager();
+                this.config_manager.LoadConfigurationSetting();
+                
+
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                if (this.txt_server_config.Text != "")
+                {
+                    openerp_connect.URL = this.txt_server_config.Text;
+                }
+                if (openerp_connect.rempwd == true)
+                {
+                    this.txt_password.Text = Tools.DecryptB64Pwd(openerp_connect.pswrd);
+                    this.chkpwd.Checked = true;
+                }
+                if (openerp_connect.URL != null)
+                {
+                    this.txt_server_config.Text = openerp_connect.URL;
+                    this.txt_username.Text = openerp_connect.UserId;                                        
+                    try
+                    {
+                        object[] res_dblist = openerp_connect.DBList();
+                        foreach (string selection in res_dblist)
+                        {
+                            if (openerp_connect.DBName != "" && selection == openerp_connect.DBName)
+                                this.combo_config_database.SelectedText = openerp_connect.DBName;
+
+                        }
+                        this.load_dbname_list();
+                    }
+                    catch
+                    {
+                        this.setdblist(openerp_connect.DBName);
+                    }
+                 
+                }
+                
+                
+            }
+            catch(Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+
+        }       
+
+        private void btn_main_close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btn_openerp_connect_Click(object sender, EventArgs e)
+        {
+
+            try
+            {
+                url = txt_server_config.Text;
+                string dbname;
+                if (txt_dbname.Visible == true)
+                {
+                    dbname = txt_dbname.Text;
+                }
+                else
+                {
+                    dbname = combo_config_database.Text;
+                }
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                openerp_connect.URL = url;
+                openerp_connect.DBName = dbname;
+                openerp_connect.UserId = txt_username.Text;               
+                openerp_connect.rempwd = chkpwd.Checked;
+                if (chkpwd.Checked)
+                {
+                    openerp_connect.pswrd = Tools.EncryptB64Pwd(txt_password.Text);
+                }
+                else
+                    openerp_connect.pswrd = "";
+                if (openerp_connect.Login(openerp_connect.DBName, openerp_connect.UserId, txt_password.Text) != 0)
+                {
+                    openerp_outlook.Connection = openerp_connect;
+                    Cache.OpenERPOutlookPlugin = openerp_outlook;
+                    this.config_manager.SaveConfigurationSetting();
+                    
+                    Connect.displayMessage("Successfully login to OpenERP.");                    
+                    this.Close();
+                }
+
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("Authentication Error!\nInvalid Database.", Form.ActiveForm.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+
+        }
+
+        private void btn_open_server_url_form_Click(object sender, EventArgs e)
+        {
+            frm_openerp_connection openerp_connection = new frm_openerp_connection(this.txt_server_config);
+
+            openerp_connection.Show();
+
+        }        
+
+        private void txt_server_config_TextChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                openerp_connect.URL = txt_server_config.Text;
+                this.combo_config_database.Text = "";
+                this.txt_dbname.Text = "";
+                try
+                {
+                    openerp_connect.DBList();
+                    this.load_dbname_list();
+                    if (txt_dbname.Visible)
+                        txt_dbname.Visible = false;
+                    combo_config_database.Visible = true;
+                }
+                catch
+                {
+                    if (combo_config_database.Visible)
+                        combo_config_database.Visible = false;
+                    this.txt_dbname.Visible = true;
+                }        
+                this.txt_username.Text = "";
+                this.txt_password.Text = "";                
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("http://www.openerp.com",e.LinkText);
+        }       
+    }
+
+}
+
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
new file mode 100644
index 00000000000..ff190785fec
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAL4AAAAuCAYAAACWEqPeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAFERJREFUeF7tnWus
+        VcUVx9vEL37zm59M4web1tKIzxqx1JKQlNaQ2MSm1NpGTUhpKWithlLbWqKmvtAYn41W4rsG0JJiLbX4
+        AIpWqYAvRLgCl/cFvPeC78d0fsP5b9eZO3P23oeDveUekp19z95rr1mz5j9r1mP25vPOuc91/3U1MOI0
+        APC7R1cHIw0DXdB3J/6IxMCI7PRIs27d/g5d0bvA71r8EYmBEdnprgXsxjRd4Hct/ojEQEc63f/aa65v
+        /jy3/eab3NYrZrltf7jK7bz9Vrd78T/d3p07vYE9tCzMypUr3WWXXebGjRvnrrvuutL+PfLII+7KK690
+        W7dubaJ9+eWX3VlnneWOOuooN2bMGHfqqad27Dj22GPdueee617zY5PT/6JFi0K7o0aNqt3+ySef7MaO
+        HesmTpzopk2b5u67774h/asy7jfecIMbPXq0g187/T/zzDNDP+GzfPny0rGQTG0Df3DjRrfjzj+6jZO+
+        59Yd/1X3xpePceuO+4pbd+LocOb3G6O+5DZO/HaYCP2rV1UWqorCOknT39/vdmzf7vbs2ZOVcf369e7y
+        yy8Pg33kkUe6ww47jAKIO/roo91TTz0VngPcDB5gBgiS8aKLLgq0M2bMGML/jjvuCPy43+njxBNOcC++
+        +GJLvSPT4YcffkBtowt4HHPMMW7SpElu8eLFDp1WGSP0Cnilz3Z1QPvocfz48e6WW25xu3fvbtl+beDv
+        3bUrAHndSaP3g90Dfdv117g9y5a6gTfecIObNrqBta+73Yv+7nqnTN4/AaDzk4PVoIoyPiua3t5eN3Pm
+        zGBxjzjiiHDWwFkZnnvuOYcFTQ0KA3b++ecHqxPfP/vss93s2bPDwE6dOjUAg0lhee/0KyLX2h3wVs8B
+        /BUrVrTU+erVq4PF73T76HHDhg2VxvuBBx4I+u+kDOj6iSeeyLZfC/iA+80J4wtr3jt9qhvcti3LfK+3
+        oLg8Aj8rwKbJF1RSxsEG/9q1a92ECROyYAa0WCPkuPrqqw9oUAA9fJhAskqySLg/TIxODrp4VQE+EyM3
+        qQ9UJqyvdNhqPO+5556OAx/ZWQW0GsftVwb+rgV/Ca5LAPGxX3SAvgo4WSGw9IXl927QlhmXVnq2Cv92
+        aACd3I9Wg4sbw7KJRW9Fd8kllwQF4+ak6LB+khPXg5UFl4lryJICPhME4HLgA9c58JflepT5vTng4/sj
+        tw4Mgf2Nb3/GGWcE+VpZa4xGmdsxZ86cITxYSVlFiR8wHPbg2uTJk4M86A4Zcu4ausCNbQv4u/+x6FOr
+        7UGP1d83MFAZvLg/co2YAOtPO8Xteebpys+3A+5Wzzz++OMdsbC4CAwAvr2W9QULFjhAwqTRYAAMrFoM
+        flYcBiXlJl188cUHpJ/nn38+gCVn8SRLDviPPvpo5fb7+voc7goTOp74rCatAmzkSAEf3fX09FSWYY0P
+        4hmLOFbgN4mI2sAfWL+uCbQErvjvdcC4d8cOt9mvENbl6f35T2vxqNNeK1qsD6BqZcGxtvjdZAqWLFni
+        Nm3aFICLlWb55h7KfOihhwJwcZvuuusut3pVcwDPc7fddlvw7ZkcVi4CQLk9TJRYHlakTvW5FZ8c8G1w
+        XlUOnkkF6rh4rXjkgF82YVI8Wali8KP/2sDv/dlPmqz9hrO/W3tA8PW333D9p3y81e/55ljH9apK7RQd
+        1omAFuUooGU5BHykJnEN4uzORp/BIiVJGtPKsWzZMnfNNdc47r/00kthoqyKwA89bRLExn2YO3ducLlI
+        i8bAnz59+meimxdeeCHp4997772129/m471UvMAkbwf4r776am0Z0GcMfFaPWsB/6z8rmsCKj7/z/voK
+        AeCkPguLj7sz5lT31vP/TnYMemIKAuEdt948hGbf4GB4duusy93Gc38QznsTflxK2ft8zLHl4T+7Z8+Z
+        5J75+hi36pzvu76SFezp2de7u79wVAjUY55Y+1c8eAbmz3VPnn6ae+aC82pNaFYM/OX/lcXvJPA3vPlm
+        WN3ivpTFGTmL3w7wMSIx8HE7awEfQDWB9ZQTHPn7utY3CXzv5xM7xLz6V77oNnowql3qAJaGeKFpFWrU
+        C5C1lVy4W9tvvMH1nHx8qDP0nnic2+TjFQ6u7bxnzpDnSc8y+US36bwfDQH1vmeXh1oF8kIH350PPVhZ
+        R7msDgHcEN343Dj5cR26T3B9++23V27T8s0Bvx1XB3cuDnQBHYW6dix+HR+fVRr3M+Xjo5/KwAcob37n
+        W01uDsWquqCHPqQ15/ypeRJ97SS362+PFfyCO+Qrv3ai8Te1ALVJOpUgmdoBK4albZUmfcu7Lz3jx4Vs
+        FG3Ajwm0+cJpn04wv3KwknCPwD2kYT29bQN623/qF7G8yGX7VaavHPABEKDBgnJOHdxTQEn2qayt1P0c
+        8HHDqvLDMuM+prI7gDGVVbG8c1kdXM+77747HMRQOvhN4Y+MEQU4sjupwJqVB9crVU/IpjP75j5cVGSV
+        wmy3ABVA7a1t0+phMjuDvpC0+RcXup6xpzmsqi16bbv26jAABNRkg2SZ9zz1ZBM/XJ7UQO3664KCjsKb
+        pdn12MJPge8nNXIO+qILvJCFswU/fQgT2fvrWy79ZYhTSM32fOP0gg8xEFs4qoKmU3n8O++8s3KbVrYc
+        8AEMbgMpS4J6e+gaaUQAl6u6wqOKu5IC/oHWEPR8bgJngR+sobV4+PcP3t+WcgNQPEAs8AEWrgSDgHsj
+        S9z/6isFHdYTd4jMEilUwK5BYwsEll88mTAx2IgDtJ0CQMbFNvYX6XncJ55/y7suAvieJc8U2y+CJfcT
+        BRpArxVmcMuW8Lf4xKtC2QQYrsA/UOCR6o2TATldHAzgMxlJNuTazAI/uAaN7Qbad9Nu7h3AWUsOP4Cc
+        EgqwqV1oCLBZDfp8QGrpY+CTLrX3adNOtjgGCLGCT6nSFn1N9c3WL7D+PMME7Z06pWiLyVVUsz0vTeAy
+        wOt+DvhkInAdyg7VCkibVm2zisVvF/ikM3F74g15rWTrJPABPPUR0tCt2swCv9hopr02PiDs9ym7dpSL
+        K2PdAbJDgDnmhY+969H5RXWYGEO7PYdYc++327pA7Ibh1+s+LomtPeDS4PYE0PuVJ+eTs8KJx5Zf/ypM
+        Pqy7zSBZVyqsCgv/WktHOeBPmTIlVDzxjzdv3pw8uAcNleWbbtofu9Q9cq4OFpuaBe6ODn7j5qSqpMQb
+        1DrKqrQp+XI+PpVw237qb2QiFY2+8PtJK1fRQR74jR2X1t/G5ajCdAhIvVVs8u8JbBMACRvgZl9XAJ/J
+        l/XdNUEalWC7IhCc2kAZN0eBKytI8N39c6wSbKjL9Yn4QpVmVixWiDgTZWMX2hlYs6aWjnLAr1PAokaQ
+        qhNUGasc8OfNm5ftB1mSGPxY2qVLl9bqu+TrROW2Sl8tTWVXBxC2A/xgXQXmxuoRpyglECuDdYmCj5/I
+        scc8cTUs4IgdBG6Au+GsiSHFCHBpGxeobPUa8Dnpwnf3sQ7ZpNiNwb+XuxQyUBX3L9kByAF/uBewCHZj
+        d4jMU1WLa3XQycpt1QmQBX7wj01wC/DLwJJqFDDb1CMASuXMeRbAWtpUwBro/MpDarUITE3Kk/tYdbs3
+        iIkBaHF/ZPnLFESQixtU1BP8KhEXyYb49zfdWNviDVfg271FKV2xDQGgx+Bn3xFbNcr0WwX4VTJCddqp
+        ZPFZ0i148MtTBadWDYf8vS8MFW4OBaMf/zCrFPL0ol3vi2Xk/lP8bUU5+NXe7bF0+OxNfBLFqTKFFbFG
+        YzdqqoIcdqw2VjFSrX0+dVrGN77//wp8+pEqWDER6tYUOlm5rar/rMXHMtoKKtY/zoOXNYIFVzqR53E5
+        cq8ixkUuAtJUPjyuCaQmkp1sqYlRJjd9V/ALsHGPSLnGz9n9RyF/71OxZbyrAj/1tlZd3gBz4cL9Kdjc
+        kfPxyyy++KW2VOPvl+0KHbYWH8FsgQfgAsaqrsI+H3BZf50MDcWh3ACQftx8ycVNhaAUbb8vf8sdIg0Z
+        g43AFutcZeWAPylKXBbbL1wpK7ty/FaeQZ9pIa1p3S1b+a26AS9n8SkMkbGIMytlWQ7u8wwb7wAgO0gP
+        JvDZq5Tan0Nx6/XX84mDYQ18hKNY05Q2/N1vSq0aG8GKoM9PmJAD94FgqwEgmNQWCeIJ0ocxfcj6NLYJ
+        BCuc2QMSb4+Ic/zwDSuMT1fCRwUrtYfLtd5nntTv+D50uFt2SwfpWXhu9fqhiFX1JftOFbByr0XyfkA7
+        wK+zO5M0Ymq7Au8DsGOzbKVKvYFF1og99mXPtnu/NO+LFWNQLfi3zJzhCFrjRrG2xAG4NNDj5mjLQZmA
+        BM42FsDNssC2e3kCsPwkyPHk6w42fYocTKQ9/1oW0qgUs6grICcFs5gPGaBixSCGSPjutNEUAzUSAewt
+        YhKX9Vf32bJ8sN65BTxlwM+9c1tnrw59IahNbV2YNWtWaaqVVSmeOMjObs+qeqxLVwp8GAJ+rCiuThM4
+        vSVnoEn74eMWL6A3Xi+s+mWFULgygaJtA8uLS8OZI67gpjrMBrutv/9tc+XZVKFxlXJ8wvYKP0kkA5Mj
+        FWuEANpkvZhIcZBdZTDYcHWwvrLAKjB/fnPgH8vEJrJUQYqi0JoaNQk2iuX27OB25Xx+VgS2ZaeeJUYp
+        2+BWRccpmkrA14NYWSz61quuCOlEAMlkIF1IkIklxaLi/9YRCLDZYBJXB8DpgDfpyDp8cbeCK+PlRD7O
+        uCHI3ypOwSXj3QEqwQA5N3kHetaHekCoEXijUNW1sXph1yCfLFHlkVfnOnVggXE1Wn1eZIV/jwAaaON2
+        AWPZaqG+8DUDKqdUkFPyEwCzs5LVLcYFE5PnOOBhn2cylW1proMzS1sL+O02UvYcAabNy7e7/bmsne79
+        +lsaDlWdDQvgU3XV3iDOWOZDVeHdfg2PyTcsgN9UcMKP9+8CdAEyPAByqI5DKfApP7OvWv4ZZ35z2Dwt
+        f+u69mHHz0ITl7NtijLslqRwldhhp3bj3LCuW77QiE73OUse5EuV1SU/g237kmsz1oHlq7YEHP1Wu4Vc
+        jZfQA69GMMmGM+mQADPWKzxFEwegos9tWoOXfcaOp72OLGpXvHipPt5jLzni9lJy2LbFy/ZNvLhnJ5xo
+        +xq64sxzouNsZS/TAbxbAp+trrz7SQDGpika4ysCBCC6xutfMOJrA9Bw5uAaO/yg1U4/rse7/kiL2g1l
+        5MZjKwNY4E2bVDQ1CalKwh++nFWltDJIXs6SR/R6r5SvAKiftAHQ4Udb0Mbvn1odQMMzyGT7qrboCy9b
+        S07pq5Cr8eUG7tNHDT6/eRb6WK8MtNWHQEfuXbSpd2YlB7z1TNl4apx51vZJYwQm4GcnKjqR7jQmcdvo
+        XOMgWundYiSFQbUpXUKvv8t0ILmzwEcwOgToPv7447D/AqWy+47rfPOEjAF/I/C1114bPs/x0UcfhYMG
+        +CQHz3AADGi4ZoEdtjXoTSpe1o42nNkJxN+ffPJJeB65aJuMAu1xtrLQFnSSlzNtQwM9uWPRiw/95Hjn
+        nXfCPbIa0H7wwQdNMlsdYF2gpYLJWf1TWzIK5LOtbsSDPDo0Aj6DyDUBP6VXC0DpQzzoV0pm7vN6IulT
+        eOvLB2orN57oA9kBoO2TxlDPqx+MNVhBLuR47733Qv/itrnOfatn9UE6zGFQbcoYQ6/xhl8rHZQCn9kI
+        kAEBxOyUgynpJ858jYzO0DgvH9AwM5dB0YxFIHhwcC0FfFtsCgWv6L1Y2ibXSzvw1zdaNPjvv/9+kI+z
+        5KOdVsDnWfgBbPVHfKQYeMED2vi7MAKtrCF8NFlSwOejTfDDKskypoAPH+Ri56MFPv2moKSiUkofyK3J
+        zLjE7gL34cObSYyH3tEViFLjCeCZIMjEl9XKgC9LnNpVmWo7Bnr8WxjUmMQYRF/QWOCX6aAU+FgGOi5C
+        DQYKYlAYdGjkWwn4CGEHn+tYE5QHP2vxrX9PNgc3R++12lWBv1kxZK0AIgOIHDb20IQsAz6fu4OWz+yp
+        P3GOWcBH3rj4ItCyyiATfdMKlAL+u+++G+7Tf62iKeCTswaUTJAY+FavKX1wjZWJVVhGwupQKxOARz/Q
+        cF/AT42n3Cb6ySdNyoCvVS/+clqu7TLgk/tvhUFkkowydK10YPWRdXVkpZjxgIKZhRAMjlydDz/80DGo
+        MBTYaFiugWYiNAyodQV4JrwX67c/UPWlkqqXz2PQAxo+6S1FAVb2uNBp+bKc+c11WU7kxqJzHRk0cMjH
+        csxgiw+AgF4TQEswtFquJZdAiy40cRh0+qgB4KztubiCrIpyDaG1Lpj6BQhl1Szw4cWKpFUJax7rAx5Y
+        XPqJ1ROwJbP0g+UGUHJ3rKsTj6dcV7WbAv5LDbdMrg4YQa9acYglcm2XAZ+do5ITPhgEi0GeZ6xlpMp0
+        UAn4KJCZri/TMog0Hg+YmDE4CKCDQbBLEFY/Bn4M8Nxv+Xo8jxz6TwewJCyhXEchWn24r4nGfVUv7cDx
+        v4HwHIDkOVljrinIsv2xskkH3Ie/XB0qsZIHfeh7LkwqaNEloMQtygGfe5JdBiXWa04fapsznze0MtM/
+        VidADMBlNGIf3Y6nJrGuSX+SZ553v2LggxHGSDQEt7m2y4Cfw6CNgWT1JWsrHVQCPkQoqRE8FQFrw8IX
+        ll7MGgEtyg7/oMNaKtDVc3GgWAX8DYsb+Iofz8FT8hGEafXhnuThvq432g6AaFgx987bb7v3PB+e179G
+        XFP8bvxRrI7qC9fhrz7xnNWX4iOAFtMm9FjEU0aXRT+sbFYfDd5BNrXNOV6l6F9Mi9zqq2S142l1zfUP
+        9sdTxT9+v7s/Bixkh0795Tpy5NputFWsZKnfPK9+SX4zPkW/JWsrHahvnEvz+Ja4+3e3qHSoYKALfD/7
+        D5XB7Paj+lh2B70L/BGJgf8CyTGQGzlDYYgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="richTextBox1.Text" xml:space="preserve">
+    <value>
+
+
+ This Outlook  Plugin For OpenERP Presently (2011-Today) developed By OpenERP SA.
+
+
+                      		
+
+
+                                              
+
+
+		For More Information, Please Visit Our Website
+
+			http://www.openerp.com/
+
+	        Copyright 2006-TODAY OpenERP SA ALL Rights Reserved.</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAQEAAAAEAGAAoMgAAFgAAACgAAABAAAAAgAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD////////////////////////////+/v7+/v79/f37+/v7+/v7+/v7+/v9/f39/f3+/v7+/v7+/v7+
+        /v7+/v7+/v7+/v7+/v79/f39/f39/f79/f79/f79/f7+/v79/f3+/v7////9/f38/Pz+/v7+/v7+/v7/
+        ///+/v7+/v7+/v7+/v7+/v7////+/v7+/v7+/v79/f3+/v7+/v7+/v7/////////////////////////
+        ///////////////////////////////////////////////+/v7////+/v719fXw8PDx8fH09PT7+/v/
+        ///////9/f39/f39/f3+/v39/f3+/v7t7u3d3dv8/Pr///7///3///39/f78/f3u7u7q6ur8/P35+fro
+        6en7+/v////+/v7+/v7+/v79/f39/f3+/v7+/v7+/v7+/v7+/v79/f3////////+/v7+/v7/////////
+        ///////////////////////////////////////////////////////////////9/f3+/v7U1NRvb29e
+        Xl5hYWFycnKTk5O1tbXS0tLo6Oj9/f3////////7/P/u7/7AwdRmZnS2tczV1f/S0//U1f/X2P3a2/OS
+        kpC3t7T////AwLqHiIP09PX+/v77+/z9/f39/f3////////+/v7+/v7+/v79/f3////7+/utra3q6ur/
+        ///9/f3////////////////////////////////////////////////////////////////////////8
+        /Pz+/v6goKAAAAAAAAAAAAAAAAAAAAAHBwcoKChNTU14eHioqKayssePkeJtb+xYWvNCRMpBQok7Pa0u
+        MKM+QbJKTNVaW7ZPUJ55e/SrrN1wcYLMzdz////////////////////GxsaOjo78/Pz////9/f38/Pz/
+        //+goKAAAAC2trb////7+/v/////////////////////////////////////////////////////////
+        ///////////////9/f3+/v7Ly8shISEAAAABAQEAAAAAAAAAAAAAAAAAAAAAAAAQEA4XFyQQEToUFVMV
+        FmccHFsRESAEBBcAABIHBhsQETk6O300NsQqLKJAQXw3OcdPUfWIi++5uc2urquSkpJhYWEjIyMVFRX4
+        +Pj////7+/v///+6uroMDAxSUlLr6+v////9/f3/////////////////////////////////////////
+        ///////////////////////////////9/f39/f34+Phubm4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+        AQEAAAEAAAAJCQAKChEBAQAAAAAAAAAAAAEAAAABAQALCxUUFCE3OHkuMd0zNegxM50dHkATExgSEhEK
+        CgoCAgIAAABjY2X////6+vn////CwsITExNkZGTr6+v////9/f3+/v7/////////////////////////
+        ///////////////////////////////////////////////+/v79/f3////S0tIqKioAAAABAQIAAAAA
+        AAAAAAAAAAAAAAEAAAAAAAAoKDg5O8EuL4ADAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFjU+P5YmJjwE
+        BAYAAAEAAAACAgIEBAQAAAANDRDl5eX////////GxsYSEhJra2vx8fH7+/v+/v7+/v7+/v7/////////
+        ///////////////////////////////////////////////////////////////+/v7+/v39/f3///+4
+        uLQXFxgAAAEAAAAAAAEAAAAAAAAAAAASEgw1NnwyNOMjJuUpKo8GBgAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAABAQAAAAAAAAAAAAEBAQEAAAAAAAEAAAEAAAEPDxWBg9vu7v/IyMQPDxBnZ2f29vb7+/v9/f3+/v7+
+        /v7////+/v7////////////////////////////////////////////////////////////+/v7////9
+        /f7+/v79/f79/f25uv9BRLYiIkALCxYEBBAHBxIUFCMqK2M6PcUrLuodINclKNhoadVCQkUAAAAAAAAB
+        AQEBAQEAAAAAAAAAAABHR0hmZmgODg4AAAAAAAAAAAAAAAERESFDRZ0WFh8dHmtNT68TEwhiYmT7+/r+
+        /v79/f3+/v7+/v7////+/v7/////////////////////////////////////////////////////////
+        ///+/v/////+/v7+/v/9/f38/P6ys/EqLdggI+QwNOI1N8ElJ6csLrQyNNQsL+khJOEaHdVDRt6ys/H/
+        ///b29plZWUuLi4VFRUFBQUAAAAAAAAAAACWlpb///+Li4sxMTEjIyQ1NTNNTWQ1N7slKfYyNJcREQMN
+        DQshImOho/H5+f7//v3+/v7+/v7+/v7////+/v7/////////////////////////////////////////
+        ///////////////////////+/v/+/v79/f79/f7ExfQzNtscINgkJ9chJNojJuIlKOQkJ+MiJd4jJtgY
+        G9VgYuPc3Pj////9/f3////////b29uvr6+NjY1nZ2dJSUlra2vf39/////////f39/Gxsbj4+L09P+W
+        mPUnKtksLuMzNFwpK3gvM+YjJt2Iiun39/3+/v7+/v7+/v7+/v7////+/v//////////////////////
+        ///////////////////////////////+/v////7+/v/9/f79/f7p6ftKTd8ZHNclKNkkJ9olKNkkJ9gk
+        J9gjJtclKNgVGdZlaOTo6Pr////8/P3+/v79/f3+/v7////////////5+fno6Ojz8/P////9/f39/f3/
+        //////////////7+/v21t/EqLt0tMNQrL90iJdwhJNcdINiAguj7/P39/f3+/v7+/v7+/v/////+/v//
+        ///////////////////////////////////////////////////+/v/+/v77+/3///+Bg+kUF9YmKdkk
+        J9kkJ9klKNolKNokJ9omKdoZHNdQU+Hf4Pn8/f79/f3+/v7+/v/////+/v7+/v79/f3+/v7+/v79/f3+
+        /v7+/v7+/v7+/v7+/v7+/v79/f7+/v79/f7///+/wPMgItkhJNklKNkkJ9kkJ9kYG9eIiur////7+/3+
+        /v7+/v/+/v////7///////////////////////////////////////////////////7+/v/9/f7////Q
+        0fcfItgiJdklKNokJ9klKNokJ9kkJ9kkJ9kgI9gxM9vGxvX///79/f3+/v7+/v////7////+/v7////+
+        /v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7////////+/v/+/v7+/v78/P7///+ur/AUGNcmKdokJ9kkJ9km
+        KdkWGdaen+7////8/P7+/v7+/v7////+/v7/////////////////////////////////////////////
+        ///+/v78/P3///9hY+MUF9YoK9kkJ9klKNokJ9olKNolKNokJ9kgI9mIier+/v79/f7+/v7+/v/////+
+        /v/////////////////////////////////////////////////////+/v7////+/v7///77+/7///9/
+        gekSFdYnKtkjJtgkJ9klKNoYG9fAwfT////8/P7+/v7+/v7///////7/////////////////////////
+        //////////////7+/v/8/P7////X1/gdINglKNkkJ9klKNokJ9klKNokJ9olKNkjJtk9P93Y2fj////+
+        /v7+/v7////+/v////////////////////////////////////////////////////////////////7+
+        /v/+/v/+/v7+/v7y8/xGSd8ZHNcmKdkjJtkmKdkhJNkxNNvi4/n////9/f7+/v7+/v7/////////////
+        ///////////////////////+/v/////+/v78/f7///99f+gUGNYoK9okJ9klKNolKNolKNokJ9kmKdkg
+        I9iEhen////+/v79/f7+/v/+/v7/////////////////////////////////////////////////////
+        ///////////+/v/////+/v/+/v78/P39/f65uvIgI9kiJdklKNkjJtknKtkcH9heYeP4+P3///79/f7+
+        /v7+/v7////////////////////////////////////+/v/9/f7///76+v09QN0gI9glKNolKNokJ9kk
+        J9olKNokJ9omKdksL9rQ0fb////8/P3+/v7+/v//////////////////////////////////////////
+        ///////////////////////////////+/v/////+/v7+/v79/f7z8/xqbOUZHdclKNklKNojJtgmKdkg
+        I9iYmu3////+/v7+/v7////+/v7///////////////////////////////7+/v/9/f7////KzPUhJdgm
+        KdokJ9klKNolKNolKNokJ9omKdofIthYWuL///////79/f7+/v7/////////////////////////////
+        ///////////////////////////////////////////////////+/v7////9/f/9/f3///6+vvMsL9oh
+        JNkkJ9okJ9kkJ9khJNg9QN3W1/f////+/v7+/v7////////////////////////////////////+/v78
+        /P3///+Ymu0bHtcnKtokJ9olKNolKNolKNokJ9ooK9oXGteVl+z////8/P3+/v7+/v////7/////////
+        ///////////////////////////////////////////////////////////////////////////+/v/9
+        /f3+/v7v8PxiZOQeIdgkJ9klKNokJ9klKNkdINh7fej29v39/f7+/v7////+/v7/////////////////
+        ///////////+/v7+/v7///91duccH9gnKtokJ9okJ9olKNokJ9okJ9klKNogI9nKy/X////9/f7/////
+        ///+/v//////////////////////////////////////////////////////////////////////////
+        ///////+/v/////9/f79/f3///+nqO8lKNkkJ9kkJ9okJ9kkJ9khJNgsL9rJyvX////+/v7+/v7/////
+        ///////////////////////////+/v7//v7///5bXeIgI9kmKdokJ9olKNolKNokJ9olKNohJNgwM9v3
+        9/3///79/f7+/v//////////////////////////////////////////////////////////////////
+        ///////////////////////////+/v/+/v79/f3///7i4vlER94iJdklKNolKNokJ9kmKNkXGdZrbuXy
+        8vz8/P7+/v////7////////////////////////////+/v7///729v1GSN8jJtkkJ9olKNolKNokJ9ok
+        J9omKdobHtdRVOD//////v7+/v7////+/v//////////////////////////////////////////////
+        ///////////////////////////////////////////////+/v/+/v7+/v7///96fOgfItkmKdkkJ9kk
+        J9okJ9ohJNggI9jLy/X+/v79/f3+/v7////+/v/////////////////////+/v7///7w8Pw8P90lKNkk
+        J9klKNolKNolKNokJ9onKtoVGNdwc+b////9/f3+/v7/////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////+/v78/P7///+3
+        ufIjJtknKtkkJ9klKNokJ9knKtkTFtZuceb8/P78/P7+/v7+/v/////////////////////////9/f7/
+        ///j5Po5O9wlKNkkJ9olKNolKNolKNokJ9ooK9oQFNaHiOr////7+/7+/v7/////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        //7+/v/9/f7////q6vo6PN0kJtkkJ9olKNklKNolKNogI9kkJ9nf3/n////9/f7+/v////7/////////
+        ///////////9/f7////e3/k2OdwkJ9kkJ9olKNolKNokJ9okJ9ooK9oSFtadnu3////7+/7+/v////7/
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////+/v/+/v7+/v7///9laOQcINgmKdokJ9olKNokJ9knKtoRFNaGiOn////7+/3+
+        /v7////+/v/////////////////9/f7////o6Po6PdwlKNkkJ9olKNolKNolKNokJ9onKtoTFtaipO7/
+        ///7+/7/////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////+/v/////+/v78/P3///+am+0WGtcoK9okJ9olKNokJ9klKNoe
+        Idg2Odz09P3///79/f7+/v/////////////////////+/v7///7y8vw9P90lKNkkJ9klKNolKNolKNok
+        J9omKdoWGdewsfH////8/P7////+/v//////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////9/f7////Cw/QeIdgmKdok
+        J9kkJ9klKNokJ9knKtkWGda5ufL////8/P7///////7////////////////+/v7///739/1HSt8jJtgl
+        KNokJ9olKNolKNokJ9omKdoZHNe/wPP////8/P7/////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v/9/f7/
+        ///t7fsrLtoiJdklKNokJ9okJ9kkJ9onKtoXGtZvceX////8/P3+/v7////+/v/////////////+/v7/
+        //7///5bXuMgI9kmKdokJ9olKNolKNokJ9omKdoWGdexsvH////8/P7/////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///+/v/////+/v7///7///9DRd4eIdgmKdokJ9olKNokJ9olKNohJNk5PNz09P3////9/f7/////////
+        ///////////+/v7+/v7///9xdOYdINgmKdokJ9olKNolKNokJ9onKtoTFtaio+7////7+/7/////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////+/v7+/v7///9kZuQXGtcnKtokJ9okJ9olKNokJ9kmKdogI9jMzfX/
+        ///8/P7+/v////7////////////+/v78/P7///+LjesaHdcnKtokJ9olKNokJ9okJ9ooK9oTFtahou7/
+        ///7+/7////+/v7/////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////+/v77/P3///9+f+gSFdYoK9okJ9olKNolKNok
+        J9onKtobHteZmu3////8/P7///7///////////////7+/v/8/P7///+ztPEeIdgnKtokJ9olKNolKNok
+        J9ooK9oQE9aOkOv////7+/7+/v7/////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////77+/7///+TlOwRFNYo
+        K9okJ9olKNolKNokJ9omKdocH9d0dub////+/v7+/v7////////////////////9/f7////h4fkmKdkm
+        KdokJ9klKNolKNokJ9ooK9oSFdZ6fOf////8/P3+/v7/////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v7////7
+        +/7///+io+8TFtYnKtokJ9okJ9olKNokJ9olKNogI9hVV+H9/f7///7+/v7////////////+/v/////+
+        /v7///7///5ISt8eIdgmKdokJ9okJ9okJ9onKtoXG9djZeT////+/v7+/v7/////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////8/P7///+3uPIXGtcmKdokJ9olKNolKNolKNokJ9okJ9k+Qd3x8fz///79/f7/////
+        ///////////////+/v/7+/7///97fegWGdYnKtokJ9okJ9kkJ9omKdoeIdhFSN7///////7+/v7/////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////8/P7///+9vvIYG9cmKdokJ9olKNolKNolKNokJ9kkJ9k3Odzg
+        4Pn////9/f7////////////////////////8/P7////Cw/MXGtcmKdkkJ9klKNolKNolKNojJtksLtrx
+        8fz////9/f7////+/v//////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////8/P7///+8vfIYG9cmKdokJ9olKNolKNol
+        KNokJ9olKdkwNNvQ0Pb////9/f7////////////////////+/v/9/f7///739/07Pt0dINgmKdokJ9kl
+        KNokJ9kmKdogI9jKy/X////8/P7///////7/////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////8/P7///+8vfIYG9cm
+        KdokJ9olKNolKNolKNokJ9olKNkvMtvMzfb////9/f7////////////////+/v/////+/v77+/3///+E
+        hekRFNYnKtokJ9klKNokJ9ooK9oXGtebne3////8/P7+/v7////+/v//////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v/////8
+        /P7///+9vvMYG9cmKdokJ9olKNolKNolKNokJ9olKNkwMtvNzvb////9/f7/////////////////////
+        //7+/v/9/f7////X2PcfItgiJdklKNolKNokJ9kmKdodINhpa+T////+/v7+/v7+/v//////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////+/v/7+/7///+2t/IXGtcmKdokJ9olKNolKNolKNokJ9olKNkwMtvNzvb////9/f7/////
+        ///////////////////+/v/+/v78/P75+v5hY+MUGNYnKtkkJ9klKNolKNojJtk/Qd3w8Pz///79/f7+
+        /v////7/////////////////////////////////////////////////////////////////////////
+        //////////////////////////7////7+/7///+jpO4TFtYnKtokJ9olKNolKNolKNokJ9olKNkvMtvN
+        zfX////9/f7////////////////////+/v/////+/v78/P3+/v6+vvMaHtcjJdklKNokKNokJ9knKtkl
+        J9m9vfP////8/P3+/v7/////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////+/v77+/3///+MjesQE9YoK9okJ9olKNolKNol
+        KNokJ9olKNk1N9za2vj////9/f7///////////////////////////////7+/v/8/P7t7vxWWeIXGtcm
+        KdkkJ9kjJtolKNkgItiAgen////+/v79/f7+/v//////////////////////////////////////////
+        ///////////////////////////////////////////////////////////+/v79/f3///9vceUVGNYn
+        KtokJ9olKNolKNolKNokJ9kkKNk7Pt3t7fv///79/f7////////////////////////////////+/v79
+        /f7+/v60tfIiJdkjJtklKNklKNkkJ9oiJdlFR9/j4/r///79/f3+/v7///7/////////////////////
+        //////////////////////////////////////////////////////////////////////7////+/v7/
+        //7///9IS+AdINcmKdokJ9olKNolKNokJ9olKNoiJdhQUuH7+/7///7+/v7/////////////////////
+        //////////7+/v/+/v7+/v7s7PtgYuMcH9ckJ9kkJ9klKNolKNkmKdmoqfD////9/f39/f7////+/v//
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////+/v79/f7////o6PopLNojJtklKNolKNolKNokJ9kkJ9omKdodINdxc+b////+/v7+/v7/////
+        ///////////////////////+/v/////+/v7+/v7///+8vfMuMdoiJdkkJ9klKNokJ9keIdhfYePt7fv/
+        /v79/f3+/v//////////////////////////////////////////////////////////////////////
+        ///////////////+/v/////+/v78/P3///+vsPEaHdcnKtokJ9klKNolKNolKNokJ9knKtobHteZm+3/
+        ///8/P7+/v7////////////////////////////////+/v7////+/v7+/v77+/53eeceIdgmKdkkJ9kk
+        J9oiJdknKtm1tvL///79/f79/f/////+/v7/////////////////////////////////////////////
+        ///////////////////////////////////+/v/+/v79/f7///9xc+YbHtgnKtokJ9olKNolKNolKNok
+        J9kmKdoiJdjQ0Pf////8/P7+/v////7////////////////////////////////+/v7+/v7+/v7////i
+        4vk8P90iJdklKNkkJ9klKNkaHddfYePv8Pz9/f7+/v/+/v7////+/v7/////////////////////////
+        /////////////////////////////////////////////////////v/9/f7////l5Pk3OdwkJ9klKNok
+        J9olKNokJ9kkJ9omKdoeIdhHSt////7///79/f7+/v//////////////////////////////////////
+        ///+/v7+/v79/f7///+ztfEdINgoK9okJ9klKNkjJtkbHtiur/D9/f78/P7///7+/v7////+/v//////
+        ///////////////////////////////////////////////////////////+/v/+/v7+/v79/f3///+X
+        mO0gI9gmKdkkJ9klKNolKNolKNokJ9koK9oUF9aNj+v////8/P7+/v/////+/v//////////////////
+        ///////////////////////+/v7+/v79/f7///+Ag+kTFtYoK9ojJtgmKdkcH9g2Otzo6Pr///79/f7+
+        /v/+/v/////+/v/////////////////////////////////////////////////////////+/v/////+
+        /v/+/v7///7m5/pHSt8iJdklKNokJ9klKNokJ9klKNolKNojJtkkJ9nm5vr////9/f3+/v7/////////
+        //////////////////////////////////////7+/v/+/v/+/v7+/v7///9bXuIXGtcnKtkjJtgoK9kS
+        FdZjZeP7+/78/P7+/v7+/v/+/v7///7////////////////////////////////////////////////+
+        /v/////+/v79/f/+/v7+/v7///+PkewgJNglKNkkJ9klKNokJ9klKNokJ9knKtkTFtZ5e+f////8/P3+
+        /v7////+/v7////////////////////////////////////////+/v/////+/v/+/v79/f7///7u7/xJ
+        S+AaHdcmKdkkJ9koK9oRFNaDhOn7+/79/f79/f7+/v7+/v7+/v7////+/v//////////////////////
+        ///////////+/v7////+/v/+/v/+/v79/f3+/v7Cw/QyNNsgI9gkJ9klKNokJ9klKNokJ9klKNoeItgr
+        Ltrj5Pr///79/f7///////7////////////////////////////////////////////////+/v/////+
+        /v7+/v78/P7///7e3vlER98aHdclKNkkJ9kmKdoWGdaOj+v29v3///79/f79/f7///7+/v7////////+
+        /v/////////////////+/v/////////+/v7+/v7+/v78/P3+/v7X2PhMT+AaHdclKNkkJ9olKNolKNok
+        J9kkJ9kkJ9kWGdecne3////8/P3+/v/+/v7/////////////////////////////////////////////
+        ///////////+/v7////+/v7+/v79/f7+//7R0vdKTd8ZHNcmKNklJ9kkJ9kfIth6e+fs7Pv////9/f79
+        /f7+/v/////+/v////////////////7///7////+/v/+/v/+/v79/f77+/3////c3PlQUuEZHNclKNkk
+        J9kkJ9kkJ9klKNokJ9klKNkWGddjZeTx8fz+/v7+/v7+/v/////+/v//////////////////////////
+        ///////////////////////////////+/v7////9/f7+/v79/v7+/v7Z2fhXWeIWGdYmKdklKNojJtkg
+        I9hWWOHIyfX///////78/P78/P79/f7+/v7+/v7+/v7+/v/+/v/+/v7+/v79/f78/P7+/v7////HyPVF
+        SN8bHtclKNkkJ9kkJ9klKNolKNokJ9kmKdkZHdhCRd7V1vj9/f7+/v7+/v7+/v//////////////////
+        //////////////////////////////////////////////////////7+/v/9/f7+/v7+/v7///7r7Ptx
+        c+YUF9YjJtkoK9okJ9kgI9gqLdp6fOjk5Pr///////7///78/f38/P78/P78/P78/P78/P39/f7///7/
+        ///4+f2PkessL9sgI9glKNkkJ9kkJ9klKNolKNojJtknKtkeIdg1ONzHyPX+/v79/v7+/v7+/v7////+
+        /v/////////////////////////////////////////////////////////////////+/v////7+/v/+
+        /v7+/v7+/v78/P3///+kpe8iJtgXG9coK9omKdolKNkaHdcoK9pwcubExfT09Pz///7///7/////////
+        //////7////l5vqam+0+Qd0bHtgmKdkkJ9kkJ9klKNolKNokJ9kkJ9koK9oeIdgxM9vIyfX////9/f3+
+        /v79/f7////+/v7/////////////////////////////////////////////////////////////////
+        ///////////+/v7////+/v7+/v79/f77+/3////h4fldX+MaHdggI9gmKdkoK9okJ9kWGtYVGNYyNdxZ
+        W+F9fuiUleyZmu2Vlu13eOdPUeAmKdoTFtYfItgnKtkkJ9okJ9klKNolKNokJ9olKNkmKdkaHddKTd/d
+        3vn////8/P3+/v7+/v////7+/v//////////////////////////////////////////////////////
+        ///////////////////////////////+/v7////+/v7+/v7+/v78/P7///////61tvJPUeAmKdofItgi
+        JdkmKdknKtkfItgXG9cTF9YRFNUQE9UQE9UTFtYYG9chJdgoK9olKNokJ9klKNolKNolKNkjJtkiJdke
+        ItgtMNuIiur8/P3////8/P3+/v7+/v/+/v7/////////////////////////////////////////////
+        ///////////////////////////////////////////////////+/v7////+/v/+/v/+/v79/f79/f7/
+        ///4+P21tvJsbuU8Pt0kJ9kcH9ceIdghJNgkJ9kmKdknKtkoK9ooK9onKtomKdolKNokJ9kjJtkgI9kd
+        IdgcH9ghJdg7Pt11d+fT0/f////+/v78/P7+/v7+/v/+/v7////+/v//////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v//////
+        ///+/v7////9/f39/f7///7////9/f7T1Pepq/B8fuhVV+E5O90oK9obHtcYG9cXG9cXGtcXGtcXG9cX
+        GtcXGtcbHdcpLNlAQt5oauScne3V1vf///7////8/P3+/v7+/v7+/v7////////+/v//////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////+/v7////+/v7+/v7+/v79/f79/f7+/v7///7////5+v3l5fnU1ffCwvSurvCanO2K
+        jOp9fuh+f+h9f+iBg+mTleyrrPDDxfTZ2fjv7/v////////+/v79/f79/f3////+/v7////+/v7/////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////+/v7+/v7+/v7+/v79/f79/f39/f79/f7+
+        /v7////+/v77+/74+P319f319f319f329v35+f79/f7////+/v78/P79/f7+/v7+/v7+/v7+/v7/////
+        ///+/v7/////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////+/v7////////+/v/+/v/+
+        /v/+/v7+/v7+/v79/f39/f79/f79/f78/P78/P78/P78/P78/P78/P79/f7+/v79/f7+/v/+/v7///7+
+        /v7+/v7////+/v7///////////////////////////////////////////////////8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
new file mode 100644
index 00000000000..aeca33da72f
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
@@ -0,0 +1,162 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_openerp_connection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_openerp_connection));
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.chkSSL = new System.Windows.Forms.CheckBox();
+            this.txt_server_port = new System.Windows.Forms.TextBox();
+            this.txt_server_host = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btn_server_ok = new System.Windows.Forms.Button();
+            this.btn_server_close = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.chkSSL);
+            this.groupBox1.Controls.Add(this.txt_server_port);
+            this.groupBox1.Controls.Add(this.txt_server_host);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(22, 13);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(202, 123);
+            this.groupBox1.TabIndex = 14;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Connection Parameter";
+            // 
+            // chkSSL
+            // 
+            this.chkSSL.AutoSize = true;
+            this.chkSSL.Location = new System.Drawing.Point(15, 86);
+            this.chkSSL.Name = "chkSSL";
+            this.chkSSL.Size = new System.Drawing.Size(89, 17);
+            this.chkSSL.TabIndex = 19;
+            this.chkSSL.Text = "SSL (https)";
+            this.chkSSL.UseVisualStyleBackColor = true;
+            // 
+            // txt_server_port
+            // 
+            this.txt_server_port.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_server_port.Location = new System.Drawing.Point(58, 60);
+            this.txt_server_port.Name = "txt_server_port";
+            this.txt_server_port.Size = new System.Drawing.Size(138, 20);
+            this.txt_server_port.TabIndex = 18;
+            this.txt_server_port.Text = "8069";
+            // 
+            // txt_server_host
+            // 
+            this.txt_server_host.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_server_host.Location = new System.Drawing.Point(58, 34);
+            this.txt_server_host.Name = "txt_server_host";
+            this.txt_server_host.Size = new System.Drawing.Size(138, 20);
+            this.txt_server_host.TabIndex = 17;
+            this.txt_server_host.Text = "localhost";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(24, 59);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(34, 13);
+            this.label3.TabIndex = 16;
+            this.label3.Text = "Port:";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 34);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(48, 13);
+            this.label2.TabIndex = 15;
+            this.label2.Text = "Server:";
+            // 
+            // btn_server_ok
+            // 
+            this.btn_server_ok.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_server_ok.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btn_server_ok.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.btn_server_ok.Location = new System.Drawing.Point(96, 149);
+            this.btn_server_ok.Name = "btn_server_ok";
+            this.btn_server_ok.Size = new System.Drawing.Size(49, 23);
+            this.btn_server_ok.TabIndex = 13;
+            this.btn_server_ok.Text = "&OK ";
+            this.btn_server_ok.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_server_ok.UseVisualStyleBackColor = true;
+            this.btn_server_ok.Click += new System.EventHandler(this.btn_server_ok_Click);
+            // 
+            // btn_server_close
+            // 
+            this.btn_server_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_server_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_server_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_server_close.Location = new System.Drawing.Point(160, 149);
+            this.btn_server_close.Name = "btn_server_close";
+            this.btn_server_close.Size = new System.Drawing.Size(64, 23);
+            this.btn_server_close.TabIndex = 12;
+            this.btn_server_close.Text = "&Close ";
+            this.btn_server_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_server_close.UseVisualStyleBackColor = true;
+            this.btn_server_close.Click += new System.EventHandler(this.btn_server_close_Click);
+            // 
+            // frm_openerp_connection
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(246, 184);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btn_server_ok);
+            this.Controls.Add(this.btn_server_close);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "frm_openerp_connection";
+            this.Text = "OpenERP Connection";
+            this.Load += new System.EventHandler(this.frm_openerp_connection_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_server_ok;
+        private System.Windows.Forms.Button btn_server_close;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.CheckBox chkSSL;
+        private System.Windows.Forms.TextBox txt_server_port;
+        private System.Windows.Forms.TextBox txt_server_host;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
new file mode 100644
index 00000000000..1c663f58fe2
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
@@ -0,0 +1,79 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_openerp_connection : Form
+    {
+        TextBox txtServerURL;
+        public frm_openerp_connection()
+        {
+            InitializeComponent();            
+        }
+        public frm_openerp_connection(TextBox txt)
+        {
+            InitializeComponent();
+            this.txtServerURL = txt;
+        }
+
+        private void frm_openerp_connection_Load(object sender, EventArgs e)
+        {
+            if (this.txtServerURL.Text != "")
+            {
+                string[] url = Tools.SplitURL(this.txtServerURL.Text);
+                this.txt_server_port.Text = url[2];
+                this.txt_server_host.Text = url[1];
+                if (url[0] == "https")
+                    this.chkSSL.Checked = true;
+                else
+                    this.chkSSL.Checked = false;
+            }
+        }
+
+
+        private void btn_server_ok_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                string url = Tools.JoinURL(this.txt_server_host.Text, this.txt_server_port.Text, this.chkSSL.Checked);
+                this.txtServerURL.Text = url;
+                openerp_connect.check_connectivity();
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btn_server_close_Click(object sender, EventArgs e)
+        {
+
+            this.Close();
+        }
+
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
new file mode 100644
index 00000000000..9477f7baa89
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
new file mode 100644
index 00000000000..37caf4067a3
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
@@ -0,0 +1,77 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_partner : Form
+    {
+
+        public frm_partner()
+        {
+            InitializeComponent();
+        }
+
+        public Form parent_form = null;
+
+        private void btnsave_Click(object sender, EventArgs e)
+        {
+            try
+            {
+
+                if (txt_create_partner.Text == "")
+                {
+                    throw new Exception ("You must enter a Partner Name.");
+                }
+
+                else
+                {
+
+
+                    Record[] partners = Cache.OpenERPOutlookPlugin.SearchPartnerByName(txt_create_partner.Text);
+                    if (partners != null && partners.Length > 0)
+                    {
+                        throw new Exception("Partner already exist.");
+                    }
+                    else
+                    {
+                        frm_select_partner sel_partner = (frm_select_partner)this.parent_form;
+                        sel_partner.SelectPartnerText = txt_create_partner.Text;
+                        sel_partner.search_lst_partner();
+                        this.Close();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+
+                Connect.handleException(ex);
+            }
+
+        }
+
+        private void btncncl_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
new file mode 100644
index 00000000000..41861ea5b62
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
@@ -0,0 +1,106 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_partner
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_partner));
+            this.txt_create_partner = new System.Windows.Forms.TextBox();
+            this.lablname = new System.Windows.Forms.Label();
+            this.btncncl = new System.Windows.Forms.Button();
+            this.btnsave = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // txt_create_partner
+            // 
+            this.txt_create_partner.Location = new System.Drawing.Point(87, 26);
+            this.txt_create_partner.Name = "txt_create_partner";
+            this.txt_create_partner.Size = new System.Drawing.Size(185, 20);
+            this.txt_create_partner.TabIndex = 0;
+            // 
+            // lablname
+            // 
+            this.lablname.AutoSize = true;
+            this.lablname.Location = new System.Drawing.Point(43, 29);
+            this.lablname.Name = "lablname";
+            this.lablname.Size = new System.Drawing.Size(38, 13);
+            this.lablname.TabIndex = 1;
+            this.lablname.Text = "Name:";
+            // 
+            // btncncl
+            // 
+            this.btncncl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btncncl.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btncncl.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btncncl.Location = new System.Drawing.Point(205, 75);
+            this.btncncl.Name = "btncncl";
+            this.btncncl.Size = new System.Drawing.Size(67, 23);
+            this.btncncl.TabIndex = 3;
+            this.btncncl.Text = "&Cancel";
+            this.btncncl.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btncncl.UseVisualStyleBackColor = true;
+            this.btncncl.Click += new System.EventHandler(this.btncncl_Click);
+            // 
+            // btnsave
+            // 
+            this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnsave.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btnsave.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.btnsave.Location = new System.Drawing.Point(139, 75);
+            this.btnsave.Name = "btnsave";
+            this.btnsave.Size = new System.Drawing.Size(60, 23);
+            this.btnsave.TabIndex = 2;
+            this.btnsave.Text = "&Save ";
+            this.btnsave.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnsave.UseVisualStyleBackColor = true;
+            this.btnsave.Click += new System.EventHandler(this.btnsave_Click);
+            // 
+            // frm_partner
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(284, 110);
+            this.Controls.Add(this.btncncl);
+            this.Controls.Add(this.btnsave);
+            this.Controls.Add(this.lablname);
+            this.Controls.Add(this.txt_create_partner);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "frm_partner";
+            this.Text = "Create a new Partner";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox txt_create_partner;
+        private System.Windows.Forms.Label lablname;
+        private System.Windows.Forms.Button btnsave;
+        private System.Windows.Forms.Button btncncl;
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
new file mode 100644
index 00000000000..9477f7baa89
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
new file mode 100644
index 00000000000..b3aa195b68c
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
@@ -0,0 +1,149 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Windows.Forms;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+
+namespace OpenERPOutlookPlugin
+{
+
+    public partial class frm_push_mail : Form
+    {
+
+        public frm_push_mail()
+        {
+          
+                InitializeComponent();                
+                cmboboxcreate.Items.Remove("");
+        }
+
+       public bool push_mail(string model, int thread_id)
+        {
+            foreach (outlook.MailItem mailItem in Tools.MailItems())
+            {
+                Cache.OpenERPOutlookPlugin.PushMail(mailItem, model, thread_id);
+
+            }
+            return true;
+        }
+
+        private void btn_attach_mail_to_partner_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (lstview_object.SelectedItems.Count <= 0)
+                {
+                    throw new Exception("Plese select item from the list to push");
+                }
+                foreach (ListViewItem lv in lstview_object.SelectedItems)
+                {                   
+                    this.push_mail(lv.SubItems[1].Name, Convert.ToInt32(lv.Name));                                           
+                }                
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+       
+
+        private void frm_push_mail_Load(object sender, EventArgs e)
+        {
+            try
+            {
+
+                Model[] document_models = Cache.OpenERPOutlookPlugin.GetMailModels();
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+
+                foreach (Model model in document_models)
+                {
+                    ListViewItem item = new ListViewItem();
+                    item.Name = model.model;
+                    item.Text = model.name;
+                    cmboboxcreate.Items.Add(model);
+                }
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+        private void add_item_recordlist(Record record)
+        {
+            ListViewItem item = new ListViewItem(record.name);
+            item.Name = record.id.ToString();
+            item.Text = record.name;
+            ListViewItem.ListViewSubItem subitem = new ListViewItem.ListViewSubItem();
+            subitem.Name = record.model.model;
+            subitem.Text = cmboboxcreate.SelectedItem.ToString();
+            item.SubItems.Add(subitem);            
+            lstview_object.Items.Add(item);
+        }
+
+        void load_data_list()
+        {
+            lstview_object.Items.Clear();
+
+            Model model = (Model)cmboboxcreate.SelectedItem;
+            ArrayList condition_list = new ArrayList();
+            string name = null;
+            if (txt_doc_search.Text != "")
+            {
+                name = txt_doc_search.Text;                
+            }
+            
+            foreach (Record record in Cache.OpenERPOutlookPlugin.SearchRecord(name,model.model))
+            {
+                this.add_item_recordlist(record);
+            }
+            if (lstview_object.Items.Count <= 0)
+            {
+                Connect.displayMessage("No matching Document(s) found.");
+            }
+            lstview_object.Sort();
+        }
+
+        private void cmboboxcreate_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                this.load_data_list();
+            }
+            catch (Exception ex)
+            { Connect.handleException(ex); }
+        }
+
+        private void btn_search_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                this.load_data_list();
+            }
+            catch
+            { Connect.displayMessage("Please Enter Search Text"); }
+        }
+    }
+}
+
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
new file mode 100644
index 00000000000..f6282eed6b7
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
@@ -0,0 +1,202 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_push_mail
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_push_mail));
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btn_search = new System.Windows.Forms.Button();
+            this.txt_doc_search = new System.Windows.Forms.TextBox();
+            this.lbtsrch = new System.Windows.Forms.Label();
+            this.cmboboxcreate = new System.Windows.Forms.ComboBox();
+            this.lbtypedoc = new System.Windows.Forms.Label();
+            this.lstview_object = new System.Windows.Forms.ListView();
+            this.colheadname = new System.Windows.Forms.ColumnHeader();
+            this.colheadmodelname = new System.Windows.Forms.ColumnHeader();
+            this.btn_attach_mail_to_partner = new System.Windows.Forms.Button();
+            this.lbldocs = new System.Windows.Forms.Label();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.btn_search);
+            this.groupBox1.Controls.Add(this.txt_doc_search);
+            this.groupBox1.Controls.Add(this.lbtsrch);
+            this.groupBox1.Controls.Add(this.cmboboxcreate);
+            this.groupBox1.Controls.Add(this.lbtypedoc);
+            this.groupBox1.Controls.Add(this.lstview_object);
+            this.groupBox1.Controls.Add(this.btn_attach_mail_to_partner);
+            this.groupBox1.Controls.Add(this.lbldocs);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(13, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(440, 460);
+            this.groupBox1.TabIndex = 3;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Link to an Existing Document";
+            // 
+            // btn_search
+            // 
+            this.btn_search.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_search.Image = global::OpenERPOutlookPlugin.Properties.Resources.Search;
+            this.btn_search.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_search.Location = new System.Drawing.Point(364, 59);
+            this.btn_search.Name = "btn_search";
+            this.btn_search.Size = new System.Drawing.Size(70, 23);
+            this.btn_search.TabIndex = 15;
+            this.btn_search.Text = "&Search ";
+            this.btn_search.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_search.UseVisualStyleBackColor = true;
+            this.btn_search.Click += new System.EventHandler(this.btn_search_Click);
+            // 
+            // txt_doc_search
+            // 
+            this.txt_doc_search.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_doc_search.Location = new System.Drawing.Point(104, 59);
+            this.txt_doc_search.Name = "txt_doc_search";
+            this.txt_doc_search.Size = new System.Drawing.Size(254, 20);
+            this.txt_doc_search.TabIndex = 14;
+            // 
+            // lbtsrch
+            // 
+            this.lbtsrch.AutoSize = true;
+            this.lbtsrch.Location = new System.Drawing.Point(32, 59);
+            this.lbtsrch.Name = "lbtsrch";
+            this.lbtsrch.Size = new System.Drawing.Size(51, 13);
+            this.lbtsrch.TabIndex = 13;
+            this.lbtsrch.Text = "Search:";
+            // 
+            // cmboboxcreate
+            // 
+            this.cmboboxcreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmboboxcreate.FormattingEnabled = true;
+            this.cmboboxcreate.Items.AddRange(new object[] {
+            ""});
+            this.cmboboxcreate.Location = new System.Drawing.Point(104, 24);
+            this.cmboboxcreate.Name = "cmboboxcreate";
+            this.cmboboxcreate.Size = new System.Drawing.Size(330, 21);
+            this.cmboboxcreate.TabIndex = 12;
+            this.cmboboxcreate.SelectedIndexChanged += new System.EventHandler(this.cmboboxcreate_SelectedIndexChanged);
+            // 
+            // lbtypedoc
+            // 
+            this.lbtypedoc.AutoSize = true;
+            this.lbtypedoc.Location = new System.Drawing.Point(15, 24);
+            this.lbtypedoc.Name = "lbtypedoc";
+            this.lbtypedoc.Size = new System.Drawing.Size(68, 13);
+            this.lbtypedoc.TabIndex = 11;
+            this.lbtypedoc.Text = "Document:";
+            // 
+            // lstview_object
+            // 
+            this.lstview_object.Alignment = System.Windows.Forms.ListViewAlignment.Default;
+            this.lstview_object.AllowColumnReorder = true;
+            this.lstview_object.BackgroundImageTiled = true;
+            this.lstview_object.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colheadname,
+            this.colheadmodelname});
+            this.lstview_object.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lstview_object.FullRowSelect = true;
+            this.lstview_object.GridLines = true;
+            this.lstview_object.HideSelection = false;
+            this.lstview_object.Location = new System.Drawing.Point(9, 110);
+            this.lstview_object.Name = "lstview_object";
+            this.lstview_object.Size = new System.Drawing.Size(425, 299);
+            this.lstview_object.TabIndex = 10;
+            this.lstview_object.UseCompatibleStateImageBehavior = false;
+            this.lstview_object.View = System.Windows.Forms.View.Details;
+            // 
+            // colheadname
+            // 
+            this.colheadname.Text = "Name";
+            this.colheadname.Width = 247;
+            // 
+            // colheadmodelname
+            // 
+            this.colheadmodelname.Text = "Model Name";
+            this.colheadmodelname.Width = 400;
+            // 
+            // btn_attach_mail_to_partner
+            // 
+            this.btn_attach_mail_to_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_attach_mail_to_partner.Image = global::OpenERPOutlookPlugin.Properties.Resources.Archive;
+            this.btn_attach_mail_to_partner.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_attach_mail_to_partner.Location = new System.Drawing.Point(377, 424);
+            this.btn_attach_mail_to_partner.Name = "btn_attach_mail_to_partner";
+            this.btn_attach_mail_to_partner.Size = new System.Drawing.Size(57, 23);
+            this.btn_attach_mail_to_partner.TabIndex = 4;
+            this.btn_attach_mail_to_partner.Text = "P&ush ";
+            this.btn_attach_mail_to_partner.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_attach_mail_to_partner.UseVisualStyleBackColor = true;
+            this.btn_attach_mail_to_partner.Click += new System.EventHandler(this.btn_attach_mail_to_partner_Click);
+            // 
+            // lbldocs
+            // 
+            this.lbldocs.AutoSize = true;
+            this.lbldocs.Location = new System.Drawing.Point(9, 91);
+            this.lbldocs.Name = "lbldocs";
+            this.lbldocs.Size = new System.Drawing.Size(74, 13);
+            this.lbldocs.TabIndex = 0;
+            this.lbldocs.Text = "Documents:";
+            // 
+            // frm_push_mail
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(467, 484);
+            this.Controls.Add(this.groupBox1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.MaximizeBox = false;
+            this.Name = "frm_push_mail";
+            this.Text = "Push Mail";
+            this.Load += new System.EventHandler(this.frm_push_mail_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.ListView lstview_object;
+        private System.Windows.Forms.ColumnHeader colheadname;
+        private System.Windows.Forms.ColumnHeader colheadmodelname;
+        private System.Windows.Forms.Button btn_attach_mail_to_partner;
+        private System.Windows.Forms.Label lbldocs;
+        private System.Windows.Forms.ComboBox cmboboxcreate;
+        private System.Windows.Forms.Label lbtypedoc;
+        private System.Windows.Forms.Button btn_search;
+        private System.Windows.Forms.TextBox txt_doc_search;
+        private System.Windows.Forms.Label lbtsrch;
+
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
new file mode 100644
index 00000000000..3c294eb0444
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAACAgICAAAAKwAAAGw8PDykT09Pu1BQULpAQEChAAAAYgAAAB0AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAFBQUNAAAAanFxcdygoaH/l5eX/5OTk/+ZmJj/o6Kj/6alpv93d3jbCAgIVwkJ
+        CQMAAAAAAAAAAAAAAAAHBwcKIyQkhLCwr/2IiIv+Q0NH/zc4PP9KSlD/b29w/3l5eP+VlJX/srKy/rCw
+        sf87OztxEBAQAgAAAAD///8ADQ0NYMfGxf5lZXv+BwdS/hISdv8MDGb/EBBw/wgIUf8rK0D/X19g/4yM
+        jP7CwsL+xsbG/ywsLEYAAAAAAAAAFqioqdykpLn+ERGH/hsbo/8vMEj/srK5/4OEpP8cHJr/GRmh/w8P
+        Qv9RUVP/nJuc/trZ2f69vb7aAAAAAiQkI1D49/X/YWGp/yUlzv8WFo3/bW1w/9vb2//x8O//oqPH/yUl
+        xv8jI87/Dw9C/2loaP/Ly8v/8vLy/3FxcD2jo6OR/////1tbyf8uLuf/HByh/2VlaP/e3t7//f39////
+        //9dXc//LS3n/yIi0f8rKzj/pqal//7+/v/W1taEycnJqv////9wcOX/ODj3/ygoz/9ERE3/xMTE//v7
+        +//+/v//09Pz/zMz8v80NPn/EBBx/4KCgf/09PT/7e3to9bW1qn/////oqL6/0JC//9BQf//Hx9G/5aW
+        lP/u7u7///////////9MTPf/Ojr8/yIivv9hYWv/7u7u//X19aTY2NmI//////Hx/P84OPD/QED7/xkZ
+        kf9iYmb/xcXF//r6+v//////fX3n/zc3+/8pKdz/WVlm//Pz8//6+vmIvb29O//////////+jIzV/zMz
+        6P8rK+H/KChP/4yMiv/X19f/+Pj4/42Nyf8pKev/ICDN/3JygP7/////9/f3PgAAAAD5+fnd/////v//
+        //9SUqn/JCTH/xUVmv9SUmn/pqaj/8nJxv9LS4H/Hh7P/w4Oj/7KytH+/v7+5QAAAAAAAAAA5OTkNP//
+        ///+/v7//////2Fhkv8PD4T/DQ1//yYmXP8xMVz/DAyA/xAQmf9iYob///////z8/DsAAAAAAAAAAAAA
+        AAD8/Pxc/v7+//7+/v7////+xcXL/0xMbP8ICEf/AAA+/xISS/6AgJD+//////7+/mgAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPv7+zX+/v7m//////7+/v/////+/////v//////////////7P7+/j4AAAAA+fn5AAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAP7+/kj+/v6S/v7+s/7+/rT+/v6U/v7+TQAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/D8AAPAPAADABwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAH
+        AADwDwAA/D8AAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
new file mode 100644
index 00000000000..95c478fbb1e
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
@@ -0,0 +1,141 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_select_partner
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_select_partner));
+            this.txt_select_partner = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lstbox_select_partner = new System.Windows.Forms.ListBox();
+            this.btn_select_partner_select = new System.Windows.Forms.Button();
+            this.btn_select_partner_close = new System.Windows.Forms.Button();
+            this.btn_select_partner_search = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // txt_select_partner
+            // 
+            this.txt_select_partner.Location = new System.Drawing.Point(19, 20);
+            this.txt_select_partner.Name = "txt_select_partner";
+            this.txt_select_partner.Size = new System.Drawing.Size(209, 20);
+            this.txt_select_partner.TabIndex = 0;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.lstbox_select_partner);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(13, 51);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(307, 368);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Partner Name";
+            // 
+            // lstbox_select_partner
+            // 
+            this.lstbox_select_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lstbox_select_partner.FormattingEnabled = true;
+            this.lstbox_select_partner.Location = new System.Drawing.Point(6, 27);
+            this.lstbox_select_partner.Name = "lstbox_select_partner";
+            this.lstbox_select_partner.Size = new System.Drawing.Size(295, 329);
+            this.lstbox_select_partner.TabIndex = 4;
+            // 
+            // btn_select_partner_select
+            // 
+            this.btn_select_partner_select.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_select_partner_select.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btn_select_partner_select.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_select_partner_select.Location = new System.Drawing.Point(192, 432);
+            this.btn_select_partner_select.Name = "btn_select_partner_select";
+            this.btn_select_partner_select.Size = new System.Drawing.Size(53, 23);
+            this.btn_select_partner_select.TabIndex = 6;
+            this.btn_select_partner_select.Text = "&Link";
+            this.btn_select_partner_select.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_select_partner_select.UseVisualStyleBackColor = true;
+            this.btn_select_partner_select.Click += new System.EventHandler(this.btn_select_partner_select_Click);
+            // 
+            // btn_select_partner_close
+            // 
+            this.btn_select_partner_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_select_partner_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_select_partner_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_select_partner_close.Location = new System.Drawing.Point(251, 432);
+            this.btn_select_partner_close.Name = "btn_select_partner_close";
+            this.btn_select_partner_close.Size = new System.Drawing.Size(64, 23);
+            this.btn_select_partner_close.TabIndex = 5;
+            this.btn_select_partner_close.Text = "&Close ";
+            this.btn_select_partner_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_select_partner_close.UseVisualStyleBackColor = true;
+            this.btn_select_partner_close.Click += new System.EventHandler(this.btn_select_partner_close_Click);
+            // 
+            // btn_select_partner_search
+            // 
+            this.btn_select_partner_search.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_select_partner_search.Image = ((System.Drawing.Image)(resources.GetObject("btn_select_partner_search.Image")));
+            this.btn_select_partner_search.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_select_partner_search.Location = new System.Drawing.Point(245, 19);
+            this.btn_select_partner_search.Name = "btn_select_partner_search";
+            this.btn_select_partner_search.Size = new System.Drawing.Size(75, 23);
+            this.btn_select_partner_search.TabIndex = 1;
+            this.btn_select_partner_search.Text = "&Search ";
+            this.btn_select_partner_search.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_select_partner_search.UseVisualStyleBackColor = true;
+            this.btn_select_partner_search.Click += new System.EventHandler(this.btn_select_partner_search_Click);
+            // 
+            // frm_select_partner
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(350, 467);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btn_select_partner_select);
+            this.Controls.Add(this.btn_select_partner_close);
+            this.Controls.Add(this.btn_select_partner_search);
+            this.Controls.Add(this.txt_select_partner);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_select_partner";
+            this.Text = "Select Partner";
+            this.Load += new System.EventHandler(this.frm_select_partner_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox txt_select_partner;
+        private System.Windows.Forms.Button btn_select_partner_search;
+        private System.Windows.Forms.Button btn_select_partner_close;
+        private System.Windows.Forms.Button btn_select_partner_select;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.ListBox lstbox_select_partner;
+    }
+}
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
new file mode 100644
index 00000000000..4e3af054c3e
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
@@ -0,0 +1,121 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+
+namespace OpenERPOutlookPlugin
+{
+
+    public partial class frm_select_partner : Form
+    {
+        public frm_select_partner()
+        {
+            InitializeComponent();
+           
+        }
+        public Form parent_form = null;
+
+        private void btn_select_partner_select_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (lstbox_select_partner.SelectedItem == null)
+                {
+                    throw new Exception("Please select a partner from the list.");
+                }
+                else
+                {
+                    txt_select_partner.Text = lstbox_select_partner.SelectedItem.ToString();
+                    int partner_id = (int)Cache.OpenERPOutlookPlugin.CreatePartnerRecord(lstbox_select_partner.SelectedItem.ToString());
+                    foreach (outlook.MailItem mailItem in Tools.MailItems())
+                    {
+                        Cache.OpenERPOutlookPlugin.CreateContactRecord(partner_id, mailItem.SenderName, mailItem.SenderEmailAddress);
+                    }
+                    this.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btn_select_partner_close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        public void search_lst_partner()
+        {
+            /*
+            * Will search the list of partners as per the given search criteria.
+            */
+            try
+            {
+                lstbox_select_partner.Items.Clear();
+                foreach (Record oo in Cache.OpenERPOutlookPlugin.SearchRecord(txt_select_partner.Text, "res.partner"))
+                {
+                    lstbox_select_partner.Items.Add(oo.name);
+                }
+                if (lstbox_select_partner.Items.Count == 0)
+                {
+                    Connect.displayMessage("No matching Partner(s) found.");
+                }
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btn_select_partner_search_Click(object sender, EventArgs e)
+        {
+            search_lst_partner();
+        }
+
+        public string SelectPartnerText
+        {
+            /*
+             * Will gets and sets the selected partner from the list of partners.
+             */
+            get
+            {
+                return this.txt_select_partner.Text;
+            }
+            set
+            {
+                this.txt_select_partner.Text = value;
+            }
+        }
+
+        private void frm_select_partner_Load(object sender, EventArgs e)
+        {
+            Record[] partenr_list = Cache.OpenERPOutlookPlugin.SearchRecord(null,"res.partner");
+
+            foreach (Record partner in partenr_list)
+            {
+                lstbox_select_partner.Items.Add(partner.name);
+            }
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
new file mode 100644
index 00000000000..17f1d222db0
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btn_select_partner_search.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAPYAAPb29v7+/v39/fr6+t///+P//+T//9zc3IKDkfP//8X3//Pz99P//5Zxf5qqwZiZ
+        nc98R5K03KS83aG60bbr/8f5/7C61fX09OXm5rzx/////qzI6sr2/7TO6vr//7vt/9n//7rt/+Xl5LLm
+        //2rRKihla683sx6SXp/iuzs9P/+/aC4xd/w+LHl/4+ewuTk5Ih1jpKhucjh7cHAwaGepcfH2bHe+2ps
+        ft7f4Pz8/Ih1jZmYot7d3PPy+Nb//9T//4WJm97f38v5/8LE3cD0/8v9///pybnb8fjgv9z///////v7
+        +/urRnt7hLnk/9Tk86zg/5mZpn+Ajbvm//j+/7nt///aof/58f/589v//5m75dH//8P3/8L3/2trg8z8
+        /4uiwadtSIGMrMaAXZ6hvqKhouz///ysRbvr//39/v/XnZaotvPOmbSwtpl0hv2mOcjO5bu7vry8yd7e
+        7K+tsLC83ZiuzqyEacrW6P///wAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAHkALAAAAAAQABAAAAejgHmC
+        g4SFhoILFnYSJjUAh3lpQyw+RB9aZBeGAXBPVE5QI1wRcoY9HRxTIRVCXwoOA4VzRxQtRVkFBCArj4Qp
+        GxlVPwYJZgRrvYMBdTZdDAUeSjJAsYNXSHEuaFtJBnheM4QaaiR3TWJgEzE3ZTmDKkZnEA07PG00dAdL
+        g1hWTGMwpGDIE0CAgEJs3pzQgeIFJEElwrhBIOKhIBwPogSxyNFQIAA7
+</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj
new file mode 100644
index 00000000000..2ecd6c494cf
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj
@@ -0,0 +1,988 @@
+"DeployProject"
+{
+"VSVersion" = "3:800"
+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
+"IsWebType" = "8:FALSE"
+"ProjectName" = "8:OpenERPOutlookPluginSetup"
+"LanguageId" = "3:1033"
+"CodePage" = "3:1252"
+"UILanguageId" = "3:1033"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
+    "Hierarchy"
+    {
+        "Entry"
+        {
+        "MsmKey" = "8:_6AC61E6DAA74BD8A62A56739851214E7"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7588D46F3D97B108090A11D1415DE5EC"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9BA1227571F16B6ABCB102A098A4B13F"
+        "OwnerKey" = "8:_6AC61E6DAA74BD8A62A56739851214E7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9BA1227571F16B6ABCB102A098A4B13F"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B66CD6B8E834B37C2AFA64398688811D"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B66CD6B8E834B37C2AFA64398688811D"
+        "OwnerKey" = "8:_7588D46F3D97B108090A11D1415DE5EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_7588D46F3D97B108090A11D1415DE5EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_9BA1227571F16B6ABCB102A098A4B13F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_6AC61E6DAA74BD8A62A56739851214E7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_B66CD6B8E834B37C2AFA64398688811D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+    }
+    "Configurations"
+    {
+        "Debug"
+        {
+        "DisplayName" = "8:Debug"
+        "IsDebugOnly" = "11:TRUE"
+        "IsReleaseOnly" = "11:FALSE"
+        "OutputFilename" = "8:Debug\\OpenERPOutlookPluginSetup.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5"
+                    {
+                    "Name" = "8:.NET Framework 3.5"
+                    "ProductCode" = "8:Microsoft.Net.Framework.3.5"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
+            }
+        }
+        "Release"
+        {
+        "DisplayName" = "8:Release"
+        "IsDebugOnly" = "11:FALSE"
+        "IsReleaseOnly" = "11:TRUE"
+        "OutputFilename" = "8:Release\\OpenERPOutlookPluginSetup.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5"
+                    {
+                    "Name" = "8:.NET Framework 3.5"
+                    "ProductCode" = "8:Microsoft.Net.Framework.3.5"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
+            }
+        }
+    }
+    "Deployable"
+    {
+        "CustomAction"
+        {
+        }
+        "DefaultFeature"
+        {
+        "Name" = "8:DefaultFeature"
+        "Title" = "8:"
+        "Description" = "8:"
+        }
+        "ExternalPersistence"
+        {
+            "LaunchCondition"
+            {
+                "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_BFDD92B2291E48D1A8B52DFCA8631CD4"
+                {
+                "Name" = "8:.NET Framework"
+                "Message" = "8:[VSDNETMSG]"
+                "Version" = "8:3.5.21022"
+                "AllowLaterVersions" = "11:FALSE"
+                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"
+                }
+            }
+        }
+        "File"
+        {
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6AC61E6DAA74BD8A62A56739851214E7"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+                "ScatterAssemblies"
+                {
+                    "_6AC61E6DAA74BD8A62A56739851214E7"
+                    {
+                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Microsoft.Office.Interop.Outlook.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7588D46F3D97B108090A11D1415DE5EC"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:OpenERPClient, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_7588D46F3D97B108090A11D1415DE5EC"
+                    {
+                    "Name" = "8:OpenERPClient.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:OpenERPClient.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9BA1227571F16B6ABCB102A098A4B13F"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:office, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+                "ScatterAssemblies"
+                {
+                    "_9BA1227571F16B6ABCB102A098A4B13F"
+                    {
+                    "Name" = "8:office.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:office.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B66CD6B8E834B37C2AFA64398688811D"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:CookComputing.XmlRpcV2, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_B66CD6B8E834B37C2AFA64398688811D"
+                    {
+                    "Name" = "8:CookComputing.XmlRpcV2.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:CookComputing.XmlRpcV2.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+        }
+        "FileType"
+        {
+        }
+        "Folder"
+        {
+            "{1525181F-901A-416C-8A58-119130FE478E}:_0AB219A94AD9480C8B328A36290F8500"
+            {
+            "Name" = "8:#1916"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:DesktopFolder"
+                "Folders"
+                {
+                }
+            }
+            "{1525181F-901A-416C-8A58-119130FE478E}:_BE76AEAED62647E882A7E7E462208B6C"
+            {
+            "Name" = "8:#1919"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:ProgramMenuFolder"
+                "Folders"
+                {
+                }
+            }
+            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_F8355F1930014BA7AC04125197F9FCF8"
+            {
+            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+            "Name" = "8:#1925"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:TARGETDIR"
+                "Folders"
+                {
+                }
+            }
+        }
+        "LaunchCondition"
+        {
+        }
+        "Locator"
+        {
+        }
+        "MsiBootstrapper"
+        {
+        "LangId" = "3:1033"
+        "RequiresElevation" = "11:FALSE"
+        }
+        "Product"
+        {
+        "Name" = "8:Microsoft Visual Studio"
+        "ProductName" = "8:OpenERPOutlookPluginSetup"
+        "ProductCode" = "8:{DB110066-1D22-421E-AE6E-008EFC7D9BA3}"
+        "PackageCode" = "8:{01C16D46-10C4-4867-9DA7-158EA0851BA2}"
+        "UpgradeCode" = "8:{D423841B-05E6-4B05-93A7-3AF0D3F87416}"
+        "RestartWWWService" = "11:FALSE"
+        "RemovePreviousVersions" = "11:FALSE"
+        "DetectNewerInstalledVersion" = "11:TRUE"
+        "InstallAllUsers" = "11:FALSE"
+        "ProductVersion" = "8:1.0.0"
+        "Manufacturer" = "8:OpenERP"
+        "ARPHELPTELEPHONE" = "8:"
+        "ARPHELPLINK" = "8:"
+        "Title" = "8:OpenERPOutlookPluginSetup"
+        "Subject" = "8:"
+        "ARPCONTACT" = "8:OpenERP"
+        "Keywords" = "8:"
+        "ARPCOMMENTS" = "8:"
+        "ARPURLINFOABOUT" = "8:"
+        "ARPPRODUCTICON" = "8:"
+        "ARPIconIndex" = "3:0"
+        "SearchPath" = "8:"
+        "UseSystemSearchPath" = "11:TRUE"
+        "TargetPlatform" = "3:0"
+        "PreBuildEvent" = "8:"
+        "PostBuildEvent" = "8:"
+        "RunPostBuildEvent" = "3:0"
+        }
+        "Registry"
+        {
+            "HKLM"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_85BD67F9F053414A885B4BD155C3503A"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_EBCD33B942DF4A239ACC7022DD3FEAA6"
+                            {
+                            "Name" = "8:Microsoft"
+                            "Condition" = "8:"
+                            "AlwaysCreate" = "11:TRUE"
+                            "DeleteAtUninstall" = "11:FALSE"
+                            "Transitive" = "11:FALSE"
+                                "Keys"
+                                {
+                                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_5B7FCC91FAAA4F64BB7C83492A6F2AF0"
+                                    {
+                                    "Name" = "8:Office"
+                                    "Condition" = "8:"
+                                    "AlwaysCreate" = "11:TRUE"
+                                    "DeleteAtUninstall" = "11:FALSE"
+                                    "Transitive" = "11:FALSE"
+                                        "Keys"
+                                        {
+                                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_1064D50BF01A4D51B868E982FC220247"
+                                            {
+                                            "Name" = "8:Outlook"
+                                            "Condition" = "8:"
+                                            "AlwaysCreate" = "11:TRUE"
+                                            "DeleteAtUninstall" = "11:FALSE"
+                                            "Transitive" = "11:FALSE"
+                                                "Keys"
+                                                {
+                                                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_137204EE56DC497088E348674D3D8B7F"
+                                                    {
+                                                    "Name" = "8:AddIns"
+                                                    "Condition" = "8:"
+                                                    "AlwaysCreate" = "11:TRUE"
+                                                    "DeleteAtUninstall" = "11:FALSE"
+                                                    "Transitive" = "11:FALSE"
+                                                        "Keys"
+                                                        {
+                                                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_D274EDB843AA45D79536215DBFA689AE"
+                                                            {
+                                                            "Name" = "8:OpenERPOutlookPlugin.Connect"
+                                                            "Condition" = "8:"
+                                                            "AlwaysCreate" = "11:TRUE"
+                                                            "DeleteAtUninstall" = "11:FALSE"
+                                                            "Transitive" = "11:FALSE"
+                                                                "Keys"
+                                                                {
+                                                                }
+                                                                "Values"
+                                                                {
+                                                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_7DAB0B878C2B4AD6961544515CF9F67F"
+                                                                    {
+                                                                    "Name" = "8:LoadBehavior"
+                                                                    "Condition" = "8:"
+                                                                    "Transitive" = "11:FALSE"
+                                                                    "ValueTypes" = "3:3"
+                                                                    "Value" = "3:3"
+                                                                    }
+                                                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E727FA9F9AE4473B86EC5F2749DA6E00"
+                                                                    {
+                                                                    "Name" = "8:Description"
+                                                                    "Condition" = "8:"
+                                                                    "Transitive" = "11:FALSE"
+                                                                    "ValueTypes" = "3:1"
+                                                                    "Value" = "8:OpenERP Outlook Plugin"
+                                                                    }
+                                                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_F8A784A42EA24C908396CFE4B36C9F21"
+                                                                    {
+                                                                    "Name" = "8:FriendlyName"
+                                                                    "Condition" = "8:"
+                                                                    "Transitive" = "11:FALSE"
+                                                                    "ValueTypes" = "3:1"
+                                                                    "Value" = "8:OpenERP Outlook Plugin"
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                        "Values"
+                                                        {
+                                                        }
+                                                    }
+                                                }
+                                                "Values"
+                                                {
+                                                }
+                                            }
+                                        }
+                                        "Values"
+                                        {
+                                        }
+                                    }
+                                }
+                                "Values"
+                                {
+                                }
+                            }
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCU"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_65C75F62BA5342D88380AD586D8CB4A2"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCR"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKU"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKPU"
+            {
+                "Keys"
+                {
+                }
+            }
+        }
+        "Sequences"
+        {
+        }
+        "Shortcut"
+        {
+        }
+        "UserInterface"
+        {
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_05A1A869F1C748A0AA4687CF7DF17408"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:1"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5F37EBB554844174BFF8F45DB2607A7D"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "UpdateText"
+                            {
+                            "Name" = "8:UpdateText"
+                            "DisplayName" = "8:#1058"
+                            "Description" = "8:#1158"
+                            "Type" = "3:15"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1258"
+                            "DefaultValue" = "8:#1258"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2237F99549C04193ADB5655D7E6FD5B4"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:1"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8A6734448CF54465BD37D45C0CFF5000"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_4B62B60C5A10485EBB000ABEF6F8B0E1"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_7355B2D19A0B4B13A75AFF1D63E8FA4E"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:1"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_77890D6A5244491A93629AEBF7575094"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8B76EAAF28A844BBA54D063D07BA2FF8"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "InstallAllUsersVisible"
+                            {
+                            "Name" = "8:InstallAllUsersVisible"
+                            "DisplayName" = "8:#1059"
+                            "Description" = "8:#1159"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A16110FB2319496FA65112471161C0FB"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8BDB1DC6B45345D6A00F54A75DEF1A6B"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:2"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_51562FA73CD74420B54B17BDC66F6983"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6E30DC2B3F284C148AE722C0E78228F8"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A66D47C411F0411780817D51CF722A22"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_A6A71D2398304B649269B7E50D8A0EC4"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B854718158D047B6B2E6FE698112EC93"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:2"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BD7FC1FCE04048D986EC3E4F21D525C6"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_C3C153DE1CA647C6B2075A0C59ABBBA6"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:2"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5E814962060F4BDBAEF5C6BD43D6DE3E"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        "MergeModule"
+        {
+        }
+        "ProjectOutput"
+        {
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D219AD7AB7924D44B7E2945648C76CF7"
+            {
+            "SourcePath" = "8:..\\OpenERPOutlookPlugin\\obj\\Debug\\OpenERPOutlookPlugin.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:2"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{F4B2219B-F235-400F-81B4-92F15250BBA4}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/addons/pad/i18n/hr.po b/addons/pad/i18n/hr.po
new file mode 100644
index 00000000000..052831af21a
--- /dev/null
+++ b/addons/pad/i18n/hr.po
@@ -0,0 +1,77 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 12:58+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "U redu"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Naziv"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Zapiši"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr ""
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr ""
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index be7cb82af2e..2a0785d1863 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Project Specs as PADs',
+    'name': 'Specifications on PADs',
     'version': '1.0',
     "category": "Project Management",
     'complexity': "easy",
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
index 2b05305c5ce..e12bceb51bf 100644
--- a/addons/plugin/__openerp__.py
+++ b/addons/plugin/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Plugins',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 The common interface for pugin.
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index c4859771e35..fd5ca7da6c6 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -35,28 +35,27 @@ class plugin_handler(osv.osv_memory):
             @param email: email is a standard RFC2822 email message
             @return Dictionary which contain id and the model name of the document linked with the mail
                 if no document is found the id = 0
-                (model_name, res_id, name_get, url) 
+                (model_name, res_id, url, name_get) 
         """
         mail_message_obj = self.pool.get('mail.message')
         model = False
         res_id = 0
         url = False
         name = ""
-
         msg = mail_message_obj.parse_message(email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
             references.extend(refs.split())
-
         msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
         if msg_ids:
             msg = mail_message_obj.browse(cr, uid, msg_ids[0])
             res_id = msg.res_id
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
-            name =  self.pool.get(model).name_get(cr, uid, res_id)[1]
-        return (model, res_id, url, name)
+            name =  self.pool.get(model).name_get(cr, uid, res_id)[0][1]
+        return (model,res_id, url,name)
+
 
     def document_type(self, cr, uid, context=None):
         """
@@ -90,11 +89,8 @@ class plugin_handler(osv.osv_memory):
         """
         mail_message = self.pool.get('mail.message')
         model_obj = self.pool.get(model)
-        
         msg = mail_message.parse_message(email)
         message_id = msg.get('message-id')
-         
-        
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         if message_id and mail_ids :
             mail_record = mail_message.browse(cr, uid, mail_ids)[0]
@@ -130,8 +126,7 @@ class plugin_handler(osv.osv_memory):
         return ('res.partner', partner_id, url)
 
     # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts
-    def push_message_outlook(self, cr, uid, model, headers, body_text, body_html, attachments):
-        pass
+    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body_text=False, body_html=False, attachments=False):
         # ----------------------------------------
         # solution 1
         # construct a fake rfc822 from the separated arguement
@@ -142,12 +137,23 @@ class plugin_handler(osv.osv_memory):
         # solution 2
         # use self.pushmessage only with header and body
         # add attachemnt yourself after
-
-        #ir_attachment_obj = self.pool.get('ir.attachment')
-        #attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', data.get('res_model')), ('res_id', '=', data.get('res_id')), ('datas_fname', '=', data.get('datas_fname'))])
-        #if attachment_ids:
-        #    return attachment_ids[0]
-        #else:
-        #    vals = {"res_model": data.get('res_model'), "res_id": data.get('res_id'), "name": data.get('name'), "datas" : data.get('datas'), "datas_fname" : data.get('datas_fname')}
-        #    return ir_attachment_obj.create(cr, uid, vals)
-        #return (model, res_id, url, notify)
+        mail_message = self.pool.get('mail.message')        
+        ir_attachment_obj = self.pool.get('ir.attachment')
+        attach_ids = []
+        msg = mail_message.parse_message(headers)
+        message_id = msg.get('message-id')    
+        push_mail = self.push_message(cr, uid, model, headers, res_id)
+        res_id = push_mail[1]
+        model =  push_mail[0]            
+        for name in attachments.keys():
+            attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', model), ('res_id', '=', res_id), ('datas_fname', '=', name)])
+            if attachment_ids:
+                attach_ids.append( attachment_ids[0])
+            else:
+                vals = {"res_model": model, "res_id": res_id, "name": name, "datas" :attachments[name], "datas_fname" : name}
+                attach_ids.append(ir_attachment_obj.create(cr, uid, vals))
+        mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
+        if mail_ids:
+            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body_text':body_text,'body_html':body_html})
+        url = self._make_url(cr, uid, res_id, model)
+        return (model, res_id, url)
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 62df15f5954..e63acfb7881 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -52,7 +52,6 @@ Main features :
         'wizard/pos_close_statement.xml',
         'wizard/pos_box_entries.xml',
         'wizard/pos_payment_report_user_view.xml',
-        'wizard/pos_payment_report_date_view.xml',
         'wizard/pos_box_out.xml',
         'wizard/pos_sales_user.xml',
         'wizard/pos_receipt_view.xml',
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index b440f1101d9..216607dd4d0 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 08:43+0000\n"
+"PO-Revision-Date: 2011-12-12 10:25+0000\n"
 "Last-Translator: Goran Kliska <gkliska@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: 2011-11-05 05:00+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Prodaje po danu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
@@ -35,7 +35,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
 #: view:pos.discount:0
 msgid "Apply Discount"
-msgstr "Primjeni popust"
+msgstr "Apply Discount"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -45,7 +45,7 @@ msgstr "Stavi u pripremu"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Product Nb."
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -55,7 +55,7 @@ msgstr "Blagajna"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Danas"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -70,20 +70,20 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Stavi novac"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Register Analysis"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Details of Sales"
-msgstr ""
+msgstr "Detalji prodaje"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -103,18 +103,18 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "Add payment :"
-msgstr ""
+msgstr "Dodaj plaćanje :"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "My Sales"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -135,7 +135,7 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -145,7 +145,7 @@ msgstr "PDV"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -166,7 +166,7 @@ msgstr ""
 #: report:account.statement:0
 #: field:report.pos.order,partner_id:0
 msgid "Partner"
-msgstr "Stranka"
+msgstr "Partner"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -178,18 +178,18 @@ msgstr "Ukupno za dan"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Disc. (%)"
-msgstr "Popust (%)"
+msgstr "Pop.(%)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "Total discount"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -211,14 +211,14 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Prodaje po mjesecima"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 msgid "Sales by User"
-msgstr ""
+msgstr "Prodaje po korisniku"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -230,13 +230,13 @@ msgstr "Pop.(%)"
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Price"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -247,7 +247,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr ""
+msgstr "Izveštaj prodaje"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
@@ -269,7 +269,7 @@ msgstr ""
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
@@ -296,13 +296,13 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
 #: field:report.sales.by.margin.pos.month,total:0
 msgid "Margin"
-msgstr ""
+msgstr "Marža"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -317,7 +317,7 @@ msgstr "Uk. količina"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Prodaje po korisniku mjesečno"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -341,17 +341,17 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Način plaćanja"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Daily Operations"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Search Cash Statements"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -362,18 +362,18 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr ""
+msgstr "Sales by User Monthly"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
@@ -385,13 +385,13 @@ msgstr "Datum plaćanja"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -432,7 +432,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -453,7 +453,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Output Operation"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -465,7 +465,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Ispiši"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -496,7 +496,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "Iznos računa"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -510,25 +510,25 @@ msgstr ""
 #: field:report.cash.register,journal_id:0
 #: field:report.pos.order,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Ending Balance"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
@@ -538,7 +538,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
 msgid "Sale by Date and User"
-msgstr ""
+msgstr "Sale by Date and User"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -552,7 +552,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "Mode of Taxes"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
@@ -563,14 +563,14 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Open Statements"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -580,13 +580,13 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Sales total(Revenue)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total paid"
-msgstr "Uk. plaćeno"
+msgstr "Ukupno plaćeno"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
@@ -597,7 +597,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr "Kol."
+msgstr "Kol proizvoda"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
@@ -608,13 +608,13 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr ""
+msgstr "User's Product"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1043
@@ -629,14 +629,14 @@ msgstr ""
 #: view:pos.order:0
 #: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Close Statements"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -647,12 +647,12 @@ msgstr ""
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Plaćanja po korisniku"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
@@ -663,7 +663,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
@@ -679,12 +679,12 @@ msgstr ""
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "St.Name"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Sales total"
-msgstr "Ukupno prodaja"
+msgstr "Ukupno prodaje"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -699,17 +699,17 @@ msgstr "Datum plaćanja"
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Order Lines"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
 msgid "Creation Date"
-msgstr "Datum Kreiranja"
+msgstr "Datum kreiranja"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "Današnje prodaje"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -737,7 +737,7 @@ msgstr ""
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "Naziv proizvoda"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -749,7 +749,7 @@ msgstr ""
 #: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
-msgstr "Cjenik"
+msgstr "Pricelist"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -761,7 +761,7 @@ msgstr "Ukupno računi"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# kol"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
@@ -771,7 +771,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
 msgid "Sales by margin monthly"
-msgstr ""
+msgstr "Prodaje po marži mjesečno"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -780,24 +780,24 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Today's Closed Cashbox"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: point_of_sale
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Iznos vaučera mora biti jednak iznosu stavke izvoda banke/blagajne."
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -813,29 +813,29 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Komentar fiskalne pozicije:"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Datum otvaranja"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Taxes :"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Popust"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -845,12 +845,12 @@ msgstr "PDV :"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr ""
+msgstr "POS Order lines"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Receipt :"
 
 #. module: point_of_sale
 #: field:pos.order,amount_return:0
@@ -881,7 +881,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr ""
+msgstr "transaction for the pos"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -892,7 +892,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Pos Box Unosi"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -904,7 +904,7 @@ msgstr ""
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -914,7 +914,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "broj transakcija"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -926,7 +926,7 @@ msgstr ""
 #: view:pos.receipt:0
 #: selection:report.pos.order,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -936,7 +936,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "Prodaje"
+msgstr "Prodaje (ukupno)"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -952,7 +952,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_report_cash_register
 #: view:report.cash.register:0
 msgid "Point of Sale Cash Register Analysis"
-msgstr ""
+msgstr "Point of Sale Cash Register Analysis"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
@@ -962,7 +962,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Plaćanje za prodaju"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
@@ -977,19 +977,19 @@ msgstr "Ostalo"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Stavke POS-a"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "Uk. iznos"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Blagajne"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1002,7 +1002,7 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: point_of_sale
 #: field:pos.scan.product,gencod:0
@@ -1016,12 +1016,12 @@ msgstr ""
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
@@ -1032,7 +1032,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "Od perioda"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1040,12 +1040,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Open Cash Registers"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1055,17 +1055,17 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Naziv dnevnika mora biti jedinstven za jednu organizaciju!"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povrat URA"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1073,17 +1073,17 @@ msgstr ""
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr ""
+msgstr "POS Orders"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
 msgid "All Closed CashBox"
-msgstr ""
+msgstr "All Closed CashBox"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1042
@@ -1106,7 +1106,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1127,7 +1127,7 @@ msgstr "Bilješke"
 #: field:pos.get.sale,picking_id:0
 #: view:pos.order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Sale Order"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1140,7 +1140,7 @@ msgstr "Porezi"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
-msgstr ""
+msgstr "Stavka prodaje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
@@ -1154,12 +1154,12 @@ msgstr "Šifra"
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Payment Report For Sale"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
@@ -1174,17 +1174,17 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fax :"
-msgstr "Fax :"
+msgstr "Fax:"
 
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Connected Salesman"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1210,7 +1210,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "Ispis računa POS-a"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
@@ -1233,14 +1233,14 @@ msgstr "Kol."
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Month -1"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
 #: model:ir.model,name:point_of_sale.model_pos_sale_user
 #: view:pos.payment.report.user:0
 msgid "Sale by User"
-msgstr ""
+msgstr "Prodaja po korisniku"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:558
@@ -1264,7 +1264,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "stanje"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1275,7 +1275,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:547
@@ -1286,7 +1286,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Delay Validation"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1296,18 +1296,18 @@ msgstr "Broj kopija"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "POS plaćanje"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Do perioda"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Automatic Opening"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
@@ -1331,7 +1331,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1341,7 +1341,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Naziv izvoda"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1350,17 +1350,17 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Blagajna MP"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Račun POS-a"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
@@ -1371,7 +1371,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Sales by User Daily margin"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
@@ -1387,7 +1387,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1400,13 +1400,13 @@ msgstr "Plaćeno"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Sve stavke prodaje"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1420,17 +1420,17 @@ msgstr "Ukupno:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Prodaje po marži"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Postava dnevnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Retci izvoda"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1438,16 +1438,18 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Račun br."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
-msgstr "Račun"
+msgstr "Receipt"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
@@ -1458,7 +1460,7 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -1466,7 +1468,7 @@ msgstr ""
 #: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
@@ -1477,12 +1479,12 @@ msgstr ""
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvoreno"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Order Ref"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
@@ -1505,23 +1507,23 @@ msgstr ""
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
 #: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
 msgid "Net margin per Qty"
-msgstr ""
+msgstr "Neto marža po kol."
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
 #: view:report.sales.by.margin.pos.month:0
 msgid "Sales by User Margin"
-msgstr ""
+msgstr "Sales by User Margin"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Point of Sale Orders Statistics"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1536,12 +1538,12 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "Pos Lines"
 
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
@@ -1551,29 +1553,29 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Završni saldo"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_details
 msgid "Sale Details"
-msgstr ""
+msgstr "Prodaja detaljno"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Date Ordered"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr ""
+msgstr "Sales lines by Users"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
@@ -1585,7 +1587,7 @@ msgstr ""
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:744
@@ -1601,7 +1603,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1612,7 +1614,7 @@ msgstr ""
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1623,23 +1625,23 @@ msgstr ""
 #: field:report.sales.by.user.pos,amount:0
 #: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Sale By User"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Otvori blagajnu"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Izvod"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1657,7 +1659,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Izvještaj plaćanja"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
@@ -1681,7 +1683,7 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.pos.order,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1705,7 +1707,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Reprint"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:558
@@ -1718,7 +1720,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
 msgid "Today's Payment By User"
-msgstr ""
+msgstr "Današnje plaćanje korisnika"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1735,7 +1737,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "No. Of Articles"
-msgstr "Komada"
+msgstr "Br.Artikala"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
@@ -1745,7 +1747,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "Skladišnice"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
@@ -1761,24 +1763,24 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Redak bankovnog izvoda"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvod banke"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Do datuma"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS Report"
-msgstr ""
+msgstr "POS Izvještaj"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
@@ -1788,7 +1790,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Close Cash Register"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
@@ -1804,7 +1806,7 @@ msgstr "Očitaj barkod"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Operacija"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
@@ -1814,17 +1816,17 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Temeljnica"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Otkazani račun"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1836,7 +1838,7 @@ msgstr "Potvrdi"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: point_of_sale
 #: constraint:res.company:0
@@ -1867,7 +1869,7 @@ msgstr "Naziv plaćanja"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr "Izvještaji"
+msgstr "Izvještavanje"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
@@ -1882,12 +1884,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "Pos Box Out"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Šifra dnevnika mora biti jedinstvena (za organizaciju) !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1897,7 +1899,7 @@ msgstr "Postava"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
@@ -1915,30 +1917,30 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Total Discount"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Take Money"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Detalji prodaje"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
@@ -1961,7 +1963,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_order
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr ""
+msgstr "Point of Sale"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1987,12 +1989,12 @@ msgstr "Fakturirano"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Napomena popusta"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -2003,12 +2005,12 @@ msgstr "Dodaj"
 #: view:report.cash.register:0
 #: selection:report.pos.order,state:0
 msgid "Draft"
-msgstr "U pripremi"
+msgstr "Nacrt"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr ""
+msgstr "POS Order line"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -2018,12 +2020,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "POS Payment Report according to date"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr "Predračun"
+msgstr "Pro-forma"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:638
@@ -2071,23 +2073,23 @@ msgstr "Prodaje po korisniku"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "Print Receipt"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "POS Orders lines"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:340
@@ -2104,12 +2106,12 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Dnevnik prodaje"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Refund"
-msgstr "Povrat"
+msgstr "Povrat novca"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -2122,19 +2124,19 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Date Order"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Close Cash Registers"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "Pop(%)"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -2148,17 +2150,17 @@ msgstr ""
 #: view:pos.sales.user.today.current_user:0
 #: view:pos.scan.product:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order lines"
-msgstr ""
+msgstr "Stavke narudžbe"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Subtotal w/o Tax"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2168,22 +2170,22 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Izvještaj blagajne"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Gotovinske temeljnice"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "POS Detalji :"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Današnje prodaje po korisniku"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
@@ -2204,23 +2206,23 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -2242,7 +2244,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
 #: view:report.pos.order:0
 msgid "Point of Sale Analysis"
-msgstr ""
+msgstr "Analiza maloprodaje (POS-a)"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2250,7 +2252,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2264,12 +2266,12 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Danas    "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:95
@@ -2293,12 +2295,12 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
 msgid "Payments"
-msgstr ""
+msgstr "Plaćanja"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2312,17 +2314,17 @@ msgstr ""
 #: report:pos.sales.user.today.current.user:0
 #: report:pos.user.product:0
 msgid "Print Date"
-msgstr ""
+msgstr "Datum ispisa"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
 msgid "Sales by User Monthly margin"
-msgstr ""
+msgstr "Prodaja prema mjesečnoj marži korisnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Traži prodajne naloge"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2336,13 +2338,13 @@ msgstr ""
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "Prodaja po korisniku"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2350,7 +2352,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #~ msgid "Discount :"
 #~ msgstr "Popust"
@@ -2391,9 +2393,6 @@ msgstr ""
 #~ msgid "E-mail :"
 #~ msgstr "E-mail :"
 
-#~ msgid "Discount"
-#~ msgstr "Popust"
-
 #~ msgid "Payment Name"
 #~ msgstr "Naziv plaćanja"
 
@@ -2420,3 +2419,6 @@ msgstr ""
 
 #~ msgid "Discount percentage"
 #~ msgstr "Postotak popusta"
+
+#~ msgid "Discount"
+#~ msgstr "Discount"
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 1afa10b1be3..74f6fb54368 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -381,11 +381,12 @@ class pos_order(osv.osv):
             inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
 
         if not inv_ids: return {}
+        
         mod_obj = self.pool.get('ir.model.data')
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
         res_id = res and res[1] or False
         return {
-            'name': _('PoS Invoices'),
+            'name': _('Customer Invoice'),
             'view_type': 'form',
             'view_mode': 'form',
             'view_id': res_id,
diff --git a/addons/point_of_sale/point_of_sale_report.xml b/addons/point_of_sale/point_of_sale_report.xml
index b8d5456f1cd..41ce5232ac3 100644
--- a/addons/point_of_sale/point_of_sale_report.xml
+++ b/addons/point_of_sale/point_of_sale_report.xml
@@ -44,17 +44,6 @@
              />
 
         <report
-            id="pos_payment_report"
-            string="Payment Report For Sale"
-            model="pos.order"
-            name="pos.payment.report"
-            auto="False"
-            multi="True"
-            menu="True"
-            rml="point_of_sale/report/pos_payment_report.rml"
-             />
-
-        <report
             id="pos_sales_user"
             string="Sales Report"
             model="pos.order"
@@ -77,16 +66,6 @@
              />
 
         <report
-            id="pos_payment_report_date"
-            string="Payment Report"
-            model="pos.order"
-            name="pos.payment.report.date"
-            auto="False"
-            multi="True"
-            menu="False"
-            rml="point_of_sale/report/pos_payment_report_date.rml"
-             />
-        <report
             id="pos_payment_report_user"
             string="Today's Payment By User"
             model="pos.order"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b69305c1a30..ee95e5d0835 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -734,8 +734,6 @@
             <field name="domain">[('origin','like','POS')]</field>
         </record>
 
-        <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
-                id="menu_pos_payment_report_date" parent="menu_point_rep" sequence="8" groups="base.group_extended"/>
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
                 id="menu_pos_details" parent="menu_point_rep" sequence="6" />
 
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index 171f323e337..bc85fb31084 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -30,7 +30,6 @@ import pos_details_summary
 import pos_payment_report
 import pos_sales_user
 import pos_sales_user_today
-import pos_payment_report_date
 import pos_payment_report_user
 import pos_report
 import pos_order_report
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 4c23a005674..1590866836a 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -27,9 +27,9 @@ class pos_details(report_sxw.rml_parse):
     def _get_invoice(self,inv_id,user):
         res={}
         if inv_id:
-            self.cr.execute("select name from account_invoice as ac where id = %s", (inv_id,))
+            self.cr.execute("select number from account_invoice as ac where id = %s", (inv_id,))
             res = self.cr.fetchone()
-            return res[0]
+            return res[0] or 'Draft'
         else:
             return  ''
 
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 7aa2c3a8ea0..12e8618accb 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -199,13 +199,13 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="53.0,44.0,158.0,54.0,76.0,37.0,88.0" style="Table4">
+    <blockTable colWidths="108.0,54.0,159.0,54.0,75.0,30.0,69.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Code</para>
+          <para style="terp_tblheader_Details">Order</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -226,7 +226,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
-      <blockTable colWidths="54.0,44.0,159.0,54.0,75.0,36.0,89.0" style="Table6">
+      <blockTable colWidths="108.0,54.0,159.0,54.0,75.0,30.0,69.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -258,7 +258,7 @@
     <blockTable colWidths="256.0,256.0" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Mode of Taxes</para>
+          <para style="terp_tblheader_Details">Taxes</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -289,7 +289,7 @@
     <blockTable colWidths="257.0,255.0" style="Table9">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Mode of Payment</para>
+          <para style="terp_tblheader_Details">Payment</para>
         </td>
         <td>
           <para style="terp_default_8">
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 494dceec93e..4ae53d0ad67 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -57,7 +57,7 @@
                             string="Invoiced"
                             domain="[('state','=',('invoiced'))]"/>
                         <filter icon="terp-dolar"
-                            string="Paid"
+                            string="Not Invoiced"
                             domain="[('state','=',('paid'))]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
deleted file mode 100644
index 76cd9c12be7..00000000000
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 time
-from report import report_sxw
-
-class pos_payment_report_date(report_sxw.rml_parse):
-
-    def __init__(self, cr, uid, name, context):
-        super(pos_payment_report_date, self).__init__(cr, uid, name, context=context)
-        self.total = 0.0
-        self.localcontext.update({
-            'time': time,
-            'pos_payment_date': self.__pos_payment_date__,
-            'pos_payment_date_total':self.__pos_payment_date__total__,
-        })
-
-    def __pos_payment_date__(self,form):
-        dt1 = form['date_start'] + ' 00:00:00'
-        dt2 = form['date_end'] + ' 23:59:59'
-        data={}
-        if form['user_id']:
-            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
-                             "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id IN %s " \
-                    ,(dt1,dt2,tuple(form['user_id'])))
-        else:
-            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
-                             "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  and pu.id=pt.uom_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s" \
-                    ,(dt1,dt2))
-        data=self.cr.dictfetchall()
-        return data
-
-    def __pos_payment_date__total__(self,form):
-        dt1 = form['date_start'] + ' 00:00:00'
-        dt2 = form['date_end'] + ' 23:59:59'
-        res=[]
-        if form['user_id']:
-            self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id IN %s " \
-                        ,(dt1,dt2,tuple(form['user_id'])))
-        else:
-            self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s" \
-                        ,(dt1,dt2))
-        res=self.cr.fetchone()[0] or 0.0
-        return res
-
-
-report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date,header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
deleted file mode 100644
index ba7764fed28..00000000000
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Payments.pdf">
-  <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
-    <para style="terp_header_Centre">Sales Lines</para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="256.0,256.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Company</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Print Date</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="256.0,256.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Product</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Disc(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Unit Price </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Total </para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table6">
-        <tr>
-          <td>
-            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount'], dp='Sale Price') ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="355.0,71.0,85.0" style="Table5">
-      <tr>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_date_total(data['form']), dp='Sale Price') or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index e3b5583a499..55873887210 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -75,7 +75,7 @@
     <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
     <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">User : [[ o.user_id.name ]]</para>
     <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
     <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
     <para style="P4">
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 7642563ba57..9eb77e81244 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -1,73 +1,66 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_pos_config_journal","pos.config.journal","model_pos_config_journal","group_pos_user",1,0,0,0
-"access_pos_order","pos.order","model_pos_order","group_pos_user",1,1,1,1
-"access_pos_order_line","pos.order.line","model_pos_order_line","group_pos_user",1,1,1,1
-"access_pos_order_manager","pos.order manager","model_pos_order","group_pos_manager",1,0,0,0
-"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,0,0,0
-"access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
-"access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
-"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
-"access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","group_pos_user",1,0,0,0
-"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,1,1,0
-"access_account_account_pos_user","account.account pos_user","account.model_account_account","group_pos_user",1,0,0,0
-"access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","group_pos_user",1,1,1,1
-"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","group_pos_user",1,0,0,0
-"access_sale_shop_pos_manager","sale.shop pos_manager","sale.model_sale_shop","group_pos_manager",1,0,0,0
-"access_sale_shop_pos_system","sale.shop pos_system","sale.model_sale_shop","group_pos_manager",1,0,0,0
-"access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
-"access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","group_pos_user",1,1,1,1
-"access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","group_pos_user",1,0,0,0
-"access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","group_pos_user",1,0,0,0
-"access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","group_pos_user",1,0,0,0
-"access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","group_pos_user",1,0,0,0
-"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_user",1,1,1,1
-"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","group_pos_user",1,1,1,0
-"access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,1,1,1
-"access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
-"access_account_invoice_pos","account.invoice pos user","account.model_account_invoice","group_pos_user",1,1,1,0
-"access_account_invoice_pos_manager","account.invoice pos manager","account.model_account_invoice","group_pos_manager",1,0,0,0
-"access_account_invoice_line_pos","account.invoice.line pos user","account.model_account_invoice_line","group_pos_user",1,1,1,0
-"access_account_invoice_line_pos_manager","account.invoice.line pos manager","account.model_account_invoice_line","group_pos_manager",1,0,0,0
-"access_account_invoice_tax_pos","account.invoice.tax pos user","account.model_account_invoice_tax","group_pos_user",1,1,1,0
-"access_account_invoice_tax_pos_manager","account.invoice.tax pos manager","account.model_account_invoice_tax","group_pos_manager",1,0,0,0
-"access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
-"access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
-"access_account_fiscalyear_pos_user","account.fiscalyear user","account.model_account_fiscalyear","group_pos_user",1,1,1,0
-"access_account_fiscalyear_pos_manager","account.fiscalyear manager","account.model_account_fiscalyear","group_pos_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","group_pos_user",1,1,1,0
-"access_account_cashbox_line_manager","account.cashbox.line manager","account.model_account_cashbox_line","group_pos_manager",1,1,1,1
-"access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
-"access_product_template_pos_user","product.template pos user","product.model_product_template","group_pos_user",1,0,0,0
-"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,1,1,1
-"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,1,1,1
-"access_account_move_line","account.move.line","account.model_account_move_line","group_pos_user",1,1,1,0
-"access_account_move_line_manager","account.move.line manager","account.model_account_move_line","group_pos_manager",1,1,1,1
-"access_account_move","account.move","account.model_account_move","group_pos_manager",1,0,0,0
-"access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
-"access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
-"access_account_journal_period_user","account.journal.period user","account.model_account_journal_period","group_pos_user",1,1,1,1
-"access_account_journal_period_manager","account.journal.period manager","account.model_account_journal_period","group_pos_manager",1,0,0,0
-"access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
-"access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
-"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","group_pos_user",1,1,1,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","group_pos_user",1,1,1,0
-"access_account_journal_column","account.journal.column","account.model_account_journal_column","group_pos_user",1,1,1,0
-"access_account_journal_column_manager","account.journal.column manager","account.model_account_journal_column","group_pos_manager",1,0,0,0
-"access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
-"access_ir_property_pos_manager","ir.property manager","base.model_ir_property","group_pos_manager",1,1,1,1
-"access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
-"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
-"access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
-"access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
-"access_product_product_packaging_user","product.packaging user","product.model_product_packaging","group_pos_user",1,0,0,0
-"access_product_product_packaging_manager","product.packaging manager","product.model_product_packaging","group_pos_manager",1,0,0,0
-"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear manager","account.model_account_sequence_fiscalyear","group_pos_manager",1,0,0,0
-"access_stock_warehouse_manager","stock.warehouse manager","stock.model_stock_warehouse","group_pos_manager",1,0,0,0
-"access_stock_location_manager","stock.location manager","stock.model_stock_location","group_pos_manager",1,0,0,0
-"access_product_uom_manager","product.uom manager","product.model_product_uom","group_pos_manager",1,1,1,1
-"access_res_partner_manager","res.partner manager","base.model_res_partner","group_pos_manager",1,0,0,0
-"access_product_category_manager","product.category manager","product.model_product_category","group_pos_manager",1,1,1,1
-"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","group_pos_manager",1,0,0,0
-"access_product_category_pos_manager","pos.category manager","model_pos_category","group_pos_manager",1,1,1,1"
-"access_product_category_pos_user","pos.category user","model_pos_category","group_pos_user",1,0,0,0"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_pos_config_journal,pos.config.journal,model_pos_config_journal,group_pos_user,1,0,0,0
+access_pos_order,pos.order,model_pos_order,group_pos_user,1,1,1,1
+access_pos_order_line,pos.order.line,model_pos_order_line,group_pos_user,1,1,1,1
+access_pos_order_manager,pos.order manager,model_pos_order,group_pos_manager,1,0,0,0
+access_pos_order_line_manager,pos.order.line manager,model_pos_order_line,group_pos_manager,1,0,0,0
+access_report_transaction_pos,report.transaction.pos,model_report_transaction_pos,group_pos_manager,1,1,1,1
+access_pos_config_journal_manager,pos.config.journal.manager,model_pos_config_journal,group_pos_manager,1,1,1,1
+access_account_journal_pos_user,account.journal pos_user,account.model_account_journal,group_pos_user,1,0,0,0
+access_account_move_pos_user,account.move pos_user,account.model_account_move,group_pos_user,1,1,1,0
+access_account_account_pos_user,account.account pos_user,account.model_account_account,group_pos_user,1,0,0,0
+access_stock_picking_pos_user,stock.picking pos_user,stock.model_stock_picking,group_pos_user,1,1,1,1
+access_sale_shop_pos_user,sale.shop pos_user,sale.model_sale_shop,group_pos_user,1,0,0,0
+access_pos_order_stock_worker,pos.order stock_worker,model_pos_order,stock.group_stock_user,1,0,0,0
+access_stock_move_pos_user,stock.move pos_user,stock.model_stock_move,group_pos_user,1,1,1,1
+access_report_sales_by_user_pos,report.sales.by.user.pos,model_report_sales_by_user_pos,group_pos_user,1,0,0,0
+access_report_sales_by_user_pos_month,report.sales.by.user.pos.month,model_report_sales_by_user_pos_month,group_pos_user,1,0,0,0
+access_report_sales_by_margin_pos,report.sales.by.margin.pos,model_report_sales_by_margin_pos,group_pos_user,1,0,0,0
+access_report_sales_by_margin_pos_month,report.sales.by.margin.pos.month,model_report_sales_by_margin_pos_month,group_pos_user,1,0,0,0
+access_report_pos_order,report.pos.order,model_report_pos_order,group_pos_user,1,1,1,1
+access_account_bank_statement,account.bank.statement,account.model_account_bank_statement,group_pos_user,1,1,1,0
+access_account_bank_statement_manager,account.bank.statement manager,account.model_account_bank_statement,group_pos_manager,1,1,1,1
+access_account_bank_statement_line,account.bank.statement.line,account.model_account_bank_statement_line,group_pos_user,1,1,1,0
+access_account_invoice_pos,account.invoice pos user,account.model_account_invoice,group_pos_user,1,1,1,0
+access_account_invoice_pos_manager,account.invoice pos manager,account.model_account_invoice,group_pos_manager,1,0,0,0
+access_account_invoice_line_pos,account.invoice.line pos user,account.model_account_invoice_line,group_pos_user,1,1,1,0
+access_account_invoice_line_pos_manager,account.invoice.line pos manager,account.model_account_invoice_line,group_pos_manager,1,0,0,0
+access_account_invoice_tax_pos,account.invoice.tax pos user,account.model_account_invoice_tax,group_pos_user,1,1,1,0
+access_account_invoice_tax_pos_manager,account.invoice.tax pos manager,account.model_account_invoice_tax,group_pos_manager,1,0,0,0
+access_account_period_pos,account.period pos user,account.model_account_period,group_pos_user,1,1,1,0
+access_account_period_pos_manager,account.period pos manager,account.model_account_period,group_pos_manager,1,0,0,0
+access_account_fiscalyear_pos_user,account.fiscalyear user,account.model_account_fiscalyear,group_pos_user,1,1,1,0
+access_account_fiscalyear_pos_manager,account.fiscalyear manager,account.model_account_fiscalyear,group_pos_manager,1,0,0,0
+access_account_cashbox_line,account.cashbox.line,account.model_account_cashbox_line,group_pos_user,1,1,1,0
+access_account_cashbox_line_manager,account.cashbox.line manager,account.model_account_cashbox_line,group_pos_manager,1,1,1,1
+access_product_product,product.product,product.model_product_product,group_pos_user,1,0,0,0
+access_product_template_pos_user,product.template pos user,product.model_product_template,group_pos_user,1,0,0,0
+access_product_product_pos_manager,product.product.pos manager,product.model_product_product,group_pos_manager,1,1,1,1
+access_product_template_pos_manager,product.template pos manager,product.model_product_template,group_pos_manager,1,1,1,1
+access_account_move_line,account.move.line,account.model_account_move_line,group_pos_user,1,1,1,0
+access_account_move_line_manager,account.move.line manager,account.model_account_move_line,group_pos_manager,1,1,1,1
+access_account_move,account.move,account.model_account_move,group_pos_manager,1,0,0,0
+access_account_journal,account.journal,account.model_account_journal,group_pos_user,1,1,1,0
+access_account_journal_period_user,account.journal.period user,account.model_account_journal_period,group_pos_user,1,1,1,1
+access_account_journal_period_manager,account.journal.period manager,account.model_account_journal_period,group_pos_manager,1,0,0,0
+access_account_journal_view,account.journal.view,account.model_account_journal_view,group_pos_user,1,1,1,0
+access_account_journal_view_manager,account.journal.view manager,account.model_account_journal_view,group_pos_manager,1,0,0,0
+access_account_analytic_line,account.analytic.line,analytic.model_account_analytic_line,group_pos_user,1,1,1,0
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,group_pos_user,1,1,1,0
+access_account_journal_column,account.journal.column,account.model_account_journal_column,group_pos_user,1,1,1,0
+access_account_journal_column_manager,account.journal.column manager,account.model_account_journal_column,group_pos_manager,1,0,0,0
+access_report_check_register,report.cash.register,model_report_cash_register,group_pos_manager,1,1,1,1
+access_ir_property_pos_manager,ir.property manager,base.model_ir_property,group_pos_manager,1,1,1,1
+access_account_bank_statement_line_manager,account.bank.statement.line manager,account.model_account_bank_statement_line,group_pos_manager,1,1,1,1
+access_account_invoice_manager,account.invoice manager,account.model_account_invoice,group_pos_manager,1,1,1,1
+access_product_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,group_pos_user,1,0,0,0
+access_product_product_packaging_user,product.packaging user,product.model_product_packaging,group_pos_user,1,0,0,0
+access_account_sequence_fiscalyear_manager,account.sequence.fiscalyear manager,account.model_account_sequence_fiscalyear,group_pos_manager,1,0,0,0
+access_stock_warehouse_manager,stock.warehouse manager,stock.model_stock_warehouse,group_pos_manager,1,0,0,0
+access_stock_location_manager,stock.location manager,stock.model_stock_location,group_pos_manager,1,0,0,0
+access_product_uom_manager,product.uom manager,product.model_product_uom,group_pos_manager,1,1,1,1
+access_res_partner_manager,res.partner manager,base.model_res_partner,group_pos_manager,1,0,0,0
+access_product_category_manager,product.category manager,product.model_product_category,group_pos_manager,1,1,1,1
+access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,group_pos_manager,1,0,0,0
+access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,"1"""
+access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,"0"""
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 14c9e96df9e..09f1e8860fd 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -7,7 +7,7 @@
     </record>
     <record id="group_pos_manager" model="res.groups">
         <field name="name">Point of Sale / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('group_pos_user'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
     </record>
 
 </data>
diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
index f3ea5995b9e..c7583b1549c 100644
--- a/addons/point_of_sale/test/point_of_sale_report.yml
+++ b/addons/point_of_sale/test/point_of_sale_report.yml
@@ -35,23 +35,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt report'+format), 'wb+').write(data)
 
 -
- Create a record for the root user in pos.payment.report.user (used by the next python block).
--
-  !record {model: pos.payment.report.user, id: pos_payment_report_user_1}:
-    user_id: []
--
- Print the POS Payment Report through the wizard
--
-  !python {model: ir.ui.menu}: |
-    import time
-    ctx={}
-    ctx.update({'model': 'ir.ui.menu','active_ids': []})
-    data_dict = {'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [(6,0,[ref('base.user_root')])] }
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_report_pos_payment_repport_date',wiz_data=data_dict, context=ctx, our_module='point_of_sale')
-
--
- Print the POS Details Report through the wizard
+  Print the POS Details Report through the wizard
 -
   !python {model: ir.ui.menu}: |
     import time
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 0985ae906be..cb0a6a6da9a 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -30,7 +30,6 @@ import pos_sales_user
 import pos_sales_user_today
 import pos_receipt
 import pos_payment_report_user
-import pos_payment_report_date
 import pos_payment_report
 import pos_payment
 
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 85b43bd115d..d98d0f99eed 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -3,13 +3,13 @@
     <data>
         <!--  Point of Sale Confirm -->
         <record id="view_pos_confirm" model="ir.ui.view">
-            <field name="name">Post Journal Entries</field>
+            <field name="name">Create Sale Journal Entries</field>
             <field name="model">pos.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post All Orders">
                 <separator string="Generate Journal Entries" colspan="4"/>
-                <label string="This wizard will generate all journal entries for orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
+                <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
                 <newline/>
                 <separator colspan="4"/>
                 <group colspan="4" col="4">
@@ -25,7 +25,7 @@
         </record>
 
         <record id="action_pos_confirm" model="ir.actions.act_window">
-            <field name="name">Post Journal Entries</field>
+            <field name="name">Create Sale Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.confirm</field>
             <field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
deleted file mode 100644
index f97391c7f7d..00000000000
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 time
-
-from osv import osv
-from osv import fields
-
-
-class pos_payment_report_date(osv.osv_memory):
-    _name = 'pos.payment.report.date'
-    _description = 'POS Payment Report according to date'
-
-    def print_report(self, cr, uid, ids, context=None):
-        """
-             To get the date and print the report
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-             @return : retrun report
-        """
-        if context is None:
-            context = {}
-        datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context)
-        res = res and res[0] or {}
-        datas['form'] = res
-        if res.get('id',False):
-            datas['ids']=[res['id']]
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'pos.payment.report.date',
-            'datas': datas,
-        }
-
-    _columns = {
-        'date_start': fields.date('Start Date', required=True),
-        'date_end': fields.date('End Date', required=True),
-        'user_id': fields.many2many('res.users', 'res_user_sale_date', 'user_id', 'sale_id', 'Salesman')
-    }
-    _defaults = {
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_end': lambda *a: time.strftime('%Y-%m-%d'),
-    }
-
-pos_payment_report_date()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
deleted file mode 100644
index 7c74ae1d9be..00000000000
--- a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="pos_payment_report_date_form" model="ir.ui.view">
-            <field name="name">pos.payment.report.date.form</field>
-            <field name="model">pos.payment.report.date</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Sale by Date and User">
-                 <group col="4" colspan="4">
-                    <separator string="Dates" colspan="4"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <separator string="User" colspan="4"/>
-                    <field name="user_id" nolabel="1" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group colspan="2" col="2">
-                        <button icon='gtk-cancel' special="cancel"
-                                string="Close" />
-                        <button name="print_report" string="Print Report"
-                                colspan="1" type="object" icon="gtk-print" />
-                    </group>
-                 </group>            
-            </form>
-            </field>
-        </record>
-
-        <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
-            <field name="name">Sales by Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.payment.report.date</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        </data>
-</openerp>              
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index d76917fcf45..035ee45b4df 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -45,7 +45,6 @@ module 'share'.
         'wizard/share_wizard_view.xml',
     ],
     'installable': True,
-    'certificate' : '',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index db83f9ae77e..c132b0dfb68 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_all,access.portal.all,model_res_portal,,1,0,0,0
-access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
-access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
-access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_all,access.portal.all,model_res_portal,,1,0,0,0
+access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
+access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
+access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 4af045ff6bb..e948f45ce61 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Enterprise Process',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'description': """
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
diff --git a/addons/process/security/ir.model.access.csv b/addons/process/security/ir.model.access.csv
index 7356880f47a..84e3b5ea0e7 100644
--- a/addons/process/security/ir.model.access.csv
+++ b/addons/process/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_process_process","process.process","model_process_process","base.group_user",1,0,0,0
-"access_process_node","process.node","model_process_node","base.group_user",1,0,0,0
-"access_process_transition","process.transition","model_process_transition","base.group_user",1,0,0,0
-"access_process_transition_action","process.transition.action","model_process_transition_action","base.group_user",1,0,0,0
-"access_process_condition","process.condition","model_process_condition","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_process_process,process.process,model_process_process,base.group_user,1,0,0,0
+access_process_node,process.node,model_process_node,base.group_user,1,0,0,0
+access_process_transition,process.transition,model_process_transition,base.group_user,1,0,0,0
+access_process_transition_action,process.transition.action,model_process_transition_action,base.group_user,1,0,0,0
+access_process_condition,process.condition,model_process_condition,base.group_user,1,0,0,0
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 87a766a009f..30198b56f83 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Warehouse Management",
+    "category" : "Hidden/Dependency",
     "depends" : ["base","process", "product", "stock"],
     "description": """
 This is the module for computing Procurements.
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
new file mode 100644
index 00000000000..52f9ec3b968
--- /dev/null
+++ b/addons/procurement/i18n/hr.po
@@ -0,0 +1,890 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 06:23+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Traži nove artikle"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Jedinica mjere"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Metoda nabave"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Izračunaj samo pravila minimalnih zaliha"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Razlog"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Izračunaj nabave"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Zadnja greška"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "Ne korisiti se u izračunu, samo za informaciju"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Zadnja nabava"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "na nalogu"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:325
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 7fbcfb0ec74..46c8e44879b 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-12 02:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 13:18+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr ""
+msgstr "Pedir novos produtos"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr ""
+msgstr "Planeadores"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr ""
+msgstr "Elaborar aprovisionamentos"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -39,6 +39,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Aciona um aprovisionamento automático para todos os artigos que tenham um "
+"stock virtual abaixo de zero. Não deverá utilizar esta opção, sugerimos a "
+"utilização de uma configuração 'produzir por encomenda' nos artigos."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -49,6 +52,7 @@ msgstr "Agrupar por..."
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
+"Aprovisionamento rascunho do artigo e localização do ponto de encomenda."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:288
@@ -64,7 +68,7 @@ msgstr "Unidade de medida"
 #. module: procurement
 #: field:procurement.order,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Método de aprovisionamento"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:304
@@ -75,7 +79,7 @@ msgstr "Não há um endereço definido para este fornecedor!"
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Calcular apenas regras de stock mínimo."
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -86,23 +90,23 @@ msgstr "Empresa"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "Quantidade UdV"
 
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Processar aprovisionamentos"
 
 #. module: procurement
 #: field:procurement.order,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "Último erro"
 
 #. module: procurement
 #: help:mrp.property,composition:0
@@ -112,22 +116,22 @@ msgstr "Não utilizado em cálculos, apenas para informação."
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr ""
+msgstr "Último aprovisionamento"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "a pedido"
 
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Excepção ocorreu ao processar ordens de aprovisionamento"
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -141,11 +145,19 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Quando um aprovisionamento (ordem de) é criada, o estado é 'Rascunho'.\n"
+" Se o aprovisionamento é confirmado, o estado passa a 'Confirmado'.          "
+"   \n"
+"Depois de despoletado, o estado passa a 'Em curso'.\n"
+" Se ocorre alguma escepção, o estado fica como 'Exceção'.\n"
+" Depois de resolvida a exceção, o estado passa para 'Pronto'.\n"
+" O estado 'Em espera' significa que aguarda que outro aprovisionamento "
+"termine."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules Search"
-msgstr ""
+msgstr "Pesquisa de regras de stock mínimo"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_min_qty:0
@@ -153,16 +165,19 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Quando o stock virtual desce abaixo da quantidade mínima, OpenERP gera uma "
+"ordem de aprovisionamento para elevar o stock virtual até à quantidade "
+"máxima."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Parâmetros do planeador"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movemento de stock"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -172,22 +187,22 @@ msgstr "Planeamento"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Ready"
-msgstr ""
+msgstr "Pronto"
 
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Ponto de ordem automática"
 
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr ""
+msgstr "Composição da spropriedades"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -211,11 +226,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Referência do documento que criou este aprovisionamento.\n"
+"É preenchido automaticamente pelo OpenERP."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Ordens de aprovisionamento por processar"
 
 #. module: procurement
 #: constraint:res.company:0
@@ -238,12 +255,12 @@ msgstr "Estado"
 #: view:stock.warehouse.orderpoint:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "Localização"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Lista de entrega/receção"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
@@ -260,23 +277,23 @@ msgstr "Melhor preço (ainda não activado!)"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Product & Location"
-msgstr ""
+msgstr "Produto e localização"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
-msgstr ""
+msgstr "Calcular aprovisionamento"
 
 #. module: procurement
 #: model:ir.module.module,shortdesc:procurement.module_meta_information
 #: field:stock.move,procurements:0
 msgid "Procurements"
-msgstr ""
+msgstr "Aprovisionamentos"
 
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Dias de alcance do planeador"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
@@ -288,6 +305,12 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"Uma ordem de aprovisionamento é usada para registar a necessidade de um "
+"artigo num local específico. As ordens de aprovisionamento em regra criadas "
+"automaticamente a partir das ordens de venda, de uma regra logistica 'Pull' "
+"(puxa) ou de uma regra de stock mínimo. Quando a ordem de aprovisionamento é "
+"confirmada, cria automaticamente as operações necessárias para satisfazer a "
+"necessidade: ordens de compra e/ou ordens de produção, etc."
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -309,7 +332,7 @@ msgstr "Quantidade"
 #: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr ""
+msgstr "Sem stock suficiente, nem regra de stock minimo definida."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -330,7 +353,7 @@ msgstr "Configuração"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Multiplo de quantidade"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -338,11 +361,13 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Se regista um aprovisionamento manualmente, provavelmente quer usar o método "
+"produzir para ordens."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Aprovisionamentos automáticos"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -354,17 +379,17 @@ msgstr "Quantidade máxima"
 #: model:process.process,name:procurement.process_process_procurementprocess0
 #: view:procurement.order:0
 msgid "Procurement"
-msgstr ""
+msgstr "Aprovisionamento"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Ordens de aprovisionamento"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "Por corrigir"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -374,7 +399,7 @@ msgstr "Exceções"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Atribuição desde ordem de produção ou de compra"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -385,17 +410,17 @@ msgstr "Propriedade"
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
 #: view:make.procurement:0
 msgid "Procurement Request"
-msgstr ""
+msgstr "Requisição de aprovisionamento"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid "Compute Stock"
-msgstr ""
+msgstr "Calcular stock"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "Tardio"
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -409,17 +434,22 @@ msgid ""
 "    This is the module for computing Procurements.\n"
 "    "
 msgstr ""
+"\n"
+"    Este é o modulo para processamento de aprovisionamentos\n"
+"    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Ordens de aprovisionamento relacionadas"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"O assistente verifica todas as regras de stock mínimo e gera as ordens de "
+"aprovisionamento"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -443,6 +473,8 @@ msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
 msgstr ""
+"Verifique a quantidade nas ordens de aprovisionamento, deve ser maior que "
+"zero!"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -450,6 +482,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Se o campo 'ativo' for falso, perite ocultar o ponto de encomenda, sem o "
+"remover."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -462,11 +496,13 @@ msgstr ""
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
+"Se o stock de um artigo é inferior a 0, vai comportar-se como um ponto de "
+"encomenda."
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Lines"
-msgstr ""
+msgstr "Linhas de aprovisionamento"
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
@@ -483,7 +519,7 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -493,7 +529,7 @@ msgstr "Rascunho"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "This wizard will schedule procurements."
-msgstr ""
+msgstr "O assistente vai programar os aprovisionamentos."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -508,17 +544,17 @@ msgstr "Normal"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está a tentar associar a um lote, que não é do mesmo artigo."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Artigos a aprovisionar"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
@@ -539,12 +575,12 @@ msgstr ""
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Ponto de encomenda automático"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Regra de inventário mínimo"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -559,7 +595,7 @@ msgstr "Informação extra"
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr ""
+msgstr "Nome do aprovisionamento"
 
 #. module: procurement
 #: constraint:stock.move:0
@@ -569,12 +605,12 @@ msgstr "Tem de associar um lote de produção a este produto"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
-msgstr ""
+msgstr "Motivo do aprovisionamento"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "O multiplo da quantidade deve ser maior que zero."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
@@ -590,13 +626,13 @@ msgstr ""
 #: code:addons/procurement/procurement.py:372
 #, python-format
 msgid "Procurement '%s' is in exception: not enough stock."
-msgstr ""
+msgstr "O aprovisionamento '%s' está em exceção: stock insuficiente."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s State!"
-msgstr ""
+msgstr "Não pode eliminar uma ordem de aprovisionamento no estado '%s'!"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:324
@@ -609,7 +645,7 @@ msgstr "Insuficiência de dados!"
 #: field:mrp.property,group_id:0
 #: field:mrp.property.group,name:0
 msgid "Property Group"
-msgstr ""
+msgstr "Grupo da propriedade"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -619,32 +655,33 @@ msgstr "Diversos"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr ""
+msgstr "Localizações"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "de stock"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "General Information"
-msgstr ""
+msgstr "Informação genérica"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Executar o aprovisionamento"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
 msgstr ""
+"A quantidade do aprovisionamento será arredondada para este múltiplo."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -659,7 +696,7 @@ msgstr "Cancelar"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Modo de reordenação"
 
 #. module: procurement
 #: field:procurement.order,origin:0
@@ -674,7 +711,7 @@ msgstr "Não urgente"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Executar todos os planeadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -684,7 +721,7 @@ msgstr "Atual"
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Aprovisionamentos em exceção"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -697,7 +734,7 @@ msgstr "Detalhes"
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Exceções de aprovisionamento"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -707,12 +744,12 @@ msgstr ""
 #: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Regras de stock mínimo"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "Fechar movimento no fim"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -746,7 +783,7 @@ msgstr "mínimo"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Regras de quantidade"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -756,17 +793,17 @@ msgstr "Em execução"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "UdM do artigo"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr ""
+msgstr "Produzir por encomenda"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -800,11 +837,13 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Este assistente vai planear o aprovisionamento para este artigo. Este "
+"aprovisionamento pode gerar uma tarefa, uma ordem de produção ou de compra."
 
 #. module: procurement
 #: view:res.company:0
 msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "Planeador de produção e logistica"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -820,20 +859,20 @@ msgstr "máximo"
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "UdV do artigo"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "de stock: produtos atribuidos."
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Executar planeadores"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -853,12 +892,12 @@ msgstr ""
 #. module: procurement
 #: field:procurement.order,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM do artigo"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr ""
+msgstr "Pesquisar aprovisionamento"
 
 #. module: procurement
 #: help:res.company,schedule_range:0
@@ -876,15 +915,15 @@ msgstr "Muito urgente"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Ponto de encomenda automático"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Details"
-msgstr ""
+msgstr "Detalhes do aprovisionamento"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:180
 #, python-format
 msgid "SCHEDULER"
-msgstr ""
+msgstr "PLANEADOR"
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index a09115daecf..0d5f22895e4 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,10 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
-"access_procurement_stock_manager","procurement.order stock.manager","model_procurement_order","stock.group_stock_manager",1,1,1,1
-"access_procurement_stock_user","procurement.order stock.user","model_procurement_order","stock.group_stock_user",1,1,1,1
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,0,0,0
-"access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
-"access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
-"access_mrp_property","mrp.property","model_mrp_property","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_procurement,procurement.order,model_procurement_order,base.group_user,1,0,0,0
+access_procurement_stock_user,procurement.order stock.user,model_procurement_order,stock.group_stock_user,1,1,1,1
+access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,model_stock_warehouse_orderpoint,stock.group_stock_user,1,0,0,0
+access_stock_warehouse_orderpoint_system,stock.warehouse.orderpoint system,model_stock_warehouse_orderpoint,stock.group_stock_manager,1,1,1,1
+access_mrp_property_group,mrp.property.group,model_mrp_property_group,stock.group_stock_manager,1,1,1,1
+access_mrp_property,mrp.property,model_mrp_property,stock.group_stock_manager,1,1,1,1
+access_mrp_property_group,mrp.property.group,model_mrp_property_group,base.group_user,1,0,0,0
+access_mrp_property,mrp.property,model_mrp_property,base.group_user,1,0,0,0
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 1c4bd145d6d..33a6361d03b 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-15 06:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:01+0000\n"
+"Last-Translator: António Anacleto (www.biztek.cv) "
+"<antonio.anacleto@biztek.cv>\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: 2011-11-05 05:19+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1748,7 +1749,7 @@ msgstr "Produtos por Categoria"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categorias de Produtos"
 
 #. module: product
@@ -1862,7 +1863,7 @@ msgstr ""
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Este produto está configurado com exemplo de fluxos puxe/empurre"
 
 #. module: product
 #: field:product.packaging,length:0
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 72c51639849..b5cd20854d9 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -1,19 +1,19 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_uom_categ_user","product.uom.categ.user","model_product_uom_categ","base.group_user",1,0,0,0
-"access_product_uom_user","product.uom.user","model_product_uom","base.group_user",1,0,0,0
-"access_product_ul_user","product.ul.user","model_product_ul","base.group_user",1,0,0,0
-"access_product_category_user","product.category.user","model_product_category","base.group_user",1,0,0,0
-"access_product_template_user","product.template.user","model_product_template","base.group_user",1,0,0,0
-"access_product_packaging_user","product.packaging.user","model_product_packaging","base.group_user",1,0,0,0
-"access_product_supplierinfo_user","product.supplierinfo.user","model_product_supplierinfo","base.group_user",1,0,0,0
-"access_pricelist_partnerinfo_user","pricelist.partnerinfo.user","model_pricelist_partnerinfo","base.group_user",1,0,0,0
-"access_product_price_type_user","product.price.type.user","model_product_price_type","base.group_user",1,0,0,0
-"access_product_pricelist_type_user","product.pricelist.type.user","model_product_pricelist_type","base.group_user",1,0,0,0
-"access_product_pricelist_user","product.pricelist.user","model_product_pricelist","base.group_user",1,0,0,0
-"access_product_pricelist_version_user","product.pricelist.version.user","model_product_pricelist_version","base.group_user",1,0,0,0
-"access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
-"access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
-"access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
-"access_product_template_sale_manager","product.template salemanager","model_product_template","base.group_sale_manager",1,1,1,1
-"access_product_product_sale_manager","product.product salemanager","model_product_product","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_uom_categ_user,product.uom.categ.user,model_product_uom_categ,base.group_user,1,0,0,0
+access_product_uom_user,product.uom.user,model_product_uom,base.group_user,1,0,0,0
+access_product_ul_user,product.ul.user,model_product_ul,base.group_user,1,0,0,0
+access_product_category_user,product.category.user,model_product_category,base.group_user,1,0,0,0
+access_product_template_user,product.template.user,model_product_template,base.group_user,1,0,0,0
+access_product_packaging_user,product.packaging.user,model_product_packaging,base.group_user,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo.user,model_product_supplierinfo,base.group_user,1,0,0,0
+access_pricelist_partnerinfo_user,pricelist.partnerinfo.user,model_pricelist_partnerinfo,base.group_user,1,0,0,0
+access_product_price_type_user,product.price.type.user,model_product_price_type,base.group_user,1,0,0,0
+access_product_pricelist_type_user,product.pricelist.type.user,model_product_pricelist_type,base.group_user,1,0,0,0
+access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0
+access_product_pricelist_version_user,product.pricelist.version.user,model_product_pricelist_version,base.group_user,1,0,0,0
+access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0
+access_product_pricelist_type_partner_manager,product.pricelist.type partner manager,model_product_pricelist_type,base.group_partner_manager,1,0,0,0
+access_product_pricelist_partner_manager,product.pricelist partner manager,model_product_pricelist,base.group_partner_manager,1,0,0,0
+access_product_product_employee,product.product employee,model_product_product,base.group_user,1,0,0,0
+access_product_template_sale_manager,product.template salemanager,model_product_template,base.group_sale_manager,1,1,1,1
+access_product_product_sale_manager,product.product salemanager,model_product_product,base.group_sale_manager,1,1,1,1
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 3b60b21979c..b2b2592b338 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    "name" : "Products Attributes & Manufacturers",
+    "name" : "Products Manufacturers",
     "version" : "1.0",
     "author" : "OpenERP SA",
     'category': 'Purchase Management',
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index b06d5d3ea96..aab8e0748fe 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_manufacturer_attribute,product.manufacturer.attribute,model_product_manufacturer_attribute,base.group_user,1,1,1,1
diff --git a/addons/product_margin/security/ir.model.access.csv b/addons/product_margin/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/product_margin/security/ir.model.access.csv
+++ b/addons/product_margin/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index c49565f8e29..5e240a5ac0b 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    "name": "Visible Discounts on SO",
+    "name": "Prices Visible Discounts",
     "version": "1.0",
     "author": "OpenERP SA",
     'category': 'Sales Management',
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 3036b038d3f..18403d646f7 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     'complexity': "easy",
     "description": """
 Installer for extra Hidden like lunch, survey, idea, share, etc.
diff --git a/addons/profile_tools/i18n/hr.po b/addons/profile_tools/i18n/hr.po
new file mode 100644
index 00000000000..eaaed3f8e40
--- /dev/null
+++ b/addons/profile_tools/i18n/hr.po
@@ -0,0 +1,153 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 10:10+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+"Promoviranje ideja zaposlenika, glasovanje i rasprava o najboljim idejama."
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+"Dopušta vam davanje ograničenog pristupa vašim OpenERP dokumentima vanjskim "
+"korisnicima, poput kupaca, dobavljača ili računovođe. Možete podjeliti bilo "
+"koji OpenERP izbornik poput zadatka projekta, zahtejvi za podrškom, računi, "
+"itd."
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Ponavljajući dokumenti"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+"Instaliraj alate za lansiranje, upitnike, pretplatu i audittrail modul\n"
+"    "
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+"Dodatni alati su aplikacije koje vam mogu pomoći u poboljšanju organizacije "
+"iako nisu ključni za upravljanje društvom."
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Omogućuje organiziranje istraživanja"
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Razni alati"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Podešavanje dodatnih alata"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Kutija za ideje"
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Pomaže u generiranju automatskih ponavljajućih dokumenata"
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Podešavanje alata"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Upitnik"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Djeljenje na webu"
diff --git a/addons/profile_tools/security/ir.model.access.csv b/addons/profile_tools/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/profile_tools/security/ir.model.access.csv
+++ b/addons/profile_tools/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/profile_tools/static/src/img/icon.png b/addons/profile_tools/static/src/img/icon.png
new file mode 100644
index 00000000000..d6ba0866777
--- /dev/null
+++ b/addons/profile_tools/static/src/img/icon.png
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index cdd8894aabe..88424be85fa 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -87,7 +87,6 @@
                             <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
                         </column>
                         <column>
-                            <action name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours"/>
                             <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
                         </column>
                     </board>
diff --git a/addons/project/project.py b/addons/project/project.py
index 5c234cf5e26..8688f4ebc9b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -920,21 +920,24 @@ class task(osv.osv):
             self.log(cr, uid, id, message)
         return True
 
-    def set_remaining_time_1(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 1.0}, context=context)
+    def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
+        for task in self.browse(cr, uid, ids, context=context):
+            if (task.state=='draft') or (task.planned_hours==0.0):
+                self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
+        self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
         return True
 
+    def set_remaining_time_1(self, cr, uid, ids, context=None):
+        return self.set_remaining_time(cr, uid, ids, 1.0, context)
+
     def set_remaining_time_2(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 2.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 2.0, context)
 
     def set_remaining_time_5(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 5.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 5.0, context)
 
     def set_remaining_time_10(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 10.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 10.0, context)
 
     def set_kanban_state_blocked(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
@@ -979,6 +982,7 @@ class task(osv.osv):
             self.pool.get('project.task.history').create(cr, uid, {
                 'task_id': task.id,
                 'remaining_hours': task.remaining_hours,
+                'planned_hours': task.planned_hours,
                 'kanban_state': task.kanban_state,
                 'type_id': task.type_id.id,
                 'state': task.state,
@@ -1158,7 +1162,8 @@ class project_task_history(osv.osv):
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
             'project.task.history': (_get_related_date, None, 20)
         }),
-        'remaining_hours': fields.float('Remaining Hours', digits=(16,2)),
+        'remaining_hours': fields.float('Remaining Time', digits=(16,2)),
+        'planned_hours': fields.float('Planned Time', digits=(16,2)),
         'user_id': fields.many2one('res.users', 'Responsible'),
     }
     _defaults = {
@@ -1186,7 +1191,7 @@ class project_task_history_cumulative(osv.osv):
                     id as history_id,
                     date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
                     task_id, type_id, user_id, kanban_state, state,
-                    remaining_hours
+                    remaining_hours, planned_hours
                 FROM
                     project_task_history
             ) as history
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c8fe92f4194..22fc175246e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -378,6 +378,7 @@
                                                         type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
                                                     ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
                                                 ></t>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                             </span>
                                         </div>
                                         <div class="oe_kanban_clear"/>
@@ -488,11 +489,6 @@
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter name="edit"
-                            string="Edit" context="{'set_editable':True,'seq_visible': True}"
-                            icon="gtk-execute"
-                            groups="base.group_extended"/>
-                        <separator orientation="vertical"/>
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index aff90aea94e..89667992f0a 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -26,18 +26,31 @@
             <field name="arch" type="xml">
                 <graph string="Project Tasks" type="bar">
                     <field name="date"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="type_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+        <record id="view_task_history_burndown_graph" model="ir.ui.view">
+            <field name="name">project.task.history.burndown.graph</field>
+            <field name="model">project.task.history.burndown</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Burndown Chart of Tasks" type="bar">
+                    <field name="date"/>
                     <field name="remaining_hours" operator="+"/>
                     <field name="type_id" group="True"/>
                 </graph>
             </field>
         </record>
 
+
         <record id="view_task_history_search" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.search</field>
             <field name="model">project.task.history.cumulative</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-               <search string="Task's Cumulative Flow">
+               <search string="Task's Analysis">
                     <group>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
@@ -69,13 +82,28 @@
             <field name="res_model">project.task.history.cumulative</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_task_history_graph"/>
             <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
             parent="project_report_task" />
 
 
+        <record id="action_view_task_history_burndown" model="ir.actions.act_window">
+            <field name="name">Burndown Chart</field>
+            <field name="res_model">project.task.history.cumulative</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_task_history_burndown_graph"/>
+            <field eval="False" name="filter"/>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
+        </record>
+        <menuitem action="action_view_task_history_burndown"
+            id="menu_action_view_task_history_burndown"
+            parent="project_report_task" />
+
+
     </data>
 </openerp>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index bf828d6b231..5af8706108f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -150,7 +150,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
@@ -269,28 +269,5 @@
          </field>
     </record>
 
-    <record id="action_project_vs_planned_total_hours_graph" model="ir.actions.act_window">
-
-        <field name="name">Projects: Planned Vs Total hours</field>
-        <field name="res_model">project.vs.hours</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="context">{}</field>
-        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
-    </record>
-
-    <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
-            <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
-    </record>
-    <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
-            <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
-    </record>
     </data>
 </openerp>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 955a6ef0c97..633c5164484 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,26 +1,18 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
-"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
-"access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
-"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
-"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
-"access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
-"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
-"access_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,1,1,1
-"access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
-"access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
-"access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
-"access_partner_address_task user","base.res.partner.address user","base.model_res_partner_address","project.group_project_user",1,0,0,0
-"access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0
-"access_task_on_partner","project.task on partners","model_project_task","base.group_user",1,0,0,0
-"access_project_on_partner","project.project on partners","model_project_project","base.group_user",1,0,0,0
-"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
-"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
-"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
-"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","project.group_project_manager",1,1,1,1
-"access_project_task_history","project.task.history project","project.model_project_task_history","project.group_project_user",1,1,1,0
-"access_project_task_history_cumulative","project.task.history project","project.model_project_task_history_cumulative","project.group_project_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,1,1,1
+access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
+access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
+access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1
+access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1
+access_project_vs_hours,project.vs.hours,model_project_vs_hours,project.group_project_user,1,1,1,1
+access_task_by_days,task.by.days,model_task_by_days,project.group_project_user,1,1,1,1
+access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0
+access_partner_address_task user,base.res.partner.address user,base.model_res_partner_address,project.group_project_user,1,0,0,0
+access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
+access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0
+access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
+access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
+access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
+access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
diff --git a/addons/project/static/src/img/icon.png b/addons/project/static/src/img/icon.png
new file mode 100644
index 00000000000..20ba49f07c8
--- /dev/null
+++ b/addons/project/static/src/img/icon.png
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 0d566be4619..c88892eae11 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -57,20 +57,6 @@
                 </field>
             </field>
         </record>
-        
-        <record id="view_project_caldav_task_form2" model="ir.ui.view">
-            <field name="name">project.task.caldav.form2</field>
-            <field name="model">project.task</field>
-            <field name="inherit_id" ref="project.view_task_form2" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="progress" position="after">
-                    <!--     Recurrency of task not well implemented for now, remove the option-->     
-                     <field name="recurrency" invisible="1"/>
-                     <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>                    
-                </field>
-            </field>
-        </record>
 
         <record id="view_project_caldav_task_form3" model="ir.ui.view">
             <field name="name">project.task.caldav.form3</field>
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 61ed601829f..7dae4706b70 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -57,7 +57,7 @@ performing those tasks.
     ],
     'demo_xml': ['project_gtd_demo.xml'],
     'test':[
-        'test/gtd_test.yml'
+         'test/task_timebox.yml'
     ],
     'installable': True,
     'application': True,
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 8e85047c51c..d85ac8a5d0c 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_gtd_context_user","project.gtd.context project user","model_project_gtd_context","project.group_project_user",1,0,0,0
-"access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
-"access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
-"access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_gtd_context_user,project.gtd.context project user,model_project_gtd_context,project.group_project_user,1,0,0,0
+access_project_gtd_timebox_user,project.gtd.timebox project user,model_project_gtd_timebox,project.group_project_user,1,0,0,0
+access_project_gtd_context_manager,project.gtd.context project manager,model_project_gtd_context,project.group_project_manager,1,1,1,1
+access_project_gtd_timebox_manager,project.gtd.timebox project manager,model_project_gtd_timebox,project.group_project_manager,1,1,1,1
diff --git a/addons/project_gtd/test/gtd_test.yml b/addons/project_gtd/test/gtd_test.yml
deleted file mode 100644
index 0583bc7e8e0..00000000000
--- a/addons/project_gtd/test/gtd_test.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-- 
-  Create a task 'Develop time management module' with weekly timebox
-- 
-  !record {model: project.task, id: project_task_developtimemanagementmodule0}:
-    name: Develop time management module
-    planned_hours: 15.0
-    project_id: project.project_project_22
-    remaining_hours: 15.0
-    state: draft
-    timebox_id: project_gtd.timebox_weekly
-    
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_developtimemanagementmodule0")], {"lang":
-      "en_US", "project_id": False, "tz": False, "active_model": "ir.ui.menu",
-      "department_id": False, "section_id": False, "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "active_ids":
-      [ref("project.menu_action_view_task")], "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Create time box for next week
-- 
-  !record {model: project.gtd.timebox, id: project_gtd_timebox_nextweek0}:
-    name: Next Week
-    sequence: 0.0
-    
-- 
-  Create time box for tomorrow
-- 
-  !record {model: project.gtd.timebox, id: project_gtd_timebox_tomorrow1}:
-    name: Tomorrow
-    sequence: 0.0
-    
-- 
-  Planify the task from weekly timebox to tomorrow timebox
-- 
-  !record {model: project.timebox.fill.plan, id: project_timebox_fill_plan_0}:
-    task_ids:
-      - project_task_developtimemanagementmodule0
-    timebox_id: project_gtd.timebox_weekly
-    timebox_to_id: project_gtd_timebox_tomorrow1
-    
-    
-- 
-  Set the task to tomorrow timebox
-- 
-  !python {model: project.timebox.fill.plan}: |
-    self.process(cr, uid, [ref("project_timebox_fill_plan_0")], {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.gtd.timebox",
-      "department_id": False, "section_id": False, "record_id": 1, "active_ids":
-      [ref("project_gtd.timebox_daily")], "active_id": ref("project_gtd.timebox_daily"),
-      })
-
--
-   Check if task set to tomorrow timebox
--
-   !assert {model: project.task, id: project_task_developtimemanagementmodule0, string: Task set to tomorrow timebox}:
-      - timebox_id.id == ref("project_gtd_timebox_tomorrow1")
-      
--
-   Empty Timebox for tomorrow
--
-   !python {model: project.timebox.empty}: |
-      self._empty(cr, uid,  {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.gtd.timebox",
-      "department_id": False, "section_id": False, "record_id": 1, "active_ids":
-      [ref("project_gtd_timebox_tomorrow1")], "active_id": ref("project_gtd_timebox_tomorrow1"),
-      })
-           
--
-   Check task 'Develop time management module' is no more in tomorrow timebox
--
-   !assert {model: project.task, id: project_task_developtimemanagementmodule0, string: Task is not in tomorrow timebox}: 
-      - timebox_id.id != ref("project_gtd_timebox_tomorrow1")
diff --git a/addons/project_gtd/test/task_timebox.yml b/addons/project_gtd/test/task_timebox.yml
new file mode 100644
index 00000000000..8efa7219b21
--- /dev/null
+++ b/addons/project_gtd/test/task_timebox.yml
@@ -0,0 +1,45 @@
+-
+  In order to test the process of Timebox in Project Management module,
+  I set my task from Daily to Weekly Timebox through Plannify Timebox
+-
+  !record {model: project.timebox.fill.plan, id: plan_id}:
+    task_ids: [project.project_task_10]
+    timebox_id: timebox_daily
+    timebox_to_id: timebox_weekly
+-
+  I set the task from Daily Timebox to Weekly Timebox
+-
+  !python {model: project.timebox.fill.plan}: |
+    self.process(cr, uid, [ref("plan_id")])
+-
+  I check task is set to Weekly Timebox
+-
+  !assert {model: project.task, id: project.project_task_10, string: Task should be set to weekly timebox}:
+     - timebox_id.id == ref("timebox_weekly")
+-
+  I Empty the Weekly Timebox
+-
+  !python {model: project.timebox.empty}: |
+      self._empty(cr, uid,  {"active_model": "project.gtd.timebox",
+      "active_ids":[ref("timebox_weekly")],
+      "active_id": ref("timebox_weekly"),
+      })
+-
+  I check task 'Develop Module in Sale Management' is no more in Weekly Timebox
+-
+  !assert {model: project.task, id: project.project_task_10 , string: Task is not in Weekly Timebox }:
+     - timebox_id.id != ref("timebox_weekly")
+-
+  I set Previous Timebox on task
+-
+  !python {model: project.task}: |
+     previous_timebox = self.prev_timebox(cr, uid, [ref("project.project_task_10")],
+     {'active_ids': [ref("project_gtd.menu_open_gtd_timebox_tree")],})
+     assert previous_timebox == True, "I set Previous Timebox on task"
+-
+  I set Next Timebox on task
+-
+  !python {model: project.task}: |
+      next_timebox = self.next_timebox(cr, uid, [ref("project.project_task_10")],
+      {'active_ids': [ref("project_gtd.menu_open_gtd_timebox_tree")],})
+      assert next_timebox == True, "I set Next Timebox on task"
+\ No newline at end of file
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 216f01eba9f..4553276057f 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,14 +56,14 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Issues Dashboard">
+                    <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
                             <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
                         </column>
                         <column>
-	                        <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
+                            <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
                             <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
                         </column>
                     </board>
@@ -80,7 +80,7 @@
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
-         	icon="terp-graph"
+             icon="terp-graph"
             action="open_board_project_issue"/>
 
     <!-- For Project Dashboard -->
@@ -147,12 +147,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
-						<action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
-            	</xpath>
-            	<xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
-						<action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
-            	</xpath>
+                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
+                </xpath>
+                <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
+                        <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index f5c39be7713..4708a6fdcd6 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,12 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
-"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
-"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
-"access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
-"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
-"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
-"access_mail_message_project_manager","mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,1
-"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
-"access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
-"access_crm_case_section","crm.case.section","crm.model_crm_case_section","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_issue_user,project.issue,model_project_issue,project.group_project_user,1,1,1,1
+access_project_issue_report_all,project.issue.report,model_project_issue_report,project.group_project_manager,1,1,1,1
+access_crm_case_categ_id,crm.case.categ,crm.model_crm_case_categ,project.group_project_manager,1,1,1,1
+access_project_issue_version_project,project_issue_version manager,model_project_issue_version,project.group_project_manager,1,1,1,1
+access_project_issue_version_project_user,project_issue_version user,model_project_issue_version,project.group_project_user,1,0,0,0
+access_mail_message_project_manager,mail.message.manager,mail.model_mail_message,project.group_project_manager,1,1,1,1
+access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1
+access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0
+access_mail_message_issue_project_user,mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
+access_crm_case_section,crm.case.section,crm.model_crm_case_section,project.group_project_user,1,0,0,0
diff --git a/addons/project_issue_sheet/i18n/hr.po b/addons/project_issue_sheet/i18n/hr.po
new file mode 100644
index 00000000000..a300e7ec625
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/hr.po
@@ -0,0 +1,77 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 09:54+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analitičke stavke"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Stavka kontrolne kartice"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Kontrolna kartica"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Datum kreiranja"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Kontrolne kartice"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 0e6c92c038b..a524f4cf05f 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -1,15 +1,15 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet_project_user","hr_timesheet_sheet.sheet user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
-"access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
-"access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
-"access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
-"access_hr_analytic_timesheet_project_manager","account.analytic.line.timesheet.project.manager","account.model_account_analytic_line","project.group_project_manager",1,1,1,1
-"access_account_analytic_journal_project_manager","account.analytic.journal.project.manager","account.model_account_analytic_journal","project.group_project_manager",1,1,1,1
-"access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
-"access_hr_timesheet_invoice_factor_project_manager","hr_timesheet_invoice.factor.project.manager","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_manager",1,1,1,1
-"access_account_invoice_project_manager","account.invoice.project.manager","account.model_account_invoice","project.group_project_manager",1,1,1,1
-"access_analytic_account_line_project_user","analytic_account_line_timesheet user","analytic.model_account_analytic_line","project.group_project_user",1,1,1,0
-"access_account_analytic_journal_project_user","account.analytic.journal.project.user","account.model_account_analytic_journal","project.group_project_user",1,1,1,0
-"access_account_fiscalyear_project_user","account.fiscalyear.project.user","account.model_account_fiscalyear","project.group_project_user",1,1,1,0
-"access_hr_timesheet_invoice_factor_project_user","hr_timesheet_invoice.factor.project.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_user",1,1,1,0
-"access_account_invoice_project_user","account.invoice.project.user","account.model_account_invoice","project.group_project_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_sheet_sheet_project_user,hr_timesheet_sheet.sheet user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
+access_hr_analytic_timesheet_project_user,hr_analytic_timesheet user,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_user,1,1,1,0
+access_hr_analytic_timesheet_project_manager,hr_analytic_timesheet manager,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_manager,1,0,0,0
+access_hr_timesheet_sheet_sheet_project_manager,hr_timesheet_sheet.sheet manager,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_manager,1,0,0,0
+access_hr_analytic_timesheet_project_manager,account.analytic.line.timesheet.project.manager,account.model_account_analytic_line,project.group_project_manager,1,1,1,1
+access_account_analytic_journal_project_manager,account.analytic.journal.project.manager,account.model_account_analytic_journal,project.group_project_manager,1,1,1,1
+access_account_fiscalyear_project_manager,account.fiscalyear.project.manager,account.model_account_fiscalyear,project.group_project_manager,1,1,1,1
+access_hr_timesheet_invoice_factor_project_manager,hr_timesheet_invoice.factor.project.manager,hr_timesheet_invoice.model_hr_timesheet_invoice_factor,project.group_project_manager,1,1,1,1
+access_account_invoice_project_manager,account.invoice.project.manager,account.model_account_invoice,project.group_project_manager,1,1,1,1
+access_analytic_account_line_project_user,analytic_account_line_timesheet user,analytic.model_account_analytic_line,project.group_project_user,1,1,1,0
+access_account_analytic_journal_project_user,account.analytic.journal.project.user,account.model_account_analytic_journal,project.group_project_user,1,1,1,0
+access_account_fiscalyear_project_user,account.fiscalyear.project.user,account.model_account_fiscalyear,project.group_project_user,1,1,1,0
+access_hr_timesheet_invoice_factor_project_user,hr_timesheet_invoice.factor.project.user,hr_timesheet_invoice.model_hr_timesheet_invoice_factor,project.group_project_user,1,1,1,0
+access_account_invoice_project_user,account.invoice.project.user,account.model_account_invoice,project.group_project_user,1,1,1,0
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index fffed6128ac..84ac057bbb4 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -43,14 +43,7 @@ Features
     "init_xml": [],
     "demo_xml": ["project_long_term_demo.xml"],
     "test": [
-          'test/test_schedule_phases_case1.yml',
-          'test/schedule_project_phases.yml',
-          'test/schedule_project_tasks.yml',
-          'test/test_schedule_phases_case2.yml',
-          'test/project_schedule_consecutive_day.yml',
-          'test/project_schedule_without_wroking_hour.yml',
-          'test/phase_constraint.yml',
-          'test/test_schedule_tasks_case1.yml',
+          'test/phase_process.yml',
     ],
     "update_xml": [
         "security/ir.model.access.csv",
@@ -60,7 +53,6 @@ Features
         "wizard/project_compute_tasks_view.xml",
     ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate': '001227470751077315069',
 }
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
new file mode 100644
index 00000000000..434470646c2
--- /dev/null
+++ b/addons/project_long_term/i18n/hr.po
@@ -0,0 +1,625 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 09:44+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Upravljanje dugotrajnim projektima"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Izračunaj planiranje faza"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Sljedeće faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Zadaci projekta"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Alokacija resursa"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "Postavke prikaza"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Zakaži"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"        Modul upravljanja dugotrajnim projektima prati planiranje, "
+"zakazivanje i alokaciju resursa.\n"
+"        Uglavnom se koristi s Upravljanjem velikim projektima.\n"
+"            - Faze projekta će održavati voditelj projekta\n"
+"            - Izračunaj zakaizivanje faza: Uzračunaj početni datum i završni "
+"datum faza koje su u statusu nacrt,otvoreno i na čekanju za odabrani "
+"projekt.\n"
+"                                        Ako nijeda projekt nije odabran tada "
+"će se uzeti sve faze u statusu nacrt, otvoreno i na čekanju \n"
+"            - Izračunaj zakazivanje zadatka: RAdi na isti način kao i gumb "
+"za zakazivanje na fazama projekta. Uzima projekt kao argument i računa sve "
+"zadatke u statusu nacrt, otvoreno i na čekanju.\n"
+"            - Zakaži zadatke: Svi azdaci u statusu nacrt, otvoreno i na "
+"čekanju se zakazuju uzimajući početni datum faze.\n"
+"\n"
+"    "
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Alokacije resursa"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "Dan"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Izračunaj pojedinačni projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Prijašnje faze"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "JM (Jedinica mjere) je mjerna jedinica za trajanje"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr " Planer računa prema datumu početka i trajanju."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Završni datum"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Planiranje"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Krajnji rok"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Izračunaj zakazivanje faze"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (kopija)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Raspoloživost"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "I_zračunaj"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr "Izračunaj zakazivanje faza za sve ili pojedini projekt"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "JM trajanja"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr "Izračunaj zakazivanje zadataka"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Minimalni početni datum"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Alokacija resursa projekta"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Izračunaj zakazivanje zadatka"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Resursi"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+"Za zakazivanje faza svih ili pojedinog projekta. Nakon toga otvara Gantt "
+"pogled.\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Početni datum"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Vezani zadaci"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "Raspoloživost tog resursa za tu fazu projekta u postotku (=50%)"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "prisili početak faze nakon ovog datuma"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Zadaci projekta"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Resursi projekta"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_U redu"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "Zakaži i prikaži info"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Računa planer prema datumu projekta ili završnom datumu prethodne faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Početni datum faze mora biti manje od završnog datuma faze."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "project.schedule.tasks"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on the project."
+msgstr ""
+"Projekt je moguće podjeliti u različite faze. Za svaku fazu, možete "
+"definriati alokaciju resursa, opisati različite zadatke i povezati vašu fazu "
+"sa prethodnom i sljedećom fazom, dodati datumska ograničenja za automatsko "
+"zakazivanje. Koristite dugotrajno planiranje za vaše raspoložive ljudske "
+"resurse, pretvorite vaš faze u seriju zadataka nakon početka rada na "
+"projektu."
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Alokacija resursa"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "prisili završetak faze prije ovog datuma"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "nepoznato"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Pojedinosti o zadataku"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Raspored radnih sati za prilagođavanje izvještaja Gantt dijagramom"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Izračun zadatka projekta"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Ograničenja"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Daje redoslijed sekvence prilikom prikaza popisa faza."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Faze projekta"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Preostali sati"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Radno vrijeme"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Trenutni"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Početna faza"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "Molim navedite projekt za zakazivanje"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Ukupni sati"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "Zakazivanje zdataka uspješno završeno"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "Izračunaj zakazivanje zadataka za odabrani projekt"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Faza"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Ako je faza kreirana u statusu 'Nacrt'.\n"
+" AKo je faza započela, status se mijenja u 'U tijeku'.\n"
+" Ako je potreban pregled faza je u statusu 'Na čekanju'.                     "
+"             \n"
+" Ako je faza završila, status je postavljen na 'Završeno'."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Resurs"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Pojedinosti zadatka"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Razdoblje rada"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Pojedinosti resursa"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Zakazivanje"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Faza projekta"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Izračun faza projekta"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Petlje u fazama nisu dozvoljene"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Izračunaj sve projekte"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Odsustva resursa"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Zakaži zadatke"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Predefinirano u danima"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Trajanje"
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index fe3f8c8e510..4cd6d5cdec4 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -5,6 +5,10 @@
         This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
         -->
 
+        <record id="project.project_integrate_openerp" model="project.project">
+            <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
+        </record>
+
         <!-- Project Phases -->
 
         <record id="project_phase_1" model="project.phase">
@@ -13,6 +17,7 @@
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
+            <field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
@@ -37,9 +42,9 @@
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
-        
+
         <record id="project_phase_4" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_3')])]" name="previous_phase_ids"/>
             <field name="name">Development and Integration</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="4" name="sequence"/>
@@ -60,7 +65,7 @@
             <field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
             <field name="name">Deployement and Training</field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="5" name="sequence"/>
+            <field eval="6" name="sequence"/>
             <field name="duration">10</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 4382d27834e..6ca496f691d 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,9 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_user_allocation","project.user.allocation","model_project_user_allocation","project.group_project_user",1,0,0,0
-"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,1,1,1
-"access_project_user_allocation_manager","project.user.allocation manager","model_project_user_allocation","project.group_project_manager",1,1,1,1
-"access_resource_resource_user","user.user user","resource.model_resource_resource","project.group_project_user",1,0,0,0
-"access_resource_calendar_leaves_user","user.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
-"access_resource_resource_manager","user.user manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
-"access_project_user_allocation_manager","project.user.allocation.manager","model_project_user_allocation","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_phase,project.phase,model_project_phase,project.group_project_user,1,1,1,0
+access_project_user_allocation,project.user.allocation,model_project_user_allocation,project.group_project_user,1,0,0,0
+access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
+access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
+access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0
+access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
+access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
+access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
diff --git a/addons/project_long_term/test/phase_constraint.yml b/addons/project_long_term/test/phase_constraint.yml
deleted file mode 100644
index f4fa09e6e38..00000000000
--- a/addons/project_long_term/test/phase_constraint.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-- 
-  Given that I have a project 'Test Phases'.
-- 
-  !record {model: project.project, id: project_project_developyamlproject0}:
-    name: "Develop Yaml Project Module"
-    date_start: !eval time.strftime('%Y-%m-%d')
-    resource_calendar_id: resource.timesheet_group1
-    members:
-      - base.user_admin
-- 
-  And I create three human ressources to work on this project, an analyst.
-- 
-  !record {model: resource.resource, id: resource_resource_analyst1}:
-    calendar_id: resource.timesheet_group1
-    name: Analyst
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I define a developer HR.
-- 
-  !record {model: resource.resource, id: resource_resource_develop0}:
-    calendar_id: resource.timesheet_group1
-    name: Developer
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I define a tester HR.
-- 
-  !record {model: resource.resource, id: resource_resource_tester1}:
-    calendar_id: resource.timesheet_group1
-    name: tester
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  Then I create three phases for my projects; Analysis, Development, Testing.
-- 
-  The first phase is 'Analysis' and has a duration of 6 days.
-- 
-  !record {model: project.phase, id: project_phase_analysisflowforyaml0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 6.0
-    name: "Analysis"
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject0
-    state: draft
-
-- 
-  I update the constrain and the analysis phase to not start before 4 days.
-- 
-   !python {model : project.phase }: |
-      pass
-      import datetime
-      from dateutil.relativedelta import *
-      start = datetime.date.today() + relativedelta(days=4)
-      self.write(cr,uid, [(ref("project_phase_analysisflowforyaml0"))], {'constraint_date_start': start})
-- 
-  The second phase is 'Development' and depend on the 'Analysis', with a duration of 6 days.
-- 
-  !record {model: project.phase, id: project_phase_developyaml0}:
-    duration: 6.0
-    name: Development
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject0
-    previous_phase_ids:
-      - project_phase_analysisflowforyaml0
-
-- 
-  I update the Constrain Date Start adn Date End for phase Develop yaml
-- 
-   !python {model : project.phase }: |
-      pass 
-      import datetime
-      #from dateutil.relativedelta import *
-      #start = datetime.date.today() - relativedelta(days=5)    
-      #end = datetime.date.today() + relativedelta(days=10)
-      #self.write(cr,uid, [(ref("project_phase_developyaml0"))], {'constraint_date_start': start, 'constraint_date_end':end})
--
-  The third phase is 'Testing' and depend on the 'Develop' phase, with a duration of 6 days.
-- 
-  !record {model: project.phase, id: project_phase_testyaml0}:
-    duration: 6.0
-    name: Testing
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject0
-    previous_phase_ids:
-      - project_phase_developyaml0
-- 
-  Then I launch the scheduler to compute starting and ending phases on all phases of this project.
-- 
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_developyamlproject0
-    target_project: one
-- 
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, [ref("project_project_developyamlproject0")])
--
-  After scheduling, I check the starting date and ending date on the phases are correct.
--
-  !python {model: project.phase}: |
-     import datetime
-     from dateutil.relativedelta import *
-     minstart = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d')
-     minend = (datetime.date.today() + relativedelta(days=11)).strftime('%Y-%m-%d')
-
-     phase1=self.browse(cr, uid, ref('project_phase_analysisflowforyaml0'))
-     assert phase1.date_start>=minstart, 'Error, the Analysis phase '+phase1.date_start+' should start after '+str(minstart)
-     assert phase1.date_end>=minend, 'Error, the Analysis phase should end after '+str(minend)
-
-     phase2=self.browse(cr, uid, ref('project_phase_developyaml0'))
-     assert phase2.date_start>=phase1.date_end, 'Error, the phase Development should start after the end of the Analysis phase'
-
-     phase3=self.browse(cr, uid, ref('project_phase_testyaml0'))
-     assert phase3.date_start>=phase2.date_end, 'Error, the phase Testing should start after the end of the Development phase'
-     assert phase3.date_start<phase3.date_end, 'Error, the phase Testing should start before ending'
-
diff --git a/addons/project_long_term/test/phase_process.yml b/addons/project_long_term/test/phase_process.yml
new file mode 100644
index 00000000000..725c5b2a97d
--- /dev/null
+++ b/addons/project_long_term/test/phase_process.yml
@@ -0,0 +1,79 @@
+-
+  In order to test process of Phases,
+-
+  I create a record to schedule the phase of project.
+-
+  !record {model: project.compute.phases, id: project_compute_phases01}:
+    target_project: 'one'
+    project_id: project.project_integrate_openerp
+-
+  I schedule the phases.
+-
+  !python {model: project.compute.phases}: |
+    self.check_selection(cr, uid, [ref("project_compute_phases01")])
+-
+  I check the starting date and ending date on the phases after scheduling.
+-
+  !python {model: project.project}: |
+     project = self.browse(cr, uid, ref("project.project_integrate_openerp"), context=context)
+     def _convert(date):
+        import time
+        return time.strptime(date, '%Y-%m-%d %H:%M:%S')
+     def _check(phase, _convert, _check): #TOFIX: why need to pass function ?
+        for next_phase in phase.next_phase_ids:
+            assert _convert(next_phase.date_start) >= _convert(phase.date_end), "Phase does not start in proper date."
+            _check(next_phase, _convert, _check)
+        return True
+     
+     for phase in project.phase_ids:
+        
+        assert phase.date_start, "Start date should be computed."
+        assert phase.date_end, "End date should be computed." 
+        if not phase.previous_phase_ids and phase.constraint_date_start:
+            assert  _convert(phase.date_start) >= _convert(phase.constraint_date_start), "Phase does not start in proper date."
+            _check(phase, _convert, _check)
+-
+  I open phase.
+-
+  !python {model: project.phase}: |
+    self.set_open(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after opened.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in open state}:
+    - state == "open"
+-
+  I put phase in pending state.
+-
+  !python {model: project.phase}: |
+    self.set_pending(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after put in pending.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in pending state}:
+    - state == "pending"
+-
+  I make Phase in cancel state.
+-
+  !python {model: project.phase}: |
+    self.set_cancel(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after cancelled.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in cancel state}:
+    - state == "cancelled"
+-
+  I put again in draft phase.
+-
+  !python {model: project.phase}: |
+    self.set_draft(cr, uid, [ref("project_phase_1")])
+-
+  I close phase.
+-
+  !python {model: project.phase}: |
+    self.set_done(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after closed.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in done state}:
+    - state == "done"
diff --git a/addons/project_long_term/test/project_schedule_consecutive_day.yml b/addons/project_long_term/test/project_schedule_consecutive_day.yml
deleted file mode 100644
index cffe06a9ff9..00000000000
--- a/addons/project_long_term/test/project_schedule_consecutive_day.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-- 
-  Create a project 'Develop yaml Project Module'.
-- 
-  !record {model: project.project, id: project_project_developyamlproject_2}:
-    name: "Develop Yaml Project Module"
-    date_start: !eval time.strftime('%Y-%m-%d')
-    members:
-      - base.user_admin
-
-- 
-  I have set Working Time from Monday to  Friday from 9am to 17pm.
-- 
-  !record {model: resource.calendar, id: resource_calendar_hoursweekstest_P2}:
-    name: "from Monday to  Friday, from 9am to 17pm"
-
-- 
-  I have set Day1 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day1}:
-    name: "Day1"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "0"
-    calendar_id : resource_calendar_hoursweekstest_P2
-
-- 
-  I have set Day2 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: rresource_calendar_hoursweekstest_P2day2}:
-    name: "Day2"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "1"
-    calendar_id : resource_calendar_hoursweekstest_P2
-    
-- 
-  I have set Day3 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day3}:
-    name: "Day3"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "2"    
-    calendar_id : resource_calendar_hoursweekstest_P2
-
-- 
-  I have set Day4 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day4}:
-    name: "Day4"
-    hour_from: 09.00
-    hour_to: 17.00
-    dayofweek: "3"
-    calendar_id: resource_calendar_hoursweekstest_P2
-
-- 
-  I have set Day5 Working Time for Monday to  Friday from 9am to 17pm working hour
--
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day5}:
-    name: "Day5"
-    hour_from: 09.00
-    hour_to: 17.00
-    dayofweek: "4"
-    calendar_id: resource_calendar_hoursweekstest_P2
-
-- 
-  Now Set working period to  Project 'Develop yaml Project Module'
-- 
-  !python {model: project.project}: |  
-    self.write(cr, uid, [ref("project_project_developyamlproject_2")], {'resource_calendar_id': ref("resource_calendar_hoursweekstest_P2")})
-
-- 
-  Create 3 a project phase.
-  First 'Analysis Flow for Yaml'Project Phase
-- 
-  !record {model: project.phase, id:  project_project_developyamlproject_2_Phase1}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 5.0
-    name: "Analysis Flow for Yaml"
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    state: draft
-    
-- 
-  Create project phase 'Develop yaml'
-- 
-  !record {model: project.phase, id:  project_project_developyamlproject_2_Phase2}:
-    duration: 5.0
-    name: Develop Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      -  project_project_developyamlproject_2_Phase1
-       
-- 
-  Create project phase 'Test Yaml'
-- 
-  !record {model: project.phase, id:  project_project_developyamlproject_2_Phase3}:
-    duration: 5.0
-    name: Testing Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      -  project_project_developyamlproject_2_Phase2    
-    
-- 
-  Compute Schedule of phases For One project 
-- 
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_developyamlproject_2
-    target_project: one
-- 
-  Schedule project phases using Compute Phase Scheduling
-- 
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, [ref("project_project_developyamlproject_2")])
-      
--
-  After  scheduling, Check that  phases scheduled, check that either of phase's start_date, end_date not null.
--
-  !python {model: project.project}: |
-     proj=self.browse(cr, uid, [ref("project_project_developyamlproject_2")])[0]
-     for phase in proj.phase_ids:
-        if (not phase.date_start) or (not phase.date_end):
-           raise AssertionError("Phases not scheduled")
-
-
diff --git a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml b/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
deleted file mode 100644
index 4fe7687425b..00000000000
--- a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
+++ /dev/null
@@ -1,76 +0,0 @@
--
-  Create a project 'Develop yaml Implementation Module'.
--
-  !record {model: project.project, id: project_project_developyamlproject_2}:
-    name: "Develop Yaml Project Module"
-    date_start: !eval time.strftime('%Y-%m-%d')
-
-- 
-  Create 4 Project phase.
-  First Project Phase 'Analysis Flow for Yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_1}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 6.0
-    product_uom: product.uom_day
-    name: "Analysis Flow for Yaml"
-    project_id: project_project_developyamlproject_2
-    state: draft
-    
-- 
-  Create project phase 'Develop yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_2}:
-    duration: 6.0
-    name: "Develop yaml"
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      - project_project_developyamlproject_2_phase_1
-    state: draft
-- 
-  Create project phase 'Test Yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_3}:
-    duration: 6.0
-    name: Testing Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      - project_project_developyamlproject_2_phase_2    
-    state: draft
-
-- 
-  Create project phase 'Implement Yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_4}:
-    duration: 6.0
-    name: Testing Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      - project_project_developyamlproject_2_phase_3    
-    state: draft
-- 
-  Compute Schedule of phases For One project 
-- 
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_developyamlproject_2
-    target_project: one
-    
-- 
-  Schedule project phases using Compute Phase Scheduling
-- 
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, [ref("project_project_developyamlproject_2")])
-      
--
-  After  scheduling, Check that  phases scheduled, check that either of phase's start_date, end_date not null.
--
-  !python {model: project.project}: |
-     proj=self.browse(cr, uid, [ref("project_project_developyamlproject_2")])[0]
-     for phase in proj.phase_ids:
-        if (not phase.date_start) or (not phase.date_end):
-           raise AssertionError("Phases not scheduled")      
-      
-
diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml
deleted file mode 100644
index 550787fe867..00000000000
--- a/addons/project_long_term/test/schedule_project_phases.yml
+++ /dev/null
@@ -1,180 +0,0 @@
--
-  Create a project 'World Bank's Project'
--
-  !record {model: project.project, id: project_project_worldbanksproject0}:
-    name: "World Bank's Project"
-    priority: 4
-    members:
-      - project.res_users_analyst
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-
--
-  Create a project phase 'Defining Client's Basic Idea of Project'
--
-  !record {model: project.phase, id: project_phase_definingclientsbasicideaofproject0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 15.0
-    name: "Defining Client's Basic Idea of Project"
-    product_uom: product.uom_day
-    project_id: project_project_worldbanksproject0
-
--
-  Create project phase 'Establishing Project Feasibility'
--
-  !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 30.0
-    name: Establishing Project Feasibility
-    product_uom: product.uom_day
-    project_id: project_project_worldbanksproject0
--
-  Create the phase task 'Develop GUI for Server Configuration'
--
-  !record {model: project.task, id: project_task_t0}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    state: draft
-    phase_id:  project_phase_definingclientsbasicideaofproject0
-    project_id: project_project_worldbanksproject0
-
--
-  Create the phase task 'Develop GUI for Modules Configuration'
--
-  !record {model: project.task, id: project_task_t1}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id:  project_phase_definingclientsbasicideaofproject0
-    project_id: project_project_worldbanksproject0
-
--
-  Create project phase 'Preparation of Engineering Designs'
--
-  !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 100.0
-    name: Preparation of Engineering Designs
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
--
-  Create the phase task 'Develop GUI for Client Configuration'
--
-  !record {model: project.task, id: project_task_t2}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    remaining_hours: 20.0
-    state: draft
-    phase_id:  project_phase_preparationofengineeringdesigns0
-    project_id: project_project_worldbanksproject0
-
--
-  Create the phase task 'Develop GUI for Client Module Configuration'
--
-  !record {model: project.task, id: project_task_t3}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id:  project_phase_preparationofengineeringdesigns0
-    project_id: project_project_worldbanksproject0
-
-
--
-  Create project phase 'Procurement of Works and Goods'
--
-  !record {model: project.phase, id: project_phase_procurementofworksandgoods0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 24.0
-    name: Procurement of Works and Goods
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
--
-  Create project phase 'Project Construction'
--
-  !record {model: project.phase, id: project_phase_projectconstruction0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 4320.0
-    name: Project Construction
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
-
--
-  Create project phase 'Project Completion'
--
-  !record {model: project.phase, id: project_phase_projectcompletion0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 240.0
-    name: Project Completion
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
--
-  Set previous phase for phase 'Establishing Project Feasibility'
--
-  !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}:
-    previous_phase_ids:
-      - project_phase_definingclientsbasicideaofproject0
-
-
--
-  Set previous phase for phase 'Preparation of Engineering Designs'
--
-  !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}:
-    previous_phase_ids:
-      - project_phase_establishingprojectfeasibility0
-
--
-  Set previous phase for phase 'Procurement of Works and Goods'
--
-  !record {model: project.phase, id: project_phase_procurementofworksandgoods0}:
-    previous_phase_ids:
-      - project_phase_preparationofengineeringdesigns0
-
--
-  Set previous phase for phase 'Project Construction'
--
-  !record {model: project.phase, id: project_phase_projectconstruction0}:
-    previous_phase_ids:
-      - project_phase_procurementofworksandgoods0
-
-
--
-  Set previous phase for phase 'Project Completion'
--
-  !record {model: project.phase, id: project_phase_projectcompletion0}:
-    previous_phase_ids:
-      - project_phase_projectconstruction0
-
-
--
-  Get the project to schedule phases
--
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_worldbanksproject0
-    target_project: one
-
-
--
-  Schedule project phases
--
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, ref("project_project_worldbanksproject0"))
-
--
-  Check if phases scheduled, check that either of phase's start_date, end_date and user_id is not null
--
-  !python {model: project.project}: |
-     prj=self.browse(cr, uid, [ref("project_project_worldbanksproject0")])[0]
-     for phase in prj.phase_ids:
-        if (not phase.date_start) or (not phase.date_end):
-            raise AssertionError("Tasks not scheduled")
-
-
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
deleted file mode 100644
index 17db7ef8038..00000000000
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-- 
-  Create project 'Develop a thunderbird-openerp synchronization plugin'
-- 
-  !record {model: project.project, id: project_project_project1}:
-    name: Develop a thunderbird-openerp synchronization plugin
-    members:
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-      - project.res_users_analyst
-      - project.res_users_finacial_manager
-
-- 
-  Create phase 'Develop GUI' in thunderbird
-- 
-  !record {model: project.phase, id: project_phase_phase1}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    duration: 200.0
-    name: Develop GUI in thunderbird
-    product_uom: product.uom_day
-    project_id: project_project_project1
-    state: draft
-- 
-  Create the phase task 'Develop GUI for Server Configuration'
-- 
-  !record {model: project.task, id: project_task_t10}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    remaining_hours: 20.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_developer
-    
-- 
-  Create the phase task 'Develop GUI for Modules Configuration'
-- 
-  !record {model: project.task, id: project_task_t11}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_developer
-- 
-  Create the phase task 'Develop GUI for OpenERP Synchronisation'
-- 
-  !record {model: project.task, id: project_task_t12}:
-    name: Develop GUI for OpenERP Synchronisation
-    planned_hours: 30.0
-    remaining_hours: 30.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_developer
-- 
-  Create the phase task 'Design required GUI/Menus'
-- 
-  !record {model: project.task, id: project_task_13}:
-    name: Design required GUI/Menus
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_designer
-
-- 
-  Schedule tasks
-- 
-  !python {model: project.project}: |
-        self.schedule_tasks(cr, uid, ref("project_project_project1"))
-
--
-  Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
--
-  !python {model: project.project}: |
-    prj = self.browse(cr, uid, [ref("project_project_project1")])[0]
-    for task in prj.tasks:
-        if task.state in ('done','cancelled'):
-            continue
-        if (not task.user_id) or (not task.date_start) or (not task.date_end):
-            raise AssertionError("Project tasks not scheduled!")
diff --git a/addons/project_long_term/test/test_schedule_phases_case1.yml b/addons/project_long_term/test/test_schedule_phases_case1.yml
deleted file mode 100644
index 8b9ff5f3705..00000000000
--- a/addons/project_long_term/test/test_schedule_phases_case1.yml
+++ /dev/null
@@ -1,76 +0,0 @@
--
-  In order to test scheduling of project phases, I create two different phases and
-  test it with two different dates for scheduling.
--
-  I create a project Development and Testing.
-- 
-  !record {model: project.project, id: project_project_project_case1}:
-    name: "Development and Testing"
-    date_start: !eval time.strftime('%Y-%m-%d')
-    balance: 0.0
-    credit: 0.0
-    currency_id: base.EUR
-    debit: 0.0
-    effective_hours: 0.0
-    members:
-      - base.user_admin
-
-    planned_hours: 0.0
-    progress_rate: 0.0
-    quantity: 0.0
-    quantity_max: 0.0
-    state: open
-    type_ids:
-      - project.project_tt_specification
-      - project.project_tt_development
-      - project.project_tt_testing
-      - project.project_tt_merge
-- 
-  I create first phase of the project.
-- 
-  !record {model: project.phase, id: project_phase_firstphase0_case1}:
-    duration: 2.0
-    name: First Phase
-    product_uom: product.uom_day
-    project_id: project_project_project_case1
-    state: draft
-- 
-  I create second phase of the project.
-- 
-  !record {model: project.phase, id: project_phase_secondphase0_case2}:
-    duration: 3.0
-    name: Second Phase
-    previous_phase_ids:
-      - project_phase_firstphase0_case1
-    product_uom: product.uom_day
-    project_id: project_project_project_case1
-    state: draft
--
-  Now I create a record to compute the phase of project.
--
-  !record {model: project.compute.phases, id: project_compute_phases0}:
-    target_project: 'one'
-    project_id: project_project_project_case1
--
-  I schedule the phases.
--
-  !python {model: project.compute.phases}: |
-    self.check_selection(cr, uid, [ref("project_compute_phases0")])
--
-  I check the starting and ending dates of both phases.
--
-  !python {model: project.phase}: |
-    import datetime
-    from dateutil.relativedelta import *
-    start = (datetime.date.today()).strftime('%Y-%m-%d')
-    end = (datetime.date.today() + relativedelta(days=1)).strftime('%Y-%m-%d 17:00:00')
-    first_phase = self.browse(cr, uid, ref('project_phase_firstphase0_case1'))
-    assert (first_phase.date_start[:10] >= start),'Start dates are wrong: %s < %s !' % (first_phase.date_start[:10], start)
-    assert (first_phase.date_end >= end),'End dates are wrong: %s <%s!' % (first_phase.date_end, end)
-
-    second_phase = self.browse(cr, uid, ref('project_phase_secondphase0_case2'))
-    start = first_phase.date_end
-    end = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d')
-    assert second_phase.date_start >= start, 'Dates are wrong on second phase: %s < %s!' % (second_phase.date_start, start)
-    assert second_phase.date_end >= end, 'Dates are wrong on second phase %s < %s!' % (second_phase.date_end, end)
-
diff --git a/addons/project_long_term/test/test_schedule_phases_case2.yml b/addons/project_long_term/test/test_schedule_phases_case2.yml
deleted file mode 100644
index 35173a897a3..00000000000
--- a/addons/project_long_term/test/test_schedule_phases_case2.yml
+++ /dev/null
@@ -1,193 +0,0 @@
--
-  In order to test scheduling of project phases, I create two different 
-  working periods and resources. And schedule the phases.
-- 
-  I create first working period 'Working Time A'.
-- 
-  !record {model: resource.calendar, id: resource_calendar_workingtimea0}:
-    attendance_ids:
-      - dayofweek: '0'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Monday
-      - dayofweek: '1'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Tuesday
-      - dayofweek: '2'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Wednesday
-      - dayofweek: '3'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Thursday
-    name: Working Time A
-
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_monday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '0'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Monday
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_tuesday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '1'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Tuesday
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_wednesday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '2'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Wednesday
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_thursday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '3'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Thursday
-- 
-  I create second working period 'Working Time B'.
-- 
-  !record {model: resource.calendar, id: resource_calendar_workingtimeb0}:
-    attendance_ids:
-      - dayofweek: '4'
-        hour_from: 9.0
-        hour_to: 18.0
-        name: Friday
-    name: Working Time B
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_friday0}:
-    calendar_id: resource_calendar_workingtimeb0
-    dayofweek: '4'
-    hour_from: 9.0
-    hour_to: 18.0
-    name: Friday
-- 
-  I create first resource say 'Resource X' without assigning working period.
-- 
-  !record {model: resource.resource, id: resource_resource_resourcex0}:
-    name: Resource X
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I create first resource say 'Resource Y' with working period 'Working Time B'.
-- 
-  !record {model: resource.resource, id: resource_resource_resourcey0}:
-    calendar_id: resource_calendar_workingtimeb0
-    name: Resource Y
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I create a project 'Development and Testing' and assign working period 'Working Time A'.
-- 
-  !record {model: project.project, id: project_project_project0}:
-    balance: 0.0
-    credit: 0.0
-    currency_id: base.EUR
-    debit: 0.0
-    effective_hours: 0.0
-    members:
-      - base.user_admin
-    name: Development and Testing
-    planned_hours: 20.0
-    progress_rate: 0.0
-    quantity: 0.0
-    quantity_max: 0.0
-    resource_calendar_id: resource_calendar_workingtimea0
-    state: open
-    tasks:
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task 1
-        planned_hours: 10.0
-        remaining_hours: 10.0
-        state: draft
-        total_hours: 10.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task 2
-        planned_hours: 10.0
-        remaining_hours: 10.0
-        state: draft
-        total_hours: 10.0
-    total_hours: 10.0
-    members:
-      - project.res_users_analyst
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-    type_ids:
-      - project.project_tt_specification
-      - project.project_tt_development
-      - project.project_tt_testing
-      - project.project_tt_merge
-     
-- 
-  I create a phase 'Initial Phase' for project 'Development and Testing'.
-- 
-  !record {model: project.phase, id: project_phase_phase0}:
-    date_start: '2011-01-03 08:00:00'
-    duration: 0.0
-    name: Initial Phase
-    product_uom: product.uom_day
-    project_id: project_project_project0
-    state: draft
-- 
-  I create first task 'Developing module' and assign 10h.
-- 
-  !record {model: project.task, id: project_task_task0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Developing module
-    planned_hours: 10.0
-    project_id: project_project_project0
-    remaining_hours: 10.0
-    state: draft
-    total_hours: 10.0
-    phase_id: project_phase_phase0
-- 
-  I create first task 'Testing module' and assign 10h.
-- 
-  !record {model: project.task, id: project_task_task1}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Testing module
-    planned_hours: 10.0
-    project_id: project_project_project0
-    remaining_hours: 10.0
-    state: draft
-    total_hours: 10.0
-    phase_id: project_phase_phase0
--
-  Now I create a record to compute the phase of project.
--
-  !record {model: project.compute.phases, id: project_compute_phases0}:
-    target_project: 'one'
-    project_id: project_project_project0
--
-  I schedule the phases.
--
-  !python {model: project.compute.phases}: |
-    self.check_selection(cr, uid, [ref("project_compute_phases0")])
-
diff --git a/addons/project_long_term/test/test_schedule_tasks_case1.yml b/addons/project_long_term/test/test_schedule_tasks_case1.yml
deleted file mode 100644
index 3bb0ea87c43..00000000000
--- a/addons/project_long_term/test/test_schedule_tasks_case1.yml
+++ /dev/null
@@ -1,246 +0,0 @@
--
-  In order to test scheduling of tasks, I create four tasks with different sequences and schedule them.
-- 
-  I create first user.
-- 
-  !record {model: res.users, id: res_users_user0}:
-    company_id: base.main_company
-    context_lang: en_US
-    groups_id:
-      - base.group_partner_manager
-      - base.group_user
-    login: user1
-    name: User 1
-    password: user1
-- 
-  I create second user.
-- 
-  !record {model: res.users, id: res_users_user1}:
-    company_id: base.main_company
-    context_lang: en_US
-    groups_id:
-      - base.group_partner_manager
-      - base.group_user
-    login: user2
-    name: User 2
-    password: user2    
-- 
-  I create a Project.
-- 
-  !record {model: project.project, id: project_project_projecta0}:
-    balance: 0.0
-    credit: 0.0
-    currency_id: base.EUR
-    debit: 0.0
-    effective_hours: 0.0
-    name: Project A
-    members:
-      - res_users_user0
-      - res_users_user1
-    phase_ids:
-      - date_start: '2011-01-06 08:00:00'
-        duration: 2.0
-        name: Phase A
-        product_uom: product.uom_day
-        state: draft
-        task_ids:
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task D
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            state: draft
-            total_hours: 5.0
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task C
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            sequence: 11
-            state: draft
-            total_hours: 5.0
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task B
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            sequence: 13
-            state: draft
-            total_hours: 5.0
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task A
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            sequence: 14
-            state: draft
-            total_hours: 5.0
-    planned_hours: 20.0
-    progress_rate: 0.0
-    quantity: 0.0
-    quantity_max: 0.0
-    state: open
-    tasks:
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task D
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task C
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        sequence: 11
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task B
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        sequence: 13
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task A
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        sequence: 14
-        state: draft
-        total_hours: 5.0
-    total_hours: 15.0
-- 
-  I create first task with highest sequence.
-- 
-  !record {model: project.task, id: project_task_taska0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task A
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    sequence: 14
-    state: draft
-    total_hours: 5.0
-- 
-  I create second task.
-- 
-  !record {model: project.task, id: project_task_taskb0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task B
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    sequence: 13
-    state: draft
-    total_hours: 5.0
-- 
-  I create third task.
-- 
-  !record {model: project.task, id: project_task_taskc0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task C
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    sequence: 11
-    state: draft
-    total_hours: 5.0
--
-  I create fourth task with lowest sequence.
-- 
-  !record {model: project.task, id: project_task_taskd0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task D
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    state: draft
-    total_hours: 5.0
-- 
-  Now I create a resource for first user.
-- 
-  !record {model: resource.resource, id: resource_resource_user0}:
-    name: User 1
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: res_users_user0
-- 
-  I create a resource for second user.
-- 
-  !record {model: resource.resource, id: resource_resource_user1}:
-    name: User 2
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: res_users_user1
-- 
-  Now I create one phase for the project.
-- 
-  !record {model: project.phase, id: project_phase_phasea0}:
-    date_start: '2011-01-06 08:00:00'
-    duration: 2.0
-    name: Phase A
-    product_uom: product.uom_day
-    project_id: project_project_projecta0
-    state: draft
-    task_ids:
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task D
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task C
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        sequence: 11
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task B
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        sequence: 13
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task A
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        sequence: 14
-        state: draft
-        total_hours: 5.0
--
-  Now I create a record to schedule the tasks of project.
--
-  !record {model: project.compute.tasks, id: project_compute_tasks0}:
-    project_id: project_project_projecta0
--
-  I schedule the tasks.
--
-  !python {model: project.compute.tasks}: |
-    self.compute_date(cr, uid, [ref("project_compute_tasks0")])
--
-  I check that whether the tasks now allocated to respected resources or not.
--
-  !python {model: project.task}: |
-    task_ids = self.search(cr, uid, [('project_id','=',ref('project_project_projecta0'))])
-    for task in self.browse(cr, uid, task_ids):
-      if (not task.date_start) or (not task.date_end):
-        raise AssertionError("Tasks are not scheduled.")
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index 7f55c580fb8..233bb0e79a6 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name": "Tasks Mail Integration",
+    "name": "Tasks-Mail Integration",
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
diff --git a/addons/project_mailgate/i18n/hr.po b/addons/project_mailgate/i18n/hr.po
new file mode 100644
index 00000000000..cb4276b9d7f
--- /dev/null
+++ b/addons/project_mailgate/i18n/hr.po
@@ -0,0 +1,107 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 08:56+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Informacije o povjesti"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_mailgate
+#: model:ir.module.module,description:project_mailgate.module_meta_information
+msgid ""
+"This module is an interface that synchronises mails with OpenERP Project "
+"Task.\n"
+"\n"
+"It allows creating tasks as soon as a new mail arrives in our configured "
+"mail server.\n"
+"Moreover, it keeps track of all further communications and task states.\n"
+"    "
+msgstr ""
+"Ovaj modul je sučelje za sinhronizaciju poruka sa OpenERP projektnim "
+"zadacima.\n"
+"\n"
+"Omogućava kreiranje zadataka čim stigne novi e-mail na naš konfigurirani "
+"mail poslužitelj.\n"
+"Štoviše, čuva zapise o svim kasnijim komunikacijama i statusima zadataka.\n"
+"    "
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr "Privici"
+
+#. module: project_mailgate
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "MailGateWay projekta"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:123
+#, python-format
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Details"
+msgstr "Pojedinosti"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:149
+#, python-format
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:143
+#, python-format
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:129
+#, python-format
+msgid "Open"
+msgstr "Otvoreno"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:135
+#, python-format
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Povijest"
diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv
index cf9a08b958d..6c495169161 100644
--- a/addons/project_mailgate/security/ir.model.access.csv
+++ b/addons/project_mailgate/security/ir.model.access.csv
@@ -1,3 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mail_message_project_manager","project.mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,0
-"access_mail_message_project_user","project.mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mail_message_project_user,project.mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
diff --git a/addons/project_messages/i18n/hr.po b/addons/project_messages/i18n/hr.po
new file mode 100644
index 00000000000..d12926319b0
--- /dev/null
+++ b/addons/project_messages/i18n/hr.po
@@ -0,0 +1,144 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 08:50+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Za"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr "Komunikacijske poruke"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Danas"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"Sustav poruka unutar projekta omogućava efikasnu i slijedivu komunikaciju "
+"između članova projekta. Poruke se čuvaju u sustavu i mogu se koristiti za "
+"kasniju analizu."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+"\n"
+"    Modul omogućava funkcionalnost slanja poruka unutar projekta.\n"
+"    Korisnik može slati pojedinačne poruke drugom korisniku. Može čak i "
+"obavjestiti\n"
+"    sve korisnike.\n"
+"    "
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Poruka za"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Poruka od"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Poruke projekta"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Interni sustav poruka projekta"
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index 5756a7456bb..1792f1ea840 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,4 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
-"access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
-"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_messages,project.messages,model_project_messages,project.group_project_user,1,1,1,1
+access_project_message_project_user,project.project.user,model_project_project,project.group_project_user,1,0,0,0
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index a5bf98634cf..4b4f2016620 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 09:34+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 00:12+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_mrp
@@ -25,7 +25,7 @@ msgstr "Za svaki proizvod, pri vrsti usluge i pri narudžbi"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr ""
+msgstr "Procurement Task"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
@@ -45,28 +45,28 @@ msgstr "Ako je tip proizvoda 'usluga' tada kreira zadatak"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: project_mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_procurement_order
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr "Nabava"
+msgstr "Procurement"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -74,7 +74,7 @@ msgstr "Nabava"
 #: model:process.node,name:project_mrp.process_node_procuretasktask0
 #: field:procurement.order,task_id:0
 msgid "Task"
-msgstr "Zadatak"
+msgstr "Task"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -84,12 +84,12 @@ msgstr "Stvara se zadatak kako bi se pružila usluga"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
 msgid "Order Task"
-msgstr "Zadatak narudžbe"
+msgstr "Zadatak naloga"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr "Zadatak Prodajne Narudžbe"
+msgstr "Zadatak prodajnog naloga"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -125,12 +125,12 @@ msgstr ""
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procurement method is Make to order and supply method is produce"
-msgstr ""
+msgstr "If procurement method is Make to order and supply method is produce"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr "U slučaju da prodajete usluge prema narudžbi prodaje"
+msgstr "U slučaju kada prodajete usluge na prodajnim nalozima"
 
 #~ msgid "Procure Task"
 #~ msgstr "Zadatak nabave"
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/project_mrp/security/ir.model.access.csv
index 7c6e2a7a30c..8bc4d4ba1b5 100644
--- a/addons/project_mrp/security/ir.model.access.csv
+++ b/addons/project_mrp/security/ir.model.access.csv
@@ -1,3 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_procurement_project_user","procurement.order project_user","model_procurement_order","project.group_project_user",1,1,1,1
-"access_procurement_project_manager","procurement.order project_manager","model_procurement_order","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_procurement_project_user,procurement.order project_user,model_procurement_order,project.group_project_user,1,1,1,1
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 23d900d86ff..5540b6eb773 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -21,10 +21,10 @@
 
 
 {
-    'name': 'Planning Management Module',
+    'name': 'Resources Planing',
     'version': '1.0',
     "category": "Project Management",
-    'complexity': "easy",
+    'complexity': "expert",
     'description': """Keep track of your planning
 This module helps you to manage your plannings.
 ===============================================
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index ca01b101337..adeb2db41c2 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-12 09:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -31,39 +31,41 @@ msgid ""
 "This value is given by the sum of work remaining to do on the task for this "
 "planning, expressed in days."
 msgstr ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:project_planning.menu_board_planning
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr "Statistike Planiranja"
+msgstr "Statistike planiranja"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning.line:0
 msgid "Planning Line"
-msgstr "Linija Planiranja"
+msgstr "Linija planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "Ukupno slobodno vrijeme"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr "Ime Planiranja"
+msgstr "Naziv planiranja"
 
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr ""
+msgstr "My Project's planning"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0
@@ -71,12 +73,12 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.user,timesheet:0
 msgid "Timesheet"
-msgstr "Raspored"
+msgstr "Evidencija rada"
 
 #. module: project_planning
 #: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Planning Management Module"
-msgstr ""
+msgstr "Planning Management Module"
 
 #. module: project_planning
 #: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
@@ -85,93 +87,97 @@ msgid ""
 "material), OpenERP allows you to encode and then automatically compute tasks "
 "and phases scheduling, track resource allocation and availability."
 msgstr ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Total planned tasks"
-msgstr ""
+msgstr "Ukupno planiranih zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: project_planning
 #: field:account.analytic.account,planning_ids:0
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
 msgid "Plannings"
-msgstr ""
+msgstr "Plannings"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Start Task"
-msgstr ""
+msgstr "Započni zadatak"
 
 #. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Total Planned (in Days)"
-msgstr ""
+msgstr "Total Planned (in Days)"
 
 #. module: project_planning
 #: constraint:report_account_analytic.planning:0
 msgid ""
 "Invalid planning ! Planning dates can't overlap for the same responsible. "
 msgstr ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_account:0
 msgid "Planning By Account"
-msgstr ""
+msgstr "Planiranje računa"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
-msgstr ""
+msgstr "Current Plannings"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Analitički konto"
+msgstr "Konto analitike"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Vrati u nacrt"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "To :"
-msgstr ""
+msgstr "Do :"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,timesheet:0
@@ -180,34 +186,36 @@ msgid ""
 "This value is given by the sum of all work encoded in the timesheet(s) "
 "between the 'Date From' and 'Date To' of the planning."
 msgstr ""
+"Ova vrijednost daje zbroj svih radova, kodirano u timesheet/u, raspon  'Od "
+"datuma' i 'Do datuma' rasporeda/planiranja."
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! You can not create recursive analytic accounts."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_open:0
 #: field:report_account_analytic.planning.user,plan_open:0
 msgid "Time Allocation without Tasks"
-msgstr ""
+msgstr "Time Allocation without Tasks"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 msgid "Planning Lines"
-msgstr ""
+msgstr "Linije Planiranja"
 
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr "Analitički Konto"
+msgstr "Analitički konto"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_open:0
@@ -215,27 +223,29 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to FALSE, expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Razno"
 
 #. module: project_planning
 #: help:res.company,planning_time_mode_id:0
 msgid "This will set the unit of measure used in plannings."
-msgstr ""
+msgstr "This will set the unit of measure used in plannings."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr "Planiranje Ljudskih resursa"
+msgstr "Planiranje ljudskih resursa"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,tasks:0
 #: field:report_account_analytic.planning.user,tasks:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_planning
 #: view:account.analytic.account:0
@@ -259,12 +269,12 @@ msgstr "Ukupno planirano"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "Time Encoding"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "Unallocated Time"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
@@ -272,11 +282,13 @@ msgid ""
 "This value is given by the sum of time allocation without task(s) linked, "
 "expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegiraj"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
@@ -284,6 +296,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -291,6 +305,8 @@ msgid ""
 "Set here the number of working days within this planning for one person full "
 "time"
 msgstr ""
+"Set here the number of working days within this planning for one person full "
+"time"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -300,39 +316,39 @@ msgstr "["
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "From :"
-msgstr ""
+msgstr "From :"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
 msgid "Planning By User"
-msgstr ""
+msgstr "Planning By User"
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.act_task_of_lines
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr "Zadaci"
+msgstr "Tasks"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By Account (in Days)"
-msgstr ""
+msgstr "Planning By Account (in Days)"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "Vrijeme bez zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr "Datum početka"
+msgstr "Početni datum"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Uk. slobodno"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -340,16 +356,18 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to TRUE expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
 
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr "Analiza Planiranja"
+msgstr "Analiza planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr "Količina JM"
+msgstr "Kol. u JM"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
@@ -360,7 +378,7 @@ msgstr "Bilješka"
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
@@ -371,12 +389,12 @@ msgstr "Planiranje po Kontu"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned Days"
-msgstr ""
+msgstr "Planirani dani"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,state:0
@@ -389,6 +407,8 @@ msgid ""
 "This value is given by the total of validated leaves into the 'Date From' "
 "and 'Date To' of the planning."
 msgstr ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -401,7 +421,7 @@ msgstr "Korisnik"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Remaining Tasks"
-msgstr ""
+msgstr "Total Remaining Tasks"
 
 #. module: project_planning
 #: model:ir.module.module,description:project_planning.module_meta_information
@@ -426,17 +446,17 @@ msgstr ""
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Količina u osnovnoj JM"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "Vrijeme za planirane zadatke"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -446,61 +466,61 @@ msgstr "Količina"
 #. module: project_planning
 #: field:report_account_analytic.planning,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr "Linija Planiranja"
+msgstr "Linija planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By User (in Days)"
-msgstr ""
+msgstr "Planning By User (in Days)"
 
 #. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr "Statistike Planiranja"
+msgstr "Statistike planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr "Otvori"
+msgstr "Otvoreno"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
 #: view:report_account_analytic.planning:0
 msgid "Planning by User"
-msgstr ""
+msgstr "Planning by User"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,business_days:0
 msgid "Business Days"
-msgstr ""
+msgstr "Radni dani"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Ponovno Aktiviraj"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
@@ -510,52 +530,52 @@ msgstr "Odgovoran"
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr "Stat Planiranja"
+msgstr "Stat planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_tasks:0
 msgid "Time Allocation of Tasks"
-msgstr ""
+msgstr "Time Allocation of Tasks"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr "Sižetak prema Korisniku"
+msgstr "Sažetak prema Korisniku"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "Total Time Allocation without Tasks"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
 msgid "Leaves"
-msgstr ""
+msgstr "Dopusti"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation of Tasks"
-msgstr ""
+msgstr "Ukupno vrijeme alociranih zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr "Datum završetka"
+msgstr "Završni Datum"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Remaining tasks"
-msgstr ""
+msgstr "Remaining tasks"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr "Sižetak po Projektu"
+msgstr "Sažetak po Projektu"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Responsible :"
-msgstr ""
+msgstr "Responsible :"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -565,17 +585,17 @@ msgstr "]"
 #. module: project_planning
 #: field:res.company,planning_time_mode_id:0
 msgid "Planning Time Unit"
-msgstr ""
+msgstr "Vremenska jedinica planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,task_ids:0
 msgid "Planning Tasks"
-msgstr ""
+msgstr "Planiranje zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr "Upravitelj"
+msgstr "Voditelj"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_tasks:0
@@ -583,3 +603,5 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
+"Vrijednost dobivena zbrojem alociranih vremenskih zadataka iskazanih u "
+"danima."
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index d5cb64be83d..0c3a57cf173 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_analytic_planning_project_manager","report_account_analytic.planning manager","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_line_project_manager","report_account_analytic.planning.line manager","model_report_account_analytic_planning_line","project.group_project_manager",1,0,0,0
-"access_report_account_analytic_planning_stat_project_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,0,0,0
-"access_report_account_analytic_planning_stat_project_user","report_account_analytic.planning.stat user","model_report_account_analytic_planning_stat","project.group_project_user",1,1,1,0
-"access_account_analytic_account_project_manager","account.analytic.account project manager","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning__project_user","report_account_analytic.planning user","model_report_account_analytic_planning_user","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_account_analytic_planning_project_manager,report_account_analytic.planning manager,model_report_account_analytic_planning,project.group_project_manager,1,1,1,1
+access_report_account_analytic_planning_line_project_manager,report_account_analytic.planning.line manager,model_report_account_analytic_planning_line,project.group_project_manager,1,0,0,0
+access_report_account_analytic_planning_stat_project_manager,report_account_analytic.planning.stat manager,model_report_account_analytic_planning_stat,project.group_project_manager,1,0,0,0
+access_report_account_analytic_planning_stat_project_user,report_account_analytic.planning.stat user,model_report_account_analytic_planning_stat,project.group_project_user,1,1,1,0
+access_account_analytic_account_project_manager,account.analytic.account project manager,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
+access_report_account_analytic_planning__project_user,report_account_analytic.planning user,model_report_account_analytic_planning_user,project.group_project_user,1,1,1,0
+access_report_account_analytic_planning_account_project_manager,report_account_analytic.planning.account,model_report_account_analytic_planning_account,project.group_project_manager,1,1,1,1
+access_report_account_analytic_planning_line_project_user,report_account_analytic.planning.line user,model_report_account_analytic_planning_line,project.group_project_user,1,1,1,0
+access_report_account_analytic_planning_account_project_user,report_account_analytic.planning.account user,model_report_account_analytic_planning_account,project.group_project_user,1,1,1,0
+access_report_account_analytic_planning__project_manager,report_account_analytic.planning.manager,model_report_account_analytic_planning_user,project.group_project_manager,1,1,1,1
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 5ca01a3a0e1..90a4ef2eafa 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -23,6 +23,7 @@
     'name': 'Project Retro-planning',
     'version': '0.1',
     'category': 'Project Management',
+    'complexity': "expert",
     'description': """
 Changes dates according to change in project End Date.
 ======================================================
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 872dde535d7..a1eb983f064 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-02 14:48+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:13+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
@@ -35,13 +35,17 @@ msgid ""
 "          then the deadline date and start date for all the tasks will "
 "change accordingly  "
 msgstr ""
+"\n"
+"        - Ako se promjenio datum završetka projekta\n"
+"          tada će se promjeniti i kranji rok i datum početka za sve zadatke  "
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index d4aa99196b0..52804e2a4ba 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Methodology: SCRUM',
     'version': '1.0',
     'category': 'Project Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 This module implements all concepts defined by the scrum project management methodology for IT companies.
 =========================================================================================================
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index 9a987317ebb..4b8f473050c 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-12-08 17:01+0000\n"
+"PO-Revision-Date: 2011-12-09 14:20+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <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: 2011-12-09 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
 "X-Generator: Launchpad (build 14450)\n"
 
 #. module: project_scrum
@@ -34,7 +34,7 @@ msgstr "Naziv skupa"
 #. module: project_scrum
 #: model:process.transition,note:project_scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "Kreiraj zadatak iz backloga"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -68,12 +68,35 @@ msgid ""
 "    * http://controlchaos.com\n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul implemetira sve koncepte definirane u SRUM metodologiji\n"
+"    za upravljanje projektima u IT kompanijama:\n"
+"    * Projekti sa susretima (sprintovima), vlasnik produkta, scrum master\n"
+"    * Sprintovi sa pregledima, dnevnim sastancima, povratnim informacijama\n"
+"    * Backlog produkta\n"
+"    * Backlog sprinta\n"
+"\n"
+"    Dodaje neke koncepte modulu Upravljanja projektima:  \n"
+"    * Srednjoročni i dugoročni putokaz\n"
+"    * Korisnički/Funkcionalni zahtjevi naspram tehničkih\n"
+"\n"
+"    Također kreira i novi sustav izvještavanja:\n"
+"    * Burn-down chart - grafikon preostalog posla\n"
+"\n"
+"    Scrum projekti i zadaci nasljeđuju iz pravih projekata i zadataka,\n"
+"    tako da je moguće nastaviti raditi na normalnim zadacima koji ukljućuju "
+"\n"
+"    i zadatke iz Scrum projekata.\n"
+"   \n"
+"    Više informacija o metodologiji:\n"
+"    * http://controlchaos.com\n"
+"    "
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What did you do since the last meeting?"
-msgstr ""
+msgstr "Što ste radili od zadnjeg sastanka?"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
@@ -83,46 +106,51 @@ msgid ""
 "which the team implements a list of product backlogs. The sprint review is "
 "organized when the team presents its work to the customer and product owner."
 msgstr ""
+"Scrum agilna metodologija se koristi u projektima razvoja softvera. U ovoj "
+"metodologiji sprint je kratki period vremena (npr. 1 mjesec) u kojem tim "
+"implementira listu backlogova (preostalih poslova) produkta. Pregled sprinta "
+"se organizira kad tim prezetira svoj rad klijentu i vlasniku produkta."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "Kreiraj zadatak iz preostalih zadataka"
 
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Scrum, agilna metoda razvoja"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Napredak"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,user_id:0
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum Master"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:83
 #, python-format
 msgid "The sprint '%s' has been opened."
-msgstr ""
+msgstr "Sprint '%s' je otvoren."
 
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -133,50 +161,50 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Retrospective"
-msgstr ""
+msgstr "Pogled unazad"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Send Email"
-msgstr ""
+msgstr "Pošalji e-mail"
 
 #. module: project_scrum
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
 msgid "View project's backlog"
-msgstr ""
+msgstr "Pogledaj preostale zadatke projekta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi kao nacrt"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
 msgid "Merge Product Backlogs"
-msgstr ""
+msgstr "Spoji preostale zadatke produkta"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
 #: view:project.scrum.backlog.merge:0
 msgid "Merge Backlogs"
-msgstr ""
+msgstr "Spoji preostale zadatke"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:53
 #, python-format
 msgid "Scrum Meeting : %s"
-msgstr ""
+msgstr "Scrum sastanak: %s"
 
 #. module: project_scrum
 #: view:project.task:0
 msgid "Backlog"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_email
@@ -186,27 +214,27 @@ msgstr ""
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr ""
+msgstr "Ime sprinta"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Zadatak"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
-msgstr ""
+msgstr "Utrošeni sati"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_meeting_form
@@ -215,30 +243,37 @@ msgid ""
 "this methodology, a daily meeting is organized by the scrum master with his "
 "team in order to detect the difficulties the team faced/will face."
 msgstr ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face.\r\n"
+"Scrum agilna metodologija se koristi u projektima razvoja softvera. U ovoj "
+"metodologiji, Scrum master organizira dnevne sastanke sa svojim timom kako "
+"bi otkrio poteškoće s kojima se tim susreo ili će se susresti."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
+"Molim upišite e-mail adresu vlasnika produkta definiranog  na sprintu."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:327
 #, python-format
 msgid "Scrum Meeting of %s"
-msgstr ""
+msgstr "Srum sastanak %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
 #, python-format
 msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
+msgstr "Preostali zadatak produkta '%s' je pretvoren u zadatak %d."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
 #, python-format
 msgid "Product Backlog '%s' is assigned sprint:%s"
-msgstr ""
+msgstr "Preostali zadatak produkta '%s' je dodjeljen sprintu: %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
@@ -248,7 +283,7 @@ msgstr ""
 #: field:project.task,product_backlog_id:0
 #, python-format
 msgid "Product Backlog"
-msgstr ""
+msgstr "Preostali zadaci produkta"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_project
@@ -259,12 +294,12 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Start Task"
-msgstr ""
+msgstr "Započni zadatak"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:90
@@ -272,7 +307,7 @@ msgstr ""
 #: code:addons/project_scrum/wizard/project_scrum_email.py:96
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Ništa"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -282,44 +317,44 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "Sprint info"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Links"
-msgstr ""
+msgstr "Poveznice"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Izračunato kao zbroj izvršenog rada na zadatku"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:91
 #, python-format
 msgid "Task for Today"
-msgstr ""
+msgstr "Zadaci za danas"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Open Backlog"
-msgstr ""
+msgstr "Otvori popis preostalih zadatka"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Spent Hours"
-msgstr ""
+msgstr "Ukupno utrošeno sati"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:94
@@ -330,14 +365,14 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Planning"
-msgstr ""
+msgstr "Planiranje"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.email:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Otkaži"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,scrum_master_id:0
@@ -349,12 +384,12 @@ msgstr ""
 #: field:project.scrum.product.backlog,expected_hours:0
 #: field:project.scrum.sprint,expected_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planirani sati"
 
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Predmet"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -364,28 +399,28 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Sprints"
-msgstr ""
+msgstr "Sprintevi"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:314
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
-msgstr ""
+msgstr "Obavjest e-mailom nije mogla biti poslana vlasniku produkta %s"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Pretvori u zadatak"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Are you sure you want to merge these Backlogs?"
-msgstr ""
+msgstr "Jeste li sigurni da želite spojiti ove preostale zadatke"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.create.task,user_id:0
 msgid "Responsible user who can work on task"
-msgstr ""
+msgstr "Odgovorni korisnik koji može raditi na zadataku"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -393,17 +428,17 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr ""
+msgstr "Pogledaj zadatke sprinta"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,meeting_ids:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "Dnevni Scrum"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
@@ -415,7 +450,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
 #: view:project.scrum.product.backlog:0
 msgid "Product Backlogs"
-msgstr ""
+msgstr "Preostali zadaci produkta"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
@@ -424,78 +459,78 @@ msgstr ""
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Are there anything blocking you?"
-msgstr ""
+msgstr "Da li vas nešto blokira?"
 
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
 msgid "Scrum"
-msgstr ""
+msgstr "Scrum"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "Današnji zadaci"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:88
 #: field:project.scrum.meeting,question_yesterday:0
 #, python-format
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "Zadaci od jučer"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
 msgid "Assign sprint to backlogs"
-msgstr ""
+msgstr "Dodjeli sprintove preostali zadacima"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,expected_hours:0
 msgid "Estimated time to do the task."
-msgstr ""
+msgstr "Procjenjeno potrebno vrijeme za dovršetak zadatka."
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,task_hours:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Sati zadatka"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Scrum Master"
-msgstr ""
+msgstr "Pošalji Scrum masteru"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Poništeno"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
-msgstr ""
+msgstr "Pogledaj zadatke projekta"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:56
@@ -504,43 +539,45 @@ msgid ""
 "Hello  , \n"
 "I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
 msgstr ""
+"Pozdrav,\n"
+"Šaljem vam Scrum sastanak. %s sprinta '%s' projekta '%s'"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
-msgstr ""
+msgstr "Dnevno"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
-msgstr ""
+msgstr "Preostali zadaci sprinta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegiraj"
 
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Postpone Backlog"
-msgstr ""
+msgstr "Odgodi preostale zadatke"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
 #: view:project.task:0
 msgid "Task Progress"
-msgstr ""
+msgstr "Napredak zadatka"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Datum sastanka"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
@@ -549,112 +586,116 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Tasks"
-msgstr ""
+msgstr "Zadaci"
 
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
 msgid "Product Owner Email"
-msgstr ""
+msgstr "E-mail vlasnika produkta"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "_Send"
-msgstr ""
+msgstr "_Pošalji"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,sprint_id:0
 msgid "Select Sprint to assign backlog."
-msgstr ""
+msgstr "Odaberite sprint za dodjelu preostalih zadataka"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,progress:0
 #: help:project.scrum.sprint,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Izračunato kao: Utrošeno vrijeme/Ukupno vrijeme"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
-msgstr ""
+msgstr "Pronađene blokade"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Change the state of product backlogs to open if its in draft state"
 msgstr ""
+"Promjeni status preostalih zahtjeva produkta radi otvaranja ako je u statusu "
+"nacrta."
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 #: field:project.scrum.email,message:0
 msgid "Message"
-msgstr ""
+msgstr "Obavijest"
 
 #. module: project_scrum
 #: field:project.scrum.email,scrum_master_email:0
 msgid "Scrum Master Email"
-msgstr ""
+msgstr "E-mail Scrum mastera"
 
 #. module: project_scrum
 #: help:project.project,product_owner_id:0
 #: help:project.scrum.sprint,product_owner_id:0
 msgid "The person who is responsible for the product"
-msgstr ""
+msgstr "Osoba koja je odgovorna za produkt"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Sprint"
-msgstr ""
+msgstr "Scrum sprint"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Product owner"
-msgstr ""
+msgstr "Vlasnik produkta"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "Provjera"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "Sprint pogled unazad"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
 "Related product backlog that contains this task. Used in SCRUM methodology"
 msgstr ""
+"Povezani preostali zadaci produkta koji sadrže zadatak. Korišteni u SCRUM "
+"metodologiji."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What do you plan to do till the next meeting?"
-msgstr ""
+msgstr "Što planirate raditi do sljedećeg sastanka?"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
 #: view:postpone.wizard:0
 #: view:project.scrum.product.backlog:0
 msgid "Postpone"
-msgstr ""
+msgstr "Odgodi"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -662,87 +703,88 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Optional Info"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
 msgid "Create Tasks from Product Backlogs"
-msgstr ""
+msgstr "Kreiraj zadatke iz preostalih zadataka produkta"
 
 #. module: project_scrum
 #: help:project.project,sprint_size:0
 msgid "Number of days allocated for sprint"
-msgstr ""
+msgstr "Broj dana dodjeljnih sprintu"
 
 #. module: project_scrum
 #: field:project.project,product_owner_id:0
 #: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "Vlasnik produkta"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,sequence:0
 msgid "Gives the sequence order when displaying a list of product backlog."
 msgstr ""
+"Daje poredak sekvence prilikom prikaza liste preostalih zadataka produkta."
 
 #. module: project_scrum
 #: model:process.node,name:project_scrum.process_node_productbacklog0
 #: view:project.scrum.product.backlog:0
 msgid "Product backlog"
-msgstr ""
+msgstr "Preostali zadaci produkta"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
 msgid "Backlogs"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:326
 #, python-format
 msgid "Thank you"
-msgstr ""
+msgstr "Hvala"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Create Task for Product Backlog"
-msgstr ""
+msgstr "Kreiraj zadatke za preostale zadatke produkta"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_meeting_form
 #: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
 msgid "Scrum Meetings"
-msgstr ""
+msgstr "Scrum sastanci"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,expected_hours:0
 msgid "Estimated total time to do the Backlog"
-msgstr ""
+msgstr "Procjenjeno ukupno vrijeme za izvršenje preostalih zadataka"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
-msgstr ""
+msgstr "Odaberi projekt za novu listu preostalih zadataka produkta"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Merge"
-msgstr ""
+msgstr "Spoji"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "Pogledaj preostale zadatke sprinta"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_backlog:0
@@ -754,7 +796,7 @@ msgstr ""
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.product.backlog:0
 msgid "Convert to Task"
-msgstr ""
+msgstr "Pretvori u zadatak"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,project_id:0
@@ -762,49 +804,51 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Ako imate (?) u imenu projekta, znači da nema analitičkog konta vezanog uz "
+"projekt."
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Product Owner"
-msgstr ""
+msgstr "Pošalji vlasniku produkta"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
 #: view:project.scrum.product.backlog:0
 msgid "Backlog Progress"
-msgstr ""
+msgstr "Napredak preostalih zadataka"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
-msgstr ""
+msgstr "E-mail obavjest nije mogla biti poslana Scrum masteru %s"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 #: view:project.scrum.product.backlog:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -812,33 +856,33 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "_"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "Efektivni sati"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Preostali sati"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "Značajka"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -846,17 +890,17 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: view:project.task:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "My Backlogs"
-msgstr ""
+msgstr "Moji presotali zadaci"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "Send Email for Scrum Meeting Details"
-msgstr ""
+msgstr "Pošalji e-mail za detalje Scrum sastanka"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
@@ -866,17 +910,22 @@ msgid ""
 "can be planified in a development sprint and may be split into several "
 "tasks. The product backlog is managed by the product owner of the project."
 msgstr ""
+"Scrum agilna metodologija se koristi u procesu razvoja softvera. Preostali "
+"zadaci produkta je lista značajki za implementaciju. Preostali zadaci "
+"produkta planiraju se u razvojnom sprintu (skupu) i mogu biti razdvojeni na "
+"više zadataka. Listom preostalih zadaka produkta upravlja vlasnik produkta "
+"na projektu."
 
 #. module: project_scrum
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "Zadatak liste preostalih zadataka"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "Planirani sati"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
@@ -885,38 +934,38 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "Scrum sastanak"
 
 #. module: project_scrum
 #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
 #: view:project.scrum.sprint:0
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndown chart - prikaz preostalog posla"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "Dnevni sastanci"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Expected hours"
-msgstr ""
+msgstr "Očekivani sati"
 
 #. module: project_scrum
 #: field:project.project,sprint_size:0
 msgid "Sprint Days"
-msgstr ""
+msgstr "Dani sprinta"
 
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
 msgid "Email Id of Product Owner"
-msgstr ""
+msgstr "ID e-maila vlasnika produkta"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "Napredak (0-100)"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:324
@@ -926,6 +975,9 @@ msgid ""
 " \n"
 "I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
 msgstr ""
+"Pozdrav %s,\n"
+"\n"
+"šaljem vam detalje dnevnog sastanka datuma %s, za sprint %s\n"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:325
@@ -940,6 +992,14 @@ msgid ""
 "*Blocks encountered:\n"
 "_______________________ %s"
 msgstr ""
+"\n"
+"*Zadaci od jučer:\n"
+"_______________________%s\n"
+"*Zadaci za danas:\n"
+"_______________________ %s\n"
+"\n"
+"*Pronađene blokade:\n"
+"_______________________ %s"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,active:0
@@ -947,31 +1007,33 @@ msgid ""
 "If Active field is set to true, it will allow you to hide the product "
 "backlog without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na DA, omogućit će vam skrivanje liste "
+"preostalih zadataka produkta bez uklanjanja."
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,task_hours:0
 msgid "Estimated time of the total hours of the tasks"
-msgstr ""
+msgstr "Procjenjeno  vrijeme ukupnih sati zadataka"
 
 #. module: project_scrum
 #: view:project.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "Scrum podaci"
 
 #. module: project_scrum
 #: field:project.project,scrum:0
 msgid "Is a Scrum Project"
-msgstr ""
+msgstr "je Scrum projekt"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalji zadatka"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
@@ -981,7 +1043,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Planned Hours"
-msgstr ""
+msgstr "Ukupno planirani sati"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
@@ -989,83 +1051,87 @@ msgid ""
 "This wizard merge backlogs and create one new backlog with draft state (Old "
 "backlogs Will be deleted). And it also merge old tasks from backlogs"
 msgstr ""
+"Ovaj asistent spaja liste preostalih zadataka i kreira jednu novu listu u "
+"statusu Nacrt (stare liste preostalih zadataka će biti izbrisane). Također "
+"spaja stare zadatke iz liste preostalih zadataka."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:303
 #, python-format
 msgid "Please provide email address for scrum master defined on sprint."
-msgstr ""
+msgstr "Molim upišite e-mail adresu scrum mastera definiranog na sprintu."
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Select the project for merged backlogs"
-msgstr ""
+msgstr "Odaberite projekt za spojene liste preostalih zadataka"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
 msgid "My Sprint"
-msgstr ""
+msgstr "Moj sprint"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,effective_hours:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Utrošeni sati"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,effective_hours:0
 msgid "Computed using the sum of the time spent on every related tasks"
 msgstr ""
+"Izračunato korištenjem sume utrošenog vremena svakog povezanog zadatka"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
 msgid "Scrum Dashboard"
-msgstr ""
+msgstr "Scrum nadzorna ploča"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_sprint
 msgid "Project Scrum Sprint"
-msgstr ""
+msgstr "Scrum sprint projekta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Feature Description"
-msgstr ""
+msgstr "Opis značajki"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Please select any Project."
-msgstr ""
+msgstr "Molim odaberite neki projekt"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:97
 #, python-format
 msgid "Thank you,"
-msgstr ""
+msgstr "Hvala"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:90
 #, python-format
 msgid "The sprint '%s' has been closed."
-msgstr ""
+msgstr "Sprint %s je zatvoren"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
 #: view:project.scrum.backlog.assign.sprint:0
 msgid "Assign Sprint"
-msgstr ""
+msgstr "Dodjeli sprint"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.create.task,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Dodjeljen"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Are you sure to postpone Backlog ?"
-msgstr ""
+msgstr "Jeste li sigurni da želite odgoditi listu preostalih zadataka"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,sprint_id:0
@@ -1076,15 +1142,15 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,sprint_id:0
 msgid "Sprint"
-msgstr ""
+msgstr "Sprint"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #, python-format
 msgid "Please select at least two product Backlogs"
-msgstr ""
+msgstr "Molim odaberite bar dvije liste preostalih zadataka produkta"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+msgstr "Pregled sprinta"
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 88e8c506e14..910c3a57296 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -1,9 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,1,1,0
-"access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,0
-"access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,1,1,0
-"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,1,1,1
-"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,1,1,1
-"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
-"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
-"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_scrum_sprint,project_scrum.sprint,model_project_scrum_sprint,project.group_project_user,1,1,1,0
+access_scrum_product_backlog,project_scrum.product.backlog,model_project_scrum_product_backlog,project.group_project_user,1,1,1,0
+access_scrum_meeting,project_scrum.meeting,model_project_scrum_meeting,project.group_project_user,1,1,1,0
+access_scrum_meeting_manager,project_scrum.meeting.manager,model_project_scrum_meeting,project.group_project_manager,1,1,1,1
+access_scrum_sprint_manager,project_scrum.sprint.manager,model_project_scrum_sprint,project.group_project_manager,1,1,1,1
+access_scrum_product_backlog_manager,project_scrum.product.backlog manager,model_project_scrum_product_backlog,project.group_project_manager,1,1,1,1
+access_product_uom_project_manager,product.uom project manager,product.model_product_uom,project.group_project_manager,1,1,1,1
+access_product_uom_project_user,product.uom project user,product.model_product_uom,project.group_project_user,1,0,0,0
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index 55b351af97b..ed2d228c401 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-12-22 12:22+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 11:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
@@ -34,12 +34,12 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Zadatak ev. rada"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Prijava / Odjava po Projektu"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -49,17 +49,17 @@ msgstr "ID povezanog vremenskog tijeka"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Project Task Work"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: project_timesheet
 #: constraint:res.partner:0
@@ -69,28 +69,28 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Analitički konto/projekt"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Sati zadatka"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Error! project start-date must be lower then project end-date."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:220
@@ -111,32 +111,32 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Račun zadatka"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Rad zadatka"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:220
@@ -147,43 +147,43 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Fakturiraj radove"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Pogreška! Ne možete dodijeliti eskalacije na isti projekt!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Dovršite evidenciju rada."
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -193,7 +193,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -210,47 +210,47 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Fakturiranje zadataka"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Sati evidencije rada"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Task encoding"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Task summary is comes into the timesheet line"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Fakturiraj"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Zadaci po korisniku"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:48
@@ -263,22 +263,22 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Podaci računa"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Encode how much time u spent on your task"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -288,7 +288,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Ev. rada/sati zadatka po mjesecima"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:43
@@ -302,43 +302,43 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Work on task"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mjesec-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Nakon izvršenja zadatka kreiraj račun."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Automatsko kreiranje računa iz stavki prodajnog naloga"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -348,7 +348,7 @@ msgstr "Vremenski plan projekta"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Fakturiraj rad na zadatku"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -364,12 +364,12 @@ msgstr ""
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Sati zadatka po mjesecima"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Popuni ev. rada"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -377,3 +377,6 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+
+#~ msgid "My Timesheet"
+#~ msgstr "Moje evidencija rada"
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 4888811df2f..85ccf63e19f 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_timesheet_task_user_manager","report.timesheet.task.user.manager","model_report_timesheet_task_user","project.group_project_manager",1,1,1,1
-"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_timesheet_task_user_manager,report.timesheet.task.user.manager,model_report_timesheet_task_user,project.group_project_manager,1,1,1,1
+access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_user,1,1,1,0
+access_hr_timesheet_sheet_sheet_user,hr.timesheet.sheet.sheet.user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 04a9b47abe3..0bb34e3713b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -13,7 +13,8 @@
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="context">{'quotation_only': True}</field>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
             <field name="name">Purchase Order Waiting Approval</field>
@@ -24,7 +25,7 @@
             <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
         </record>
 
-		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
+        <record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
             <field name="name">purchase.order.monthly.categ.tree</field>
             <field name="model">purchase.report</field>
             <field name="type">tree</field>
@@ -47,7 +48,7 @@
                 </tree>
             </field>
         </record>
-    	<record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
+        <record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
             <field name="name">purchase.order.monthly.categ.graph</field>
             <field name="model">purchase.report</field>
             <field name="type">graph</field>
@@ -59,92 +60,41 @@
                 </graph>
             </field>
         </record>
-	    <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
-	        <field name="name">Monthly Purchase by Category</field>
-	        <field name="res_model">purchase.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-		<field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
-	        <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
-	    </record>
-	    <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
+        <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
+            <field name="name">Monthly Purchase by Category</field>
+            <field name="res_model">purchase.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
+            <field name="domain">[('state','in',('approved','except_picking','except_invoice','done'))]</field>
+            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
+        </record>
+        <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
             <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-	    </record>
-	    <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
-	            <field eval="1" name="sequence"/>
-	            <field name="view_mode">graph</field>
-	            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
-	            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-	    </record>
-
-        <record model="ir.ui.view" id="view_negotiation_by_supplier_tree">
-            <field name="name">negotiation.by.supplier.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Negotiation by Supplier">
-                    <field name="partner_id"/>
-                    <field name="negociation"/>
-                </tree>
-            </field>
         </record>
-        <record model="ir.ui.view" id="view_negotiation_by_supplier_graph">
-            <field name="name">negotiation.by.supplier.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Negotiation by Supplier" type="bar">
-                    <field name="partner_id"/>
-                    <field name="negociation"/>
-                </graph>
-            </field>
+        <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
+                <field eval="1" name="sequence"/>
+                <field name="view_mode">graph</field>
+                <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
+                <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
         </record>
-		<record id="action_negotiation_by_supplier" model="ir.actions.act_window">
-	        <field name="name">Negotiation by Supplier</field>
-	        <field name="res_model">purchase.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-		<field name="context">{'group_by':['partner_id'],'group_by_no_leaf':1}</field>
-	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
-	    </record>
-	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_negotiation_by_supplier_tree"/>
-            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
-	    </record>
-	    <record id="open_view_negotiation_by_supplier_graph" model="ir.actions.act_window.view">
-	            <field eval="1" name="sequence"/>
-	            <field name="view_mode">graph</field>
-	            <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
-	            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
-	    </record>
+
 
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Purchase Dashboard">
+                    <board style="2-1">
                         <column>
-                        <!--
-                            <action name="%(purchase.action_current_purchases)d" string="Current purchases"/>
-                            <action name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"/>
-                        -->
-                        	<action name="%(purchase_draft)d" string="Request for Quotations"/>
+                            <action name="%(purchase_draft)d" string="Request for Quotations"/>
                         </column>
                         <column>
-                        	<action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"/>
-                        <!--
-                            <action name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"/>
-                            <action name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"/>
-                            <action name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"/>
-                        -->
-
+                            <action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchases by Category"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index b1d2cf956ae..601e427eda4 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-12 11:24+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 04:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:292
@@ -53,7 +55,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "Datum izrade dokumenta"
+msgstr "Datum  kreiranja ovog dokumenta"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -67,6 +69,12 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Zahtjev za ponudom možete kreirati i prije nego što je nalog za nabavu "
+"potvrđen.\n"
+"Ovdje će se naći i zahtjevi za ponudom koje program automatski kreira "
+"temeljem postavke logističkih pravila (minimalne količine, JIT, ...). "
+"Zahtjev za ponudom možete pretvoriti u Nalog za nabavu. Postave na nalogu za "
+"nabavu kontroliraju kreiranje ulaznog računa temeljem naloga ili primki."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -81,13 +89,13 @@ msgstr "Nefakturirano"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr "Adresa odredišta"
+msgstr "Adresa isporuke"
 
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
+msgstr "Potvrđeno od strane"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -96,12 +104,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices ?"
-msgstr ""
+msgstr "Želite li kreirati ulazni račun?"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -110,6 +118,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Nalozi za nabavu po brojevima, dobavljačima, proizvodima, .... \n"
+"Za svaki nalog nabave možete pratiti primljene proizvode i kontrolirati "
+"izradu ulaznih računa."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -132,7 +143,7 @@ msgstr ""
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "Sa popisa odabira"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:660
@@ -145,12 +156,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Odaberite otvoreni prodajni nalog"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -158,35 +169,35 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Mjesečne nabave po grupama"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr "Postavi kao nacrt"
+msgstr "Postavi na nacrt"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Iznimka računa"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "Uobičajeni cjenik nabave"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
 msgid "Current purchases"
-msgstr ""
+msgstr "Aktualne nabave"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -195,6 +206,9 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -202,11 +216,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Za ovog partnera ovdje možete navesti specifičan cjenik za nabavu ako se ne "
+"primjenjuje uobičajeni cjenik."
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -214,6 +230,8 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
+"Cjenik određuje valutu za ovu narudžbu. Ujedno računa i cijenu dobavljača za "
+"odabrane proizvode/količine."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
@@ -229,7 +247,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Odobri nabavu"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -237,27 +255,27 @@ msgstr ""
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Odobreno"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "Nabava"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -265,7 +283,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:660
@@ -278,7 +296,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -286,7 +304,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -297,19 +315,19 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nalog za nabavu"
 
 #. module: purchase
 #: field:purchase.order,name:0
 #: view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Broj naloga"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -320,7 +338,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: purchase
 #: field:purchase.installer,progress:0
@@ -333,13 +351,15 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
+"račun se kreira na temelju primljenih ili naručenih količina."
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:315
@@ -350,40 +370,40 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "U nalog za nabavu"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0
 #: field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Pricelist"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Shipping Exception"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr ""
+msgstr "Ulaz proizvoda"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Proizvodi za isporuku"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "Ručno ispravljeno"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -393,7 +413,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:244
@@ -404,18 +424,18 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Ime kontakta na odredištu"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:344
@@ -426,13 +446,13 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analitike"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:696
@@ -455,22 +475,22 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Price"
-msgstr ""
+msgstr "Net Cijena"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr ""
+msgstr "Stavka naloga"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Označava da je izvršen prijem proizvoda"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:721
@@ -482,18 +502,18 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 #: selection:purchase.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -505,22 +525,22 @@ msgstr "Potvrdi"
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "Kontrola računa"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Oznaka dobavljača"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -529,6 +549,8 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Primka može kreirati ulazni račun. Ovisno o kontroli računa na Nalogu "
+"nabave, račun se izrađuje na temelju primljenih ili naručenih količina."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -537,7 +559,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -545,32 +567,34 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr ""
+msgstr "Skladišni dokument"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Spoji naloge za nabavu"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Order Lines"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:662
@@ -581,29 +605,29 @@ msgstr ""
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Price"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "Cjenici"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Address Contact Name"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -619,7 +643,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Kreirani računi za nalog nabave"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:292
@@ -633,17 +657,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Potvrda naloga za nabavu br."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -652,6 +676,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -665,6 +692,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Prema polju \"Kontrola računa\" račun će se generirati automatski ako je "
+"\"Kontrola računa\" postavljena na \"Iz primki\" .Račun se može i ručno "
+"upisati ako je \"Kontrola računa\" postavljena na \"Ručno\"."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -674,12 +704,12 @@ msgstr ""
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "Reservation Destination"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:244
@@ -692,40 +722,40 @@ msgstr ""
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Postava"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
 #: view:purchase.report:0
 msgid "Purchase by supplier"
-msgstr ""
+msgstr "Nabave po dobavljaču"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "Primke"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr ""
+msgstr "Potvrdio"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -735,12 +765,16 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Ovdje kontrolirate ulazne račune koje očekujete od dobavljača. OpenERP "
+"automatski kreira nacrte ulaznih računa iz naloga za nabavu i/ili primki. "
+"Kada primite originalni ulazni račun od dobavljača usporedite ga s nacrtom i "
+"potvrdite ga."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "ZZP (RFQ)"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -781,22 +815,22 @@ msgstr ""
 #: field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "Proizvodi koji dolaze na ulaznu kontrolu"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "Approbation"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "Statistika naloga za nabavu"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -811,7 +845,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
@@ -824,11 +858,13 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
@@ -838,101 +874,101 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Kategorije jedinica mjere"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Dana za isporuku"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "Prihvat proizvoda"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Potvrđeni nalozi nabave u račun"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Ukupan broj redaka naloga korisnika po mjesecu."
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Waiting Supplier Ack"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Nalozi za nabavu koje čekaju potvrdu"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Uk. osnovica"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "Received"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "List of ordered products."
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "Ovo je popis primki nastalih ovom nabavom"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+msgstr "Upravljanje nabavom"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Potrebna revizija knjigovođe."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -949,25 +985,25 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Taxes :"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
 #: field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Grupa"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "Stanje naloga za nabavu"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -977,19 +1013,19 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje naloga"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Stavka naloga nabave"
 
 #. module: purchase
 #: constraint:res.partner:0
@@ -999,28 +1035,28 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Calendar View"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "Spajanje naloga za nabavu"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Regards,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "Negotiation by Supplier"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Svojstva nabave"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1029,21 +1065,23 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Nalog za nabavu kreira ulazni račun u trenutku potvrde. Račun nastaje "
+"temeljem naloga ili primki ovisno o \"Kontrola računa\" na nalogu."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Označava da je račun plaćen"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Nefakturirani izlaz"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1054,37 +1092,37 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
 #: view:purchase.report:0
 msgid "Qty. per product"
-msgstr ""
+msgstr "Kol. po proizvodu"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Datum kreiranja ovog dokumenta."
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodaja i nabava"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Ručni računi"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:318
@@ -1096,12 +1134,12 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filtri..."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:362
@@ -1125,22 +1163,22 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Pick list generated"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "Exception"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: purchase
 #: model:ir.module.module,description:purchase.module_meta_information
@@ -1168,38 +1206,38 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "Otkaži nalog za nabavu"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "A pick list is generated to track the incoming products."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Kokpit"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Products Value"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
@@ -1210,34 +1248,34 @@ msgstr ""
 #: view:purchase.order:0
 #: view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
 #: view:purchase.report:0
 msgid "Purchase order per month"
-msgstr ""
+msgstr "Nalozi nabave po mjesecima"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Proizvodi po kategorijama"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dana do potvrde"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "Izvorni dokument koji je generirao ovaj zahtjev za nabavu."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1249,33 +1287,40 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Stanje naloga za nabavu ili zahtjeva za ponudom. Ponuda je nalog za nabavu u "
+"stanju 'Nacrt'. Nalog zatim treba uskladiti s ponudom dobavljača i "
+"potvrditi. Potvrda naloga je prihvaćanje ponude dobavljača, odnosno slanje "
+"narudžbenice dobavljaču. Nakon toga dobavljač potvrđuje narudžbenicu i nalog "
+"prelazi u stanje 'Odobren'. Kad je nalog za nabavu plaćen i zaprimljen, "
+"stanje postaje 'Izvršen'. Ako se dogodi otkazivanje tijekom izrade računa "
+"ili kod zaprimanja robe stanje postaje 'Iznimka'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "Zahtjevi za ponudom"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Datum potvrde naloga za nabavu (narudžbenice)."
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Waiting"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "Verzija uobičajenog cjenika nabave"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1292,23 +1337,23 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiskalna pozicija"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Zahtjev za ponudom br."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1323,12 +1368,12 @@ msgstr "Odustani"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "Stavke naloga za nabavu"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Dobavljač odobrava narudžbenicu."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1336,86 +1381,86 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
 #: view:purchase.report:0
 msgid "Purchase Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "Spoji naloge"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Kreiraj račun iz stavki naloga za nabavu"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Primke"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Ukupno naloga po korisniku i mjesecu"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Request for Quotation"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "Tél. :"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0
 #: view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "Naša oznaka naloga"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Traži naloge za nabavu"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladište"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "Datum Zah."
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
 #: field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr ""
+msgstr "Datum odobrenja"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:417
@@ -1427,17 +1472,17 @@ msgstr ""
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "Dostava i fakturiranje"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planirani datum"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
@@ -1447,41 +1492,41 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmation"
 
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,name:0
 #: report:purchase.quotation:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Ovo je vodeće/rezervno vrijeme za svaki nabavni nalog."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "Expected Delivery address:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "Analiza primki"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Iznos osnovice."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1490,44 +1535,47 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "Dostava"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "JM proizvoda"
 
 #. module: purchase
 #: report:purchase.order:0
 #: report:purchase.quotation:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "Reservation"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Uk. količina i iznos po mjesecima"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:409
@@ -1541,27 +1589,29 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "Analiza nabave"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "Referenca naloga"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1569,18 +1619,18 @@ msgstr ""
 #: report:purchase.quotation:0
 #: field:purchase.report,expected_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Očekivani datum"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
 #: view:purchase.report:0
 msgid "Total price by product by state"
-msgstr ""
+msgstr "Ukupna cijena po proizvodu po stanju"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA:"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1591,22 +1641,22 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Shipping address :"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr ""
+msgstr "Kontrola nabave"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1623,43 +1673,53 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Pravila: \n"
+" \n"
+" Nalozi za nabavu će biti spojeni samo ako su: \n"
+" * u stanju 'Nacrt' \n"
+" * pripadaju istom dobavljaču \n"
+" * imaju iste sladišne lokacije i cjenike nabave \n"
+" \n"
+" Linije se spajaju samo ako su identične u svemu osim količine i jedinice "
+"mjere: \n"
+" "
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Uobičajena nabavna cijena"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
+msgstr "Purchase Pricelist"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "Kontrola računa"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Za odobriti"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1672,6 +1732,13 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:424
@@ -1682,54 +1749,54 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Verzije cjenika"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
-msgstr ""
+msgstr "Are you sure you want to merge these orders ?"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Iz naloga za nabavu"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Ukupan iznos"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Vodeće vrijeme nabave"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1738,17 +1805,20 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Ako je 'Fakturiranje' na nalogu postavljeno na 'Temeljem naloga', račun će "
+"se automatski generirati. Račun može izraditi i knjigovođa upisom računa i "
+"stavki kada je 'Fakturiranje' postavljeno na 'Ručno'."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabava"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:662
@@ -1771,18 +1841,18 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Jedinice mjere"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "Orders"
 
 #. module: purchase
 #: help:purchase.order,name:0
@@ -1790,9 +1860,11 @@ msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
 msgstr ""
+"jedinstveni broj naloga za prodaju, automatski postavljen u trenutku "
+"kreiranja"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "Kokpit nabave"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 90acbf4ecfd..b61a33ed73b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -315,11 +315,10 @@
                     <field name="date_order" />
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="location_id"/>
-                    <field name="minimum_planned_date"/>
+                    <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/>
                     <field name="origin"/>
-                    <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="shipped_rate" widget="progressbar"/>
+                    <field name="invoiced_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
+                    <field name="shipped_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 68323bc9146..095f17090da 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -99,7 +99,7 @@
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
- 					<separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
@@ -187,98 +187,5 @@
     </record>
     <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
 
-    <record model="ir.ui.view" id="view_purchase_by_supplier_graph">
-            <field name="name">purchase.by.supplier.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Purchase by supplier" type="bar">
-                    <field name="partner_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-	<record id="action_purchase_by_supplier" model="ir.actions.act_window">
-        <field name="name">Purchase by supplier</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('state','=','done'),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
-        <field name="view_id" ref="view_purchase_by_supplier_graph"/>
-    </record>
-
-    <record model="ir.ui.view" id="view_total_price_by_product_by_state_graph">
-            <field name="name">total.price.by.product.by.state.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total price by product by state" type="pie">
-                    <field name="product_id"/>
-                    <field name="price_total" operator="+"/>
-
-                </graph>
-            </field>
-        </record>
-	<record id="action_total_price_by_product_by_state" model="ir.actions.act_window">
-        <field name="name">Total price by product by state</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id','state']}</field>
-        <field name="view_id" ref="view_total_price_by_product_by_state_graph"/>
-    </record>
-
-    <record model="ir.ui.view" id="view_qty_per_product_graph">
-            <field name="name">qty.per.product.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Qty. per product" type="bar">
-                    <field name="product_id"/>
-                    <field name="quantity" operator="+"/>
-                </graph>
-            </field>
-        </record>
-	<record id="action_qty_per_product" model="ir.actions.act_window">
-        <field name="name">Qty. per product</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('state','=','done')]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id']}</field>
-        <field name="view_id" ref="view_qty_per_product_graph"/>
-    </record>
-
-   	   <record model="ir.ui.view" id="view_po_per_month_tree">
-            <field name="name">qty.per.product.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Purchase order per month" >
-                    <field name="month"/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="nbr" operator="+"/>
-                </tree>
-            </field>
-        </record>
-	<record id="action_po_per_month_tree" model="ir.actions.act_window">
-        <field name="name">Purchase order per month</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('date','&gt;',time.strftime('%Y-01-01 00:00:00')),('date','&lt;',time.strftime('%Y-12-31 23:59:59')),('state','=','done')]</field>
-		<field name="context">{'group_by_no_leaf':1,'group_by':['month','product_id']}</field>
-		<field name="view_id" ref="view_po_per_month_tree"/>
-    </record>
-
-  <record id="action_current_purchases" model="ir.actions.act_window">
-        <field name="name">Current purchases</field>
-        <field name="res_model">purchase.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','confirmed'))]</field>
-        <field name="view_id" ref="purchase.purchase_order_tree"/>
-      </record>
     </data>
 </openerp>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c9ad36840fa..efee0adc589 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -1,67 +1,67 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_order","purchase.order","model_purchase_order","group_purchase_user",1,1,1,1
-"access_purchase_order_manager","purchase.order","model_purchase_order","group_purchase_manager",1,1,1,1
-"access_purchase_order_line","purchase.order.line user","model_purchase_order_line","group_purchase_user",1,1,1,1
-"access_purchase_order_line_manager","purchase.order.line manager","model_purchase_order_line","group_purchase_manager",1,0,0,0
-"access_stock_location_purchase_user","stock.location","stock.model_stock_location","group_purchase_user",1,0,0,0
-"access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","group_purchase_user",1,0,0,0
-"access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","group_purchase_user",1,1,1,1
-"access_stock_move_purchase_user","stock.move","stock.model_stock_move","group_purchase_user",1,1,1,1
-"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0
-"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
-"access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0
-"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,0,0,0
-"access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0
-"access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","group_purchase_manager",1,1,1,1
-"access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","group_purchase_manager",1,0,0,0
-"access_stock_warehouse_purchase_user_manager","stock.warehouse","stock.model_stock_warehouse","group_purchase_manager",1,0,0,0
-"access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","group_purchase_manager",1,1,1,1
-"access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","group_purchase_manager",1,1,1,1
-"access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0
-"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
-"access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0
-"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,0,0,0
-"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0
-"access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
-"access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1
-"access_account_invoice_purchase_manager","account_invoice purchase manager","account.model_account_invoice","group_purchase_manager",1,0,0,0
-"access_account_invoice_line_purchase_manager","account_invoice.line purchase manager","account.model_account_invoice_line","group_purchase_manager",1,0,0,0
-"access_account_invoice_tax_purchase","account_invoice.tax purchase","account.model_account_invoice_tax","group_purchase_user",1,1,1,1
-"access_account_fiscal_position_purchase_user","account.fiscal.position purchase","account.model_account_fiscal_position","group_purchase_user",1,0,0,0
-"access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
-"access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
-"access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
-"access_account_journal_period","account.journal.period","account.model_account_journal_period","group_purchase_user",1,1,1,0
-"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,0,0,0
-"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0
-"access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
-"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
-"access_account_move","account.move","account.model_account_move","group_purchase_user",1,0,0,0
-"access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,0,0,0
-"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,0,0,0
-"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,0,0,0
-"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,0,0,0
-"access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,1,1,0
-"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,1,1,0
-"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,0
-"access_product_uom_categ_purchase_manager","product.uom.categ purchase_manager","product.model_product_uom_categ","purchase.group_purchase_manager",1,1,1,1
-"access_product_uom_purchase_manager","product.uom purchase_manager","product.model_product_uom","purchase.group_purchase_manager",1,1,1,1
-"access_product_ul_purchase_manager","product.ul purchase_manager","product.model_product_ul","purchase.group_purchase_manager",1,1,1,1
-"access_product_category_purchase_manager","product.category purchase_manager","product.model_product_category","purchase.group_purchase_manager",1,1,1,1
-"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","purchase.group_purchase_manager",1,1,1,1
-"access_product_product_purchase_manager","product.product purchase_manager","product.model_product_product","purchase.group_purchase_manager",1,1,1,1
-"access_product_packaging_purchase_manager","product.packaging purchase_manager","product.model_product_packaging","purchase.group_purchase_manager",1,1,1,1
-"access_product_supplierinfo_purchase_manager","product.supplierinfo purchase_manager","product.model_product_supplierinfo","purchase.group_purchase_manager",1,1,1,1
-"access_pricelist_partnerinfo_purchase_manager","pricelist.partnerinfo purchase_manager","product.model_pricelist_partnerinfo","purchase.group_purchase_manager",1,1,1,1
-"access_product_price_type_purchase_manager","product.price.type purchase_manager","product.model_product_price_type","purchase.group_purchase_manager",1,1,1,1
-"access_product_pricelist_type_purchase_manager","product.pricelist.type purchase_manager","product.model_product_pricelist_type","purchase.group_purchase_manager",1,1,1,1
-"access_product_pricelist_purchase_manager","product.pricelist purchase_manager","product.model_product_pricelist","purchase.group_purchase_manager",1,1,1,1
-"access_ir_property_group_purchase_manager","ir_property group_purchase_manager","base.model_ir_property","purchase.group_purchase_manager",1,1,1,1
-"access_product_group_res_partner_purchase_manager","res_partner group_purchase_manager","base.model_res_partner","purchase.group_purchase_manager",1,1,1,0
-"access_product_pricelist_version_purchase_manager","product.pricelist.version purchase_manager","product.model_product_pricelist_version","purchase.group_purchase_manager",1,1,1,1
-"access_product_pricelist_item_purchase_manager","product.pricelist.item purchase_manager","product.model_product_pricelist_item","purchase.group_purchase_manager",1,1,1,1
-"access_account_account_purchase_manager","account.account purchase manager","account.model_account_account","purchase.group_purchase_manager",1,0,0,0
-"access_account_journal_purchase_manager","account.journal purchase manager","account.model_account_journal","purchase.group_purchase_manager",1,0,0,0
-"access_stock_tracking_purchase_user","stock.tracking purchase.user","stock.model_stock_tracking","purchase.group_purchase_user",1,1,1,0
-"access_stock_location_purchase_manager","stock.location purchase manager","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_order,purchase.order,model_purchase_order,group_purchase_user,1,1,1,1
+access_purchase_order_manager,purchase.order,model_purchase_order,group_purchase_manager,1,1,1,1
+access_purchase_order_line,purchase.order.line user,model_purchase_order_line,group_purchase_user,1,1,1,1
+access_purchase_order_line_manager,purchase.order.line manager,model_purchase_order_line,group_purchase_manager,1,0,0,0
+access_stock_location_purchase_user,stock.location,stock.model_stock_location,group_purchase_user,1,0,0,0
+access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0
+access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1
+access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,1
+access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0
+access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0
+access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0
+access_report_purchase_order,purchase.report,model_purchase_report,group_purchase_manager,1,0,0,0
+access_report_purchase_order_user,purchase.report user,model_purchase_report,group_purchase_user,1,0,0,0
+access_purchase_order_line_manager,purchase.order.line,model_purchase_order_line,group_purchase_manager,1,1,1,1
+access_stock_location_purchase_user_manager,stock.location,stock.model_stock_location,group_purchase_manager,1,0,0,0
+access_stock_warehouse_purchase_user_manager,stock.warehouse,stock.model_stock_warehouse,group_purchase_manager,1,0,0,0
+access_stock_picking_purchase_user_manager,stock.picking,stock.model_stock_picking,group_purchase_manager,1,1,1,1
+access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,group_purchase_manager,1,1,1,1
+access_account_tax_purchase_user_manager,account.tax,account.model_account_tax,group_purchase_manager,1,0,0,0
+access_product_product_purchase_user,product.product.purchase.user,product.model_product_product,group_purchase_user,1,0,0,0
+access_product_product_purchase_manager,product.product.purchase.manager,product.model_product_product,group_purchase_manager,1,0,0,0
+access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
+access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
+access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
+access_account_invoice_line_purchase,account_invoice.line purchase,account.model_account_invoice_line,group_purchase_user,1,1,1,1
+access_account_invoice_purchase_manager,account_invoice purchase manager,account.model_account_invoice,group_purchase_manager,1,0,0,0
+access_account_invoice_line_purchase_manager,account_invoice.line purchase manager,account.model_account_invoice_line,group_purchase_manager,1,0,0,0
+access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_account_invoice_tax,group_purchase_user,1,1,1,1
+access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0
+access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1
+access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0
+access_res_partner_address_purchase_user,res.partner.address purchase,base.model_res_partner_address,group_purchase_user,1,0,0,0
+access_account_journal_period,account.journal.period,account.model_account_journal_period,group_purchase_user,1,1,1,0
+access_account_journal,account.journal,account.model_account_journal,group_purchase_user,1,0,0,0
+access_account_journal_manager,account.journal,account.model_account_journal,group_purchase_manager,1,0,0,0
+access_account_period,account.period,account.model_account_period,group_purchase_user,1,0,0,0
+access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,group_purchase_user,1,0,0,0
+access_account_move,account.move,account.model_account_move,group_purchase_user,1,0,0,0
+access_account_move_line,account.move.line,account.model_account_move_line,group_purchase_user,1,0,0,0
+access_account_analytic_line,account.analytic.line,account.model_account_analytic_line,group_purchase_user,1,0,0,0
+access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,group_purchase_user,1,0,0,0
+access_report_stock_move,report.stock.move.manager,stock.model_report_stock_move,group_purchase_manager,1,0,0,0
+access_report_stock_move_user,report.stock.move.user,stock.model_report_stock_move,group_purchase_user,1,0,0,0
+access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,group_purchase_user,1,1,1,0
+access_stock_production_lot_revision,stock.production.lot.revision,stock.model_stock_production_lot_revision,group_purchase_user,1,1,1,0
+access_res_partner_purchase_manager,res.partner.purchase.manager,base.model_res_partner,group_purchase_manager,1,1,1,0
+access_product_uom_categ_purchase_manager,product.uom.categ purchase_manager,product.model_product_uom_categ,purchase.group_purchase_manager,1,1,1,1
+access_product_uom_purchase_manager,product.uom purchase_manager,product.model_product_uom,purchase.group_purchase_manager,1,1,1,1
+access_product_ul_purchase_manager,product.ul purchase_manager,product.model_product_ul,purchase.group_purchase_manager,1,1,1,1
+access_product_category_purchase_manager,product.category purchase_manager,product.model_product_category,purchase.group_purchase_manager,1,1,1,1
+access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
+access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
+access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
+access_product_supplierinfo_purchase_manager,product.supplierinfo purchase_manager,product.model_product_supplierinfo,purchase.group_purchase_manager,1,1,1,1
+access_pricelist_partnerinfo_purchase_manager,pricelist.partnerinfo purchase_manager,product.model_pricelist_partnerinfo,purchase.group_purchase_manager,1,1,1,1
+access_product_price_type_purchase_manager,product.price.type purchase_manager,product.model_product_price_type,purchase.group_purchase_manager,1,1,1,1
+access_product_pricelist_type_purchase_manager,product.pricelist.type purchase_manager,product.model_product_pricelist_type,purchase.group_purchase_manager,1,1,1,1
+access_product_pricelist_purchase_manager,product.pricelist purchase_manager,product.model_product_pricelist,purchase.group_purchase_manager,1,1,1,1
+access_ir_property_group_purchase_manager,ir_property group_purchase_manager,base.model_ir_property,purchase.group_purchase_manager,1,1,1,1
+access_product_group_res_partner_purchase_manager,res_partner group_purchase_manager,base.model_res_partner,purchase.group_purchase_manager,1,1,1,0
+access_product_pricelist_version_purchase_manager,product.pricelist.version purchase_manager,product.model_product_pricelist_version,purchase.group_purchase_manager,1,1,1,1
+access_product_pricelist_item_purchase_manager,product.pricelist.item purchase_manager,product.model_product_pricelist_item,purchase.group_purchase_manager,1,1,1,1
+access_account_account_purchase_manager,account.account purchase manager,account.model_account_account,purchase.group_purchase_manager,1,0,0,0
+access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
+access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
+access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
diff --git a/addons/purchase/static/src/img/icon.png b/addons/purchase/static/src/img/icon.png
new file mode 100644
index 00000000000..094705cecc3
--- /dev/null
+++ b/addons/purchase/static/src/img/icon.png
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index f03e787479e..f6ef8e51123 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 09:36+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:01+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Stavka nabavnog naloga"
 
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -34,12 +34,12 @@ msgstr "Analitička raspodjela"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nalog za nabavu"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr "Upravljanje analitičkom raspodjelom kupnji"
+msgstr "Upravljanje analitičkom raspodjelom u nabavi"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -48,6 +48,10 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Osnovni modul za upravljanje analitičkom raspodjelom i nabavnim "
+"nalozima.\n"
+"    "
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
new file mode 100644
index 00000000000..42309561093
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -0,0 +1,88 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 07:16+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr "Konfiguracija nabavne aplikacije"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+"Definiraj minimalni iznos nakon nakon kojeg je potrebno potvrditi nabavu."
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr "purchase_double_validation"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid ""
+"\n"
+"\tThis module modifies the purchase workflow in order to validate purchases "
+"that exceeds minimum amount set by configuration wizard\n"
+"    "
+msgstr ""
+"\n"
+"\tOvaj modul mijenja dijagram tijeka nabave kako bi potvrdio nabave koje "
+"prelaze minimalni iznos postavljen u asistentu za konfiguraciju\n"
+"    "
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr "Konfiguriraj granični iznos za nabavu"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr "Maksimalni iznos nakon kojeg je obavezna potvrda nabave."
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr "purchase.double.validation.installer"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr "Maksimalni iznos nabave"
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index d1ec2b1c260..a926b3bfb3a 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,11 +18,11 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase Requisition",
+    "name" : "Purchase Requisitions",
     "version" : "0.1",
     "author" : "OpenERP SA",
     "category" : "Purchase Management",
-    'complexity': "easy",
+    'complexity': "normal",
     "images" : ['images/purchase_requisitions.jpeg'],
     "website" : "http://www.openerp.com",
     "description": """
@@ -43,8 +43,10 @@ This new object will regroup and will allow you to easily keep track and order a
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"
     ],
     "active": False,
-    "test":['test/purchase_requisition_report.yml',
-            'test/purchase_requisition_test.yml',
+    "test":[
+            'test/purchase_requisition_demo.yml',
+            'test/purchase_requisition.yml',
+            'test/cancel_purchase_requisition.yml',
             ],
     "installable": True,
     "certificate" : "001023264099823179629",
diff --git a/addons/purchase_requisition/i18n/hr.po b/addons/purchase_requisition/i18n/hr.po
new file mode 100644
index 00000000000..ef664e8d8cd
--- /dev/null
+++ b/addons/purchase_requisition/i18n/hr.po
@@ -0,0 +1,436 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-11 22:15+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "Nema artikla u tenderu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Dobavljač"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Vrsta zahtjeva"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalji artikla"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Datum zahtjeva"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Zahtjev za nabavom"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Stavka zahtjeva za nabavom"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Oznaka naloga mora biti jedinstvena"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Označi ovu kučicu kako bi zahtjev generirao zahtjev za nabavom umjesto "
+"direktno upit."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Upit"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Višestruki zahtjevi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Odobrio dobavljač"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Vrati u nacrt"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+"    This module allows you to manage your Purchase Requisition.\n"
+"    When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+"    This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+"\n"
+"    Ovaj modul omogućuje upravljanje zahtjevima u nabavi.\n"
+"    Kad se kreira nabavni nalog, imate priliku snimiti povezani zahtjev.\n"
+"    Novi objekt će se pregrupirati i mogućiti vam lako praćenje i "
+"naručivanje svih vaših nabavnih naloga.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Adresa"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Oznaka narudžbe"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Zahtjev u nabavi je korak prije upita. U zahtjevu za nabavom (ili nabavnom "
+"tenderu), možete zabilježiti sve artikle\r\n"
+"koje morate kupiti i pokrenuti kreiranje upita dobavljačima. Nakon pregovora "
+"nakon što se razmotrili sve ponude dobavljača možete potvrditi neke, a "
+"odustati od drugih."
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Zahtjevi u nabavi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Završni datum"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Oznaka zahtjeva"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Artikli za nabavu"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Konačan rok zahtjeva"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Pretraži zahtjeve u nabavi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Zahtjev u nabavi (ekskluzivni):  Prilikom potvrde nabavnog naloga , "
+"poništava preostale nabavne naloge.\n"
+"Zahtjevi u nabavi(Višestruki):  Omogućuje više nabavnih naloga. Prilikom "
+"potvrde nabavnog naloga ne poništava preostale naloge."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Poništi nabavni nalog"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Nalog za nabavu"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "JM proizvoda"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Artikli"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Datum naloga"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "["
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner za zahtjev u nabavi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalji upita"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Nabava za zahtjev"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Nalozi u nabavi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Vezna oznaka"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Zadnji zahtjev"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Upiti"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Zahtjev u nabavi (ekskluzivan)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Kreiraj upit"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: neispravan EAN kod"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Potvrdi nabavni nalog"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Nabava - Zahtjevi u nabavi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Nedodjeljen"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Zahtjev"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Nalozi u nabavi"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Već imate jedan %s nabavni nalog za tog partnera. Morate poništiti ovaj "
+"nabavni nalog kako bi kreirali novi upit."
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index d619e3a82f5..cc0956b8755 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -19,7 +19,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import time
 import netsvc
 
@@ -83,6 +84,89 @@ class purchase_requisition(osv.osv):
         self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         return True
 
+    def _planned_date(self, requisition, delay=0.0):
+        company = requisition.company_id
+        date_planned = False
+        if requisition.date_start:
+            date_planned = datetime.strptime(requisition.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
+        else:
+            date_planned = datetime.today() - relativedelta(days=company.po_lead)
+        if delay:
+            date_planned -= relativedelta(days=delay)
+        return date_planned and date_planned.strftime('%Y-%m-%d %H:%M:%S') or False
+
+    def _seller_details(self, cr, uid, requisition_line, supplier, context=None):
+        product_uom = self.pool.get('product.uom')
+        pricelist = self.pool.get('product.pricelist')
+        supplier_info = self.pool.get("product.supplierinfo")
+        product = requisition_line.product_id
+        default_uom_po_id = product.uom_po_id.id
+        qty = product_uom._compute_qty(cr, uid, requisition_line.product_uom_id.id, requisition_line.product_qty, default_uom_po_id)
+        seller_delay = 0.0
+        seller_price = False
+        seller_qty = False
+        for product_supplier in product.seller_ids:
+            if supplier.id ==  product_supplier.name and qty >= product_supplier.qty:
+                seller_delay = product_supplier.delay
+                seller_qty = product_supplier.qty
+        supplier_pricelist = supplier.property_product_pricelist_purchase or False
+        seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, False, {'uom': default_uom_po_id})[supplier_pricelist.id]
+        if seller_qty:
+            qty = max(qty,seller_qty)
+        date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)
+        return seller_price, qty, default_uom_po_id, date_planned
+
+    def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
+        """
+        Create New RFQ for Supplier
+        """
+        if context is None:
+            context = {}
+        assert partner_id, 'Supplier should be specified'
+        purchase_order = self.pool.get('purchase.order')
+        purchase_order_line = self.pool.get('purchase.order.line')
+        res_partner = self.pool.get('res.partner')
+        fiscal_position = self.pool.get('account.fiscal.position')
+        supplier = res_partner.browse(cr, uid, partner_id, context=context)
+        delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
+        supplier_pricelist = supplier.property_product_pricelist_purchase or False
+        res = {}
+        for requisition in self.browse(cr, uid, ids, context=context):
+            if supplier.id in filter(lambda x: x, [rfq.state <> 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
+                 raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state)
+            location_id = requisition.warehouse_id.lot_input_id.id
+            purchase_id = purchase_order.create(cr, uid, {
+                        'origin': requisition.name,
+                        'partner_id': supplier.id,
+                        'partner_address_id': delivery_address_id,
+                        'pricelist_id': supplier_pricelist.id,
+                        'location_id': location_id,
+                        'company_id': requisition.company_id.id,
+                        'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
+                        'requisition_id':requisition.id,
+                        'notes':requisition.description,
+                        'warehouse_id':requisition.warehouse_id.id ,
+            })
+            res[requisition.id] = purchase_id
+            for line in requisition.line_ids:
+                product = line.product_id
+                seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
+                taxes_ids = product.supplier_taxes_id
+                taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
+                purchase_order_line.create(cr, uid, {
+                    'order_id': purchase_id,
+                    'name': product.partner_ref,
+                    'product_qty': qty,
+                    'product_id': product.id,
+                    'product_uom': default_uom_po_id,
+                    'price_unit': seller_price,
+                    'date_planned': date_planned,
+                    'notes': product.description_purchase,
+                    'taxes_id': [(6, 0, taxes)],
+                }, context=context)
+                
+        return res
+
 purchase_requisition()
 
 class purchase_requisition_line(osv.osv):
@@ -96,7 +180,7 @@ class purchase_requisition_line(osv.osv):
         'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }
 
     def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context=None):
@@ -133,7 +217,7 @@ class purchase_order(osv.osv):
                             proc_obj.write(cr, uid, proc_ids, {'purchase_id': po.id})
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
-                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+                    po.requisition_id.tender_done(context=context)
         return res
 
 purchase_order()
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index deb25fe9e14..910fc22bc63 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -6,23 +6,64 @@
             <field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
         </record>
 
+        <record id="product.product_product_hdd3" model="product.product">
+            <field name="purchase_requisition" eval="True"/>
+        </record>
+
     <!--Resource: purchase.requisition-->
 
-		<record id="order_purchase_requisition1" model="purchase.requisition">
+		<record id="requisition1" model="purchase.requisition">
             <field name="user_id" model="res.users"/>
-            <field name="exclusive">multiple</field>
+            <field name="exclusive">exclusive</field>
             <field name="date_start" eval="time.strftime('%Y/%m/%d %H:%M:%S')"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
 		</record>
 
-        <!--Resource: purchase.requisition.line-->
+        <record id="requisition_line1" model="purchase.requisition.line">
+            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="requisition_id" ref="requisition1"/>
+            <field name="product_id" ref="product.product_product_hdd3"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
+            <field name="product_qty">5</field>
+        </record>
+
+        <!--Resource: purchase.order-->
 
-        <record id="line_purchase_requisition1" model="purchase.requisition.line">
-            <field name="requisition_id" ref="order_purchase_requisition1"/>
-            <field name="product_id" ref="product.product_product_pc3"/>
-            <field name="product_uom_id" model="product.uom" search="[]"/>
+        <record id="rfq1" model="purchase.order">
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="partner_address_id" ref="base.res_partner_address_7"/>
+            <field name="requisition_id" ref="requisition1"/>
+        </record>
+
+        <record id="rfq1_line" model="purchase.order.line">
+            <field name="order_id" ref="rfq1"/>
+            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="date_planned" eval="time.strftime('%Y/%m/10')"/>
+            <field name="product_id" ref="product.product_product_hdd3"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">60</field>
             <field name="product_qty">5</field>
         </record>
+               
+        <record id="rfq2" model="purchase.order">
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
+            <field name="partner_id" ref="base.res_partner_vickingdirect0"/>
+            <field name="partner_address_id" ref="base.res_partner_address_brussels0"/>
+            <field name="requisition_id" ref="requisition1"/>
+        </record>
+
+        <record id="rfq2_line" model="purchase.order.line">
+            <field name="order_id" ref="rfq2"/>
+            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="date_planned" eval="time.strftime('%Y/%m/15')"/>
+            <field name="product_id" ref="product.product_product_hdd3"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">50</field>
+            <field name="product_qty">3</field>
+        </record>        
 
 
     </data>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index e0f09f6f7d6..bd47d093df0 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -174,7 +174,6 @@
     <menuitem
         id="menu_purchase_requisition_pro_mgt"
         sequence="0"
-        groups="base.group_extended"
         parent="purchase.menu_procurement_management"
         action="action_purchase_requisition"/>
 
diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
index ec8c031f88b..4c6b8d8cdde 100644
--- a/addons/purchase_requisition/security/ir.model.access.csv
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,1,1,1
-"access_purchase_requisition_line_purchase_user","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
-"access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_requisition_stock_manager","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0
-"access_purchase_requisition_line_stock_manager","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_requisition,purchase.requisition,model_purchase_requisition,purchase.group_purchase_user,1,1,1,1
+access_purchase_requisition_line_purchase_user,purchase.requisition.line,model_purchase_requisition_line,purchase.group_purchase_user,1,1,1,1
+access_purchase_requisition_manager,purchase.requisition manager,model_purchase_requisition,purchase.group_purchase_manager,1,0,0,0
+access_purchase_requisition_line_manager,purchase.requisition.line manager,model_purchase_requisition_line,purchase.group_purchase_manager,1,0,0,0
+access_purchase_requisition_stock_manager,purchase.requisition,model_purchase_requisition,stock.group_stock_manager,1,0,1,0
+access_purchase_requisition_line_stock_manager,purchase.requisition.line,model_purchase_requisition_line,stock.group_stock_manager,1,0,1,0
diff --git a/addons/purchase_requisition/test/cancel_purchase_requisition.yml b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
new file mode 100644
index 00000000000..389c328a5cf
--- /dev/null
+++ b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
@@ -0,0 +1,26 @@
+-
+  I cancel requisition.
+-
+  !python {model: purchase.requisition}: |
+    self.tender_cancel(cr, uid, [ref("requisition1")])
+-
+  I check requisition after cancelled.
+-
+  !assert {model: purchase.requisition, id: requisition1}:
+    - state == 'cancel'
+-
+  I reset requisition as "New".
+-
+  !python {model: purchase.requisition}: |
+    self.tender_reset(cr, uid, [ref('requisition1')])
+-
+  I duplicate requisition.
+-
+  !python {model: purchase.requisition}: |
+    self.copy(cr, uid, ref('requisition1'))
+-
+  I delete requisition.
+-
+  !python {model: purchase.order}: |
+    self.unlink(cr, uid, [ref("requisition1")])
+
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index fb5fa774fc3..a2e5b743965 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -1,189 +1,90 @@
-
 -
-  In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
-  purchase flow and I will buy the required products at two different suppliers.
--
-  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
-  with the generation of purchase requisitions.
--
-  !record {model: product.product, id: product_product_laptopacer0}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    mes_type: fixed
-    name: Laptop ACER
-    procure_method: make_to_order
-    purchase_requisition: 1
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        qty: 5.0
-        min_qty: 1.0
-    supply_method: buy
-    type: product
+  I create the procurement order and run that procurement.
+-
+  !python {model: make.procurement}: |
+    context.update({'active_model':'product.product', 'active_ids': [ref('product.product_product_hdd3')], 'active_id': ref('product.product_product_hdd3')})
+-
+  !record {model: make.procurement, id: procurement_product_hdd3}:
+    product_id: product.product_product_hdd3
+    qty: 15
     uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
-    list_price: 100.0
--
-  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001.
--
-  !record {model: sale.order, id: sale_order_testtender0}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: TEST/TENDER/0001
-    order_line:
-      - name: Laptop ACER
-        price_unit: 100.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        delay: 7.0
-        product_id: product_product_laptopacer0
-        product_uos_qty: 5.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the sale order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
--
-  I launch the scheduler to compute all procurements, and specify all requisitions orders.
--
-  !python {model: procurement.order.compute.all}: |
-    proc_obj = self.pool.get('procurement.order')
-    proc_obj._procure_confirm(cr,uid)
--
-  On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC .
--
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
--
-  I create a new purchase order.
+    warehouse_id: stock.stock_warehouse_shop0
 -
-  !python {model: purchase.requisition.partner}: |
-    req_obj = self.pool.get('purchase.requisition')
-    ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER')])
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
-      'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
-      1, "active_ids": ids, "active_id": ids[0], })
-
+  !python {model: make.procurement}: |
+    self.make_procurement(cr, uid, [ref('procurement_product_hdd3')], context)
 -
- I check that I have two purchase orders on the purchase requisition.
+  I run the scheduler.
 -
- !python {model: purchase.order}: |
-    from tools.translate import _
-    order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    ids=len(order_ids)
-    assert(ids == 2), _('Purchase Order not Created')
-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  I check requisition details which created after run procurement.
 -
- I set the purchase requisition as 'Not Exclusive'.
+  !python {model: procurement.order}: |
+    procurement_ids = self.search(cr, uid, [('requisition_id','!=', False)])
+    for procurement in self.browse(cr, uid, procurement_ids, context=context):
+        requisition = procurement.requisition_id
+        assert requisition.date_end == procurement.date_planned, "End date is not correspond."
+        assert len(requisition.line_ids) == 1, "Requisition Lines should be one."
+        line = requisition.line_ids[0]
+        assert line.product_id.id == procurement.product_id.id, "Product is not correspond."
+        assert line.product_uom_id.id == procurement.product_uom.id, "UOM is not correspond."
+        assert line.product_qty == procurement.product_qty, "Quantity is not correspond."
 -
- !python {model: purchase.requisition}: |
-    ids =self.search(cr, uid, [('origin','=','Laptop ACER')])
-    self.write(cr,uid,ids[0],{'exclusive': 'multiple' })
+  I open another requisition.
 -
-  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
-  purchase order for Asustek includes 2 pieces.
+  !python {model: purchase.requisition}: |
+    self.tender_in_progress(cr, uid, [ref("requisition1")], context=context)
+- 
+  Supplier send one RFQ so I create requisition request of that supplier.
+-
+  !python {model: purchase.requisition.partner}: |
+    context.update({"active_model": "purchase.requisition","active_ids": [ref("requisition1")],"active_id": ref("requisition1")})
+- 
+  !record {model: purchase.requisition.partner, id: requisition_partner_0}:
+    partner_id: base.res_partner_desertic_hispafuentes
+- 
+  !python {model: purchase.requisition.partner}: |
+    self.create_order(cr, uid, [ref("requisition_partner_0")], context=context)
+-
+  I check that the RFQ details which created for supplier.
 -
   !python {model: purchase.order}: |
-    line_obj=self.pool.get('purchase.order.line')
-    partner_obj=self.pool.get('res.partner')
-    requistion_obj=self.pool.get('purchase.requisition')
-    requistion_ids =requistion_obj.search(cr, uid, [('origin','=','Laptop ACER')])
-    partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
-    partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0]
-    purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1),('requisition_id','in',requistion_ids)])
-    purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2),('requisition_id','in',requistion_ids)])
-    order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
-    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id
-    line_obj.write(cr, uid, order_line1, {'product_qty':2})
-    line_obj.write(cr, uid, order_line2, {'product_qty':3})
--
-  I confirm and validate both purchase orders.
+    purchase_requisition = self.pool.get("purchase.requisition")
+    purchase_ids = self.search(cr, uid, [('requisition_id','=',ref("requisition1"))])
+    assert purchase_ids, "RFQ is not created."
+    rfq = self.browse(cr, uid, purchase_ids[0], context=context)
+    requisition = rfq.requisition_id
+    supplier = rfq.partner_id
+    assert supplier.id == ref('base.res_partner_desertic_hispafuentes'), "RFQ Partner is not correspond."
+    assert len(rfq.order_line) == len(requisition.line_ids), "Lines are not correspond."
+    for rfq_line in rfq.order_line:
+        for line in requisition.line_ids:
+            if rfq_line.product_id.id == line.product_id.id:
+                seller_price, qty, default_uom_po_id, date_planned = purchase_requisition._seller_details(cr, uid, line, supplier, context=context)
+                assert rfq_line.product_qty == qty, "Quantity is not correspond."
+                assert rfq_line.product_uom.id == default_uom_po_id, "UOM is not correspond."
+                assert rfq_line.price_unit == seller_price, "Unit Price is not correspond."   
+-
+  I confirmed RFQ which has best price.
 -
   !python {model: purchase.order}: |
-   order_ids= self.search(cr, uid, [])
-   import netsvc
-   wf_service = netsvc.LocalService("workflow")
-   for id in order_ids:
-      wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr)
--
-  I check that the delivery order of the customer is in state 'Waiting Goods'.
--
-  !python {model: stock.picking }: |
-    from tools.translate import _
-    picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      assert (pick.state =='confirmed'),_('Picking  is  not in confirm state.')
-      assert (pick.move_lines[0].state == 'waiting'), _('Stock Move is  not Waiting state.')
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    purchase = self.browse(cr, uid, ref('rfq2'), context=context)
+    wf_service.trg_validate(uid, 'purchase.order', purchase.id, 'purchase_confirm', cr)
 
 -
-  I receive the order of the supplier Asustek from the Incoming Products menu.
--
-  !python {model: stock.picking }: |
-   import time
-   partner_obj=self.pool.get('res.partner')
-   order_obj=self.pool.get('purchase.order')
-   partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
-   picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
-   if picking_id:
-     pick=self.browse(cr,uid,picking_id[0])
-     move =pick.move_lines[0]
-     partial_datas = {
-              'partner_id': pick.address_id.partner_id.id,
-              'address_id': pick.address_id.id,
-              'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-     partial_datas['move%s'%(move.id)]= {
-       'product_id': move.product_id.id,
-       'product_qty': move.product_qty,
-       'product_uom': move.product_uom.id,
-      }
-     self.do_partial(cr, uid, picking_id,partial_datas)
--
- I receive the order of the supplier DistriPC from the Incoming Shipments menu.
--
-  !python {model: stock.picking }: |
-   import time
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      move =pick.move_lines[0]
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, picking_id,partial_datas)
--
-  I check that the delivery order of the customer is in the state Available.
--
-  !python {model: stock.picking }: |
-   from tools.translate import _
-   picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      assert(pick.state == 'assigned'), _('Picking  is  not in available state')
-
+  I check status of requisition after confirmed best RFQ.
+-
+  !python {model: purchase.requisition}: |
+    requisition = self.browse(cr, uid, ref('requisition1'), context=context)
+    requisition.state == 'done', "Requisition should be closed."
+-
+  I print a Requisition report
+- 
+  !python {model: purchase.requisition}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.requisition1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml
new file mode 100755
index 00000000000..42913f3e96e
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_demo.yml
@@ -0,0 +1,10 @@
+-
+  In order to test process of the purchase requisition ,I create requisition
+- 
+  !record {model: purchase.requisition, id: requisition1}:
+    exclusive: exclusive
+    line_ids:
+      - product_id: product.product_product_cpu1
+        product_qty: 10.0
+        product_uom_id: product.product_uom_unit
+  
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
deleted file mode 100644
index 1ab9bca9493..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ /dev/null
@@ -1,113 +0,0 @@
--
-  In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
-  purchase flow and I will buy the required products at two different suppliers.
--
-  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
-  with the generation of purchase requisitions.
--
-  !record {model: product.product, id: product_product_laptopacer1}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: Laptop ACER1
-    procure_method: make_to_order
-    purchase_requisition: 1
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        qty: 5.0
-        min_qty: 1.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002
--
-  !record {model: sale.order, id: sale_order_testtender1}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: TEST/TENDER/0002
-    order_line:
-      - name: Laptop ACER1
-        price_unit: 1000.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        'delay': 7.0
-        'product_id': product_product_laptopacer1
-        'type': make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm  sale order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
--
-  I launch the scheduler to compute all procurements, and planify all requisitions orders.
--
-  !python {model: procurement.order.compute.all}: |
-    proc_obj = self.pool.get('procurement.order')
-    proc_obj._procure_confirm(cr,uid)
--
-  I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
-  5 Laptop ACER, and a purchase order on the default supplier for this product.
--
- !python {model: purchase.requisition}: |
-    requisition_ids =self.search(cr, uid, [('origin','=','Laptop ACER1')])
-    ids=len(requisition_ids)
-    assert len(requisition_ids), "Purchase requisition  hasn't Created"
--
-  On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New Request for Quotation'. This opens a window to ask me the supplier and I set DistriPC .
--
-  I Create  purchase.requisition.partner .
--
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
--
-  I create a new purchase order for the supplier 'DistriPC'.
--
-  !python {model: purchase.requisition.partner}: |
-    req_obj = self.pool.get('purchase.requisition')
-    ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
-      'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
-      1, "active_ids": ids, "active_id": ids[0], })
--
-  I set the purchase requisition as 'Exclusive'
--
-  !python {model: purchase.requisition}: |
-    ids =self.search(cr, uid, [('origin','=','Laptop ACER1')])
-    self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
--
-  I confirm and validate the Request for Quotation of ASUStek.
--
- !python {model: purchase.order}: |
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
-   req_obj = self.pool.get('purchase.requisition')
-   ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
-   import netsvc
-   wf_service = netsvc.LocalService("workflow")
-   if purchase_id:
-     wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr)
-     wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr)
--
-  I check that Request for Quotation of DistriPC is cancelled.
--
-  !python {model: purchase.order}: |
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   req_obj = self.pool.get('purchase.requisition')
-   ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
-   state=self.browse(cr,uid,purchase_id).state
-   assert (state=='cancel')
diff --git a/addons/purchase_requisition/test/purchase_requisition_report.yml b/addons/purchase_requisition/test/purchase_requisition_report.yml
deleted file mode 100644
index 29edea96a8a..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on Purchase Requisition, we will print a Requisition report
-- 
-  !python {model: purchase.requisition}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.order_purchase_requisition1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
deleted file mode 100755
index 403eaca04fc..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_test.yml
+++ /dev/null
@@ -1,166 +0,0 @@
--
-  In order to test the purchase requisition flow,I start by creating a new product 'MOB1'
-- 
-  !record {model: product.product, id: product_product_mob1}:
-    name: MOB1
-    categ_id: product.product_category_3
-    cost_method: standard
-    mes_type: fixed
-    price_margin: 2.0
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    standard_price: 2000.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
-- 
-  I create purchase requisition for MOB1 for 1 quantity.
-- 
-  !record {model: purchase.requisition, id: purchase_requisition_te0}:
-    company_id: base.main_company
-    exclusive: multiple
-    line_ids:
-      - company_id: base.main_company
-        product_id: product_product_mob1
-        product_qty: 10.0
-        product_uom_id: product.product_uom_unit
-    name: TE00009
-- 
-  Initially purchase requisition is in draft state.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
-    - state == 'draft'  
-- 
-  Copy purchase requisition which is in draft state than confirm and Done it.
--
-  !python {model: purchase.requisition}: |
-    copy_id = self.copy(cr, uid, ref("purchase_requisition_te0"))   
-    self.tender_cancel(cr, uid, [copy_id], context=None)
-    self.tender_reset(cr, uid, [copy_id], context=None)
-    self.tender_in_progress(cr, uid, [copy_id], context=None)
-    self.tender_done(cr, uid, [copy_id], context=None)
-- 
-  I confirm the purchase requisition for MOB1.
-- 
-  !python {model: purchase.requisition}: |
-    self.tender_in_progress(cr, uid, [ref("purchase_requisition_te0")])
--
-  I check that the purchase requisition which was initially in the draft state has transmit to In Progress after confirm it.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
-    - state == 'in_progress'
-- 
-  In order to create a purchase order for 'Axelor', i click on the wizard 'Request a Quotation' and create record for wizard.
-- 
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-    partner_address_id: base.res_partner_address_3000
-    partner_id: base.res_partner_desertic_hispafuentes
-- 
-  I click on 'Create Quotation' for creating PO.
-- 
-  !python {model: purchase.requisition.partner}: |
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"active_model": "purchase.requisition",
-      "active_ids": [ref("purchase_requisition_te0")],"active_id": ref("purchase_requisition_te0"), })
--
-  I confirm the purchase order of Axelor.
--
-  !python {model: purchase.order}: |
-    purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")   
-    if purchase_id:
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
--
-  I check that Quotation of Axelor is Approved.
--        
-  !python {model: purchase.order}: |
-   purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])[0]
-   state=self.browse(cr,uid,purchase_id).state
-   assert (state=='approved')
-- 
-  I click on Done button
-- 
-  !python {model: purchase.requisition}: |
-    self.tender_done(cr, uid, [ref("purchase_requisition_te0")],)
--
-  I check that after click on Done button state is in done.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
-    - state == 'done'
--
-  In order to test the purchase requisition flow for Requisition Type is exclusive 
-- 
-  I create purchase requisition for Requisition Type is exclusive 
-- 
-  !record {model: purchase.requisition, id: purchase_requisition_ex1}:
-    company_id: base.main_company
-    exclusive: exclusive
-    line_ids:
-      - company_id: base.main_company
-        product_id: product_product_mob1
-        product_qty: 10.0
-        product_uom_id: product.product_uom_unit
-    name: TE000010
-- 
-   I Create a First Purchase Order for the supplier 'Distrib PC'.
-- 
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_1}:
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-- 
-  I create Quotations For supplier 'Distrib PC'.
-- 
-  !python {model: purchase.requisition.partner}: |
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_1")], {"active_model": "purchase.requisition",
-      "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })    
-- 
-   I Create a Second Purchase Order for the supplier ASUStek.
-- 
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_2}:
-    partner_address_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-- 
-  I create Quotations For supplier 'ASUStek'.
-- 
-  !python {model: purchase.requisition.partner}: |
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_2")], {"active_model": "purchase.requisition",
-      "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })
-- 
-  I check that Initially purchase requisition is draft state.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
-    - state == 'draft'  
--
-  I confirm the Second purchase order of ASUStek, than check that Quotation is Approved.
--
-  !python {model: purchase.order}: |
-    purchase_id= self.search(cr, uid, [('partner_id','=',ref("base.res_partner_asus")),('requisition_id','=',ref("purchase_requisition_ex1"))])
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")   
-    if purchase_id:
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
-    state=self.browse(cr,uid,purchase_id[0]).state
-    assert (state=='approved')
-    
--
-  I check that Quotation of Distrib PC is cancelled.
--        
-  !python {model: purchase.order}: |
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','=',ref("purchase_requisition_ex1"))])[0]
-   state=self.browse(cr,uid,purchase_id).state
-   assert (state=='cancel')
--
-  I check that Purchase Requisition is Done.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
-    - state == 'done'
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 766e0adb75a..043ed749f4b 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import time
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
 from osv import fields, osv
 from osv.orm import browse_record, browse_null
 from tools.translate import _
@@ -31,7 +29,7 @@ class purchase_requisition_partner(osv.osv_memory):
     _description = "Purchase Requisition Partner"
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
+        'partner_address_id':fields.many2one('res.partner.address', 'Address'),
     }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -42,7 +40,7 @@ class purchase_requisition_partner(osv.osv_memory):
         tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
         if not tender.line_ids:
             raise osv.except_osv(_('Error!'), _('No Product in Tender'))
-        True
+        return res
 
     def onchange_partner_id(self, cr, uid, ids, partner_id):
         if not partner_id:
@@ -52,94 +50,9 @@ class purchase_requisition_partner(osv.osv_memory):
         return {'value':{'partner_address_id': addr['default']}}
 
     def create_order(self, cr, uid, ids, context=None):
-        """
-             To Create a purchase orders .
-
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs
-             @param context: A standard dictionary
-             @return: {}
-
-        """
-        if context is None:
-            context = {}
-        record_ids = context and context.get('active_ids', False)
-        if record_ids:
-            data =  self.browse(cr, uid, ids,context=context)[0]
-            company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
-            order_obj = self.pool.get('purchase.order')
-            order_line_obj = self.pool.get('purchase.order.line')
-            partner_obj = self.pool.get('res.partner')
-            tender_line_obj = self.pool.get('purchase.requisition.line')
-            pricelist_obj = self.pool.get('product.pricelist')
-            prod_obj = self.pool.get('product.product')
-            tender_obj = self.pool.get('purchase.requisition')
-            acc_pos_obj = self.pool.get('account.fiscal.position')
-            partner_id = data.partner_id.id
-            supplier_data = data.partner_id
-            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
-            list_line=[]
-            purchase_order_line={}
-            for tender in tender_obj.browse(cr, uid, record_ids, context=context):
-                for supp_record in tender.purchase_ids:
-                    if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel':
-                         raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state)
-                for line in tender.line_ids:
-                    partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
-                    partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
-                    uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
-
-                    if tender.date_start:
-                        newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
-                    else:
-                        newdate = datetime.today() - relativedelta(days=company.po_lead)
-                    delay = partner_rec and partner_rec.delay or 0.0
-                    if delay:
-                        newdate -= relativedelta(days=delay)
-
-                    partner = partner_rec and partner_rec.name or supplier_data
-                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
-                    price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
-                    product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
-                    location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
-
-                    purchase_order_line= {
-                            'name': product.partner_ref,
-                            'product_qty': line.product_qty,
-                            'product_id': line.product_id.id,
-                            'product_uom': uom_id,
-                            'price_unit': price,
-                            'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                            'notes': product.description_purchase,
-                    }
-                    taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id
-                    taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
-                    purchase_order_line.update({
-                            'taxes_id': [(6,0,taxes)]
-                        })
-                    list_line.append(purchase_order_line)
-                purchase_id = order_obj.create(cr, uid, {
-                            'origin': tender.purchase_ids and tender.purchase_ids[0].origin or tender.name,
-                            'partner_id': partner_id,
-                            'partner_address_id': address_id,
-                            'pricelist_id': pricelist_id,
-                            'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,
-                            'company_id': tender.company_id.id,
-                            'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
-                            'requisition_id':tender.id,
-                            'notes':tender.description,
-                            'warehouse_id':tender.warehouse_id.id and tender.warehouse_id.id ,
-                            'location_id':location_id,
-                            'company_id':tender.company_id.id,
-                })
-                order_ids=[]
-                for order_line in list_line:
-                    order_line.update({
-                            'order_id': purchase_id
-                        })
-                    order_line_obj.create(cr,uid,order_line)
+        active_ids = context and context.get('active_ids', [])
+        data =  self.browse(cr, uid, ids, context=context)[0]
+        self.pool.get('purchase.requisition').make_purchase_order(cr, uid, active_ids, data.partner_id.id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 purchase_requisition_partner()
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 77b37fd507b..45af2e956b8 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -25,6 +25,7 @@
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
+    "complexity" : "expert",
     "category": "Tools",
     "description": """
 Installer for reporting Hidden.
diff --git a/addons/report_designer/i18n/hr.po b/addons/report_designer/i18n/hr.po
new file mode 100644
index 00000000000..1f88aa3288c
--- /dev/null
+++ b/addons/report_designer/i18n/hr.po
@@ -0,0 +1,107 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 07:38+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+#: view:report_designer.installer:0
+msgid "Reporting Tools Configuration"
+msgstr "Konfiguracija alata za izvještavanje"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Kreiranje upita"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "Postavke"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr "report_designer.installer"
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "Dizajner OpenOffice izvještaja"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "Alati za izvještavanje"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid ""
+"OpenERP's built-in reporting abilities can be improved even further with "
+"some of the following applications"
+msgstr ""
+"OpenERP ugrađene mogućnosti mogu se dodatno nadograditi sa sljedećim "
+"aplikacijama"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "Konfiguriraj alate za izvještavanje"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr ""
+"Dozvoljava vam kreiranje statističkih izvješća na nekoliko objekata. Radi se "
+"o SQL kreatoru upita i pregledniku za kranje korisnike."
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid ""
+"Adds wizards to Import/Export .SXW report which you can modify in "
+"OpenOffice.Once you have modified it you can upload the report using the "
+"same wizard."
+msgstr ""
+"Dodaje asistenta za uvoz/izvoz .SXW izvještaja koje možete mijenjati u "
+"OpenOfficeu. Kada ga promjenite možete uploadati izvještaj koristeći isti "
+"asistent."
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"Instaler za odabir alata za izvještanje.\n"
+"    "
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
diff --git a/addons/report_designer/security/ir.model.access.csv b/addons/report_designer/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/report_designer/security/ir.model.access.csv
+++ b/addons/report_designer/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index f59d76ed536..942b8e19b72 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1
-"access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0
-"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
-"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
-"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_intrastat_code,report.intrastat.code,model_report_intrastat_code,account.group_account_manager,1,1,1,1
+access_report_intrastat,report.intrastat,model_report_intrastat,account.group_account_manager,1,0,0,0
+access_report_intrastat_code_sale_manager,report.intrastat.code sale manager,model_report_intrastat_code,base.group_sale_manager,1,1,1,1
+access_report_intrastat_code_purchase_manager,report.intrastat.code purchase manager,model_report_intrastat_code,purchase.group_purchase_manager,1,1,1,1
+access_report_intrastat_code_stock_manager,report.intrastat.code stock manager,model_report_intrastat_code,stock.group_stock_manager,1,1,1,1
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 5db184a8c58..f186593e91b 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -84,7 +84,7 @@ TODO
     "version" : "0.9",
     "depends" : ["base"],
     "author" : "Camptocamp",
-    "category": "Tools", # i.e a technical module, not shown in Application install menu
+    "category": "Reporting", # i.e a technical module, not shown in Application install menu
     "url": "http://http://www.camptocamp.com/",
     "data": [ "security/ir.model.access.csv",
               "data.xml",
diff --git a/addons/report_webkit/i18n/hr.po b/addons/report_webkit/i18n/hr.po
new file mode 100644
index 00000000000..01ec38be92b
--- /dev/null
+++ b/addons/report_webkit/i18n/hr.po
@@ -0,0 +1,613 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-11 21:52+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "WebKit Header"
+msgstr "Zaglavlje Webkita"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Predložak Webkita (koristi se ako datoteka izvještaja nije nađena)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Header IMG"
+msgstr ""
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "Webkit izvršna putanja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Vrsta slike (png,gif,jpeg)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:97
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr "putanja do Wkhtmltopdf nije apsolutna"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr "B7  21  88 x 125 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
+#: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
+#, python-format
+msgid "Webkit render"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:67
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company form."
+msgstr ""
+"Molim instalirajte izvršnu datoteku u vaš sustav'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) ili "
+"skinite odavde:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list i postavite'+\n"
+"                             ' putanju do izvršne datoteke na formi "
+"organizacije."
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Naziv slike"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:91
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+"Pogrešna Wkhtmltopdf putanja postavljena u organizaciji'+\n"
+"                                'Odabrana putanja nije izvršna datoteka ili "
+"je putanja pogrešna"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:166
+#, python-format
+msgid "Webkit raise an error"
+msgstr "Webkit je uzrokovao grešku"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr "ir.header_webkit"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Header HTML"
+msgstr "HTML zaglavlja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr "B2  17  500 x 707 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr "ir.header_img"
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr "A0  5   841 x 1189 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr "C5E 24  163 x 229 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:134
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Veze klijentskih radnji"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "Raspložive slike"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr "zaglavlje webkita"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr "B1  15  707 x 1000 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr "A1  6   594 x 841 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "zaglavlje povezano s izvještajem"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:78
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr "Wkhtmltopdf library putanja nije povezana s organizacijom"
+
+#. module: report_webkit
+#: model:ir.module.module,description:report_webkit.module_meta_information
+msgid ""
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"The module allows:\n"
+"    -HTML report definition\n"
+"    -Multi header support \n"
+"    -Multi logo\n"
+"    -Multi company support\n"
+"    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    -JavaScript support \n"
+"    -Raw HTML debugger\n"
+"    -Book printing capabilities\n"
+"    -Margins definition \n"
+"    -Paper size definition\n"
+"and much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company\n"
+"\n"
+"The library to install can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you "
+"need to set the\n"
+"path to the wkthtmltopdf executable file on the Company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"\n"
+"TODO :\n"
+"JavaScript support activation deactivation\n"
+"Collated and book format support\n"
+"Zip return for separated PDF\n"
+"Web client WYSIWYG\n"
+"                    "
+msgstr ""
+"Ovaj modul dodaje novu izvještajnu platformu na Webkit library (wkhtmltopdf) "
+"za podršku izvještajima dizajniranim u HTML + CSS.\n"
+"Struktura modula i dio koda je inspiriran sa modulom report_openoffice.\n"
+"Modul omogućuje:\n"
+"    -Definicije HTML izvještaja\n"
+"    -Podršku za više zaglavlja\n"
+"    -Više loga\n"
+"    -Podrušku za više kompanija\n"
+"    -Podršku za HTML i CSS-3 (U granicama WebKIT verzije)\n"
+"    -Podršku za JavaScript\n"
+"    -Debuger za HTML\n"
+"    -Mogućnost ispisa knjiga\n"
+"    -Definiranje margina\n"
+"    -Definiranje veličine papira\n"
+"i još mnogo toga\n"
+"\n"
+"Višestruka zaglavlja i loga se mogu definirati po organizaciji.\n"
+"Stilovi CSS-a, tijela zaglavlja i podnožja se definiraju po organizaciji\n"
+"Library za instalaciju se može naći ovdje\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"Sistemski library je dobavljiv za Linux, Mac OS X i386 i Windows 32.\n"
+"\n"
+"Nakon instalacije wkhtmltopdf library na OpenERP poslužitelju, morate "
+"postaviti putanju \n"
+"do izvršne datoteke wkthtmltopdf na organizaciji.\n"
+"\n"
+"Za primjer izvještaja pogledajte modul webkit_report_sample i sljedeći "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"\n"
+"TODO :\n"
+"Podrška za aktivaciju deaktivaciju JavaScripta\n"
+"\n"
+"Podrška za razvrstavanje i knjižni format\n"
+"Zip povrat za odvojeni PDF\n"
+"Web klijent WYSIWYG\n"
+"                    "
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "Webkit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Odaberite odgovarajuću veličinu papira"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Content and styling"
+msgstr "Sadržaj i stilsko oblikovanje"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr "A7  11  74 x 105 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr "A6  10  105 x 148 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr ""
+"Ovaj predložak će se koristiti ako glavna datoteka izvještaja nije pronađena"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Gornja margina (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:261
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "Molim postavite zaglavlje u postavkama organizacije"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "_U redu"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+"Označite ovo za dodavanje akcije ispisa za ovaj izvještaj na bočnoj traci "
+"odgovarajuće vrste dokumenta"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr "B3  18  353 x 500 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "Omogući debuger webkit platforme"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Raspoloživ html"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+"Označi ovo da bi pogledali novododanu internu akciju ispisa nakon kreiranja "
+"(tehnički pogled) "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Slike"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Portret"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Pejzažno"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "page setup"
+msgstr "postava stranice"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr "B8  22  62 x 88 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr "A2  7   420 x 594 mm"
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Dodaj gumb za ispis"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr "A9  13  37 x 52 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "Donja margina (mm)"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "Webkit akcije"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "Otvori dodanu akciju"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Desna margina (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orijentacija"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "Postavi zaglavlje  Webkit izvještaja"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Veličina papira"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ":B10    16  31 x 44 mm"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "Zaglavlje CSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr "B4  19  250 x 353 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr "A3  8   297 x 420 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:240
+#, python-format
+msgid ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('No header defined for this Webkit report!"
+msgstr ""
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid "Complete (Absolute) path to the wkhtmltopdf executable."
+msgstr "Dovrši (apsolutnu) putanju do izvršen datoteke wkhtmltopdf"
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "podnožje webkita"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr "Webkit debug"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr "B0  14  1000 x 1414 mm"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Predložak Webkita"
+
+#. module: report_webkit
+#: model:ir.module.module,shortdesc:report_webkit.module_meta_information
+msgid "Webkit Report Engine"
+msgstr "Platforma Webkit izvještaja"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr "A5  9   148 x 210 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr "A8  12  52 x 74 mm"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "Dodaj gumbe za ispis"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr "Comm10E 25  105 x 241 mm, U.S. normalna 10 omotnica"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:255
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "Predložak Webkit izvještaja nije pronađen"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Lijeva margina (mm)"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Zaglavlja"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "Postavi podnožje Webkit izvještaja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr "B9  23  33 x 62 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/addons/report_webkit/security/ir.model.access.csv b/addons/report_webkit/security/ir.model.access.csv
index 6c626f9873e..4ad8b3ae2be 100644
--- a/addons/report_webkit/security/ir.model.access.csv
+++ b/addons/report_webkit/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,1,,1,
-"access_ir_header_img","ir.header_img","model_ir_header_img",,1,,1,
-\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_header_webkit,ir.header_webkit,model_ir_header_webkit,,1,,1,
+access_ir_header_img,ir.header_img,model_ir_header_img,,1,,1,
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index 9fb1f713d24..bad0e3279ed 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -43,7 +43,7 @@ You have to create the print buttons by calling the wizard. For more details see
                     """,
     "version" : "0.9",
     "depends" : ["base", "account", "report_webkit"],
-    "category": "Tools",
+    "category": "Reporting",
     "author" : "Camptocamp SA - NBessi",
     "url": "http://www.camptocamp.com/",
     "data": ["report_webkit_html_view.xml",
diff --git a/addons/report_webkit_sample/i18n/hr.po b/addons/report_webkit_sample/i18n/hr.po
new file mode 100644
index 00000000000..184eca13c99
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/hr.po
@@ -0,0 +1,153 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-11 20:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "WebKit račun"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:35
+msgid "Supplier Invoice"
+msgstr "Ulazni račun"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: report_webkit_sample
+#: model:ir.module.module,description:report_webkit_sample.module_meta_information
+msgid ""
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"\n"
+"    A sample invoice report is included in this module, as well as a wizard "
+"to\n"
+"    add Webkit Report entries on any Document in the system.\n"
+"      \n"
+"    You have to create the print buttons by calling the wizard. For more "
+"details see:\n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
+msgstr ""
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"Primjeri Webkit izvještajne platforme (report_webkit modul).\n"
+"\n"
+"    U modul je uključen primjer izvještaja računa, kao i asistent za \n"
+"    dodavanje stavaka Webkit izvještaja na bilo koji dokument u sustavu.\n"
+"\n"
+"    Morate kreirati gumbe za ispis pozivajući asistenta. Za više detalja "
+"pogledajte: \n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
+
+#. module: report_webkit_sample
+#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
+msgid "Webkit Report Samples"
+msgstr "Primjeri Webkit izvještaja"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:22
+msgid "Fax"
+msgstr "Fax"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Document"
+msgstr "Dokument"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Description"
+msgstr "Opis"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Price"
+msgstr "Cijena"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Invoice Date"
+msgstr "Datum računa"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "QTY"
+msgstr "Kol."
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:64
+msgid "Base"
+msgstr "Osnovica"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Partner Ref."
+msgstr "Partnerova oznaka"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:64
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:28
+msgid "VAT"
+msgstr "PDV"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:37
+msgid "Refund"
+msgstr "Povrat"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:19
+msgid "Tel"
+msgstr "Tel"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:25
+msgid "E-mail"
+msgstr "E-pošta"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:33
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:39
+msgid "Supplier Refund"
+msgstr "Odobrenje dobavljača"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:76
+msgid "Total"
+msgstr "Ukupno"
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 2b8c27359d8..c8b60448c75 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     "website" : "http://www.openerp.com",
     "description": """
 Module for resource management.
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index 4e113fd9f49..8f18314bc61 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-10 16:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-11 19:39+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,27 +23,29 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Ako je prazno, ovo je generički praznik za organizaciju. Ako je resurs "
+"postavljen, praznik/odsustvo je samo za taj resurs."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Friday"
-msgstr ""
+msgstr "petak"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
-msgstr ""
+msgstr "Tip resursa"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalji o odsustvu"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -51,59 +53,60 @@ msgstr ""
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
-msgstr ""
+msgstr "četvrtak"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Sunday"
-msgstr ""
+msgstr "Nedelja"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
-msgstr ""
+msgstr "Pretraži resurse"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_resource_tree
 #: view:resource.resource:0
 msgid "Resources"
-msgstr ""
+msgstr "Resursi"
 
 #. module: resource
 #: field:resource.calendar,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Voditelj radne grupe"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Radno vrijeme počinje od"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Greška! Datum početka odsustva mora biti manji od završnog datuma odsustva"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Kalendar resursa"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -112,48 +115,48 @@ msgstr ""
 #: view:resource.resource:0
 #: field:resource.resource,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Material"
-msgstr ""
+msgstr "Materijal"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
 msgid "Day of week"
-msgstr ""
+msgstr "Dan u tjednu"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Radno vrijeme će završiti u"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Pretraži radno vrijeme"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
-msgstr ""
+msgstr "Razlog"
 
 #. module: resource
 #: view:resource.resource:0
 #: field:resource.resource,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -163,7 +166,7 @@ msgstr ""
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
@@ -177,7 +180,7 @@ msgstr ""
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -186,7 +189,7 @@ msgstr ""
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: resource
 #: model:ir.module.module,description:resource.module_meta_information
@@ -200,11 +203,21 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Module for resource management\n"
+"    Modul za upravljanje resursima\n"
+"     Resurs predstavlja nešto što može biti dodjeljeno\n"
+"     (programer na zadataku ili proizvodni centar na radnom nalogu "
+"proizvodnje).\n"
+"     Ovaj modul upravlja kalendarom resursa dodjeljenom svakom resursu.\n"
+"     Također upravlja odsustvima svih resursa.\n"
+"\n"
+"    "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Srijeda"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -216,12 +229,12 @@ msgstr ""
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detalji resursa"
 
 #. module: resource
 #: field:resource.resource,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: resource
 #: help:resource.resource,active:0
@@ -229,11 +242,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Ako je ovo polje postavljeno na NE, moežte sakriti resurs bez da ga uklonite."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Kalendar resursa"
 
 #. module: resource
 #: help:resource.resource,user_id:0
@@ -253,17 +267,17 @@ msgstr ""
 #. module: resource
 #: field:resource.resource,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Ponedjeljak"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Radi do"
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
@@ -273,27 +287,31 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Ovo polje prikazuje efikasnost svakog resursa u izvršavanju zadataka. Npr. "
+"resurs se ostavi sam na 5 dana, sa 5 dodjeljenih zadataka. Predefinirano se "
+"prikazuje opterećenje od 100%, ali ako stavimo efikasnost od 200%, tada je "
+"njegovo opterećenje samo 50%."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorak"
 
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -302,45 +320,48 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Resursi vam omogućuju kreiranje i upravljanje resursima koji trebaju biti "
+"uključeni u neku fazu projekta. Također možete postaviti njihovu razinu "
+"efikasnosti i opterećenje na osnovi njihovih tjednih radnih sati."
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
-msgstr ""
+msgstr "Neaktivan"
 
 #. module: resource
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(odmor)"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency factor"
-msgstr ""
+msgstr "Faktor efikasnosti"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Human"
-msgstr ""
+msgstr "Čovjek"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Detalj posla"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: code:addons/resource/resource.py:246
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Subota"
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 576ee965121..533ad419274 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -1,8 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_resource_calendar","resource.calendar","model_resource_calendar","base.group_system",1,1,1,1
-"access_resource_calendar_attendance","resource.calendar.attendance","model_resource_calendar_attendance","base.group_system",1,1,1,1
-"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,0,0,0
-"access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
-"access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
-
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_resource_calendar,resource.calendar,model_resource_calendar,base.group_system,1,1,1,1
+access_resource_calendar_attendance,resource.calendar.attendance,model_resource_calendar_attendance,base.group_system,1,1,1,1
+access_resource_resource,resource.resource,model_resource_resource,base.group_system,1,0,0,0
+access_resource_resource_all,resource.resource all,model_resource_resource,,1,0,0,0
+access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 8b5ae108f72..dc86b22b40f 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -102,6 +102,7 @@ Dashboard for Sales Manager that includes:
     ],
     'installable': True,
     'active': False,
+    'application': True,
     'certificate': '0058103601429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9c3ba5d5200..9f53b5cfd24 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -206,8 +206,8 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
-        'date_order': fields.date('Ordered Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
+            ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+        'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3610d2d5e9e..0fec240b127 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -84,7 +84,6 @@
                 <tree string="Sales Orders" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
                     <field name="name"/>
                     <field name="date_order"/>
-                    <field name="client_order_ref" groups="base.group_extended"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
@@ -259,7 +258,8 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name"
+                        filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
                     <field name="user_id">
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 22517bca44c..25d063d49e9 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,70 +1,60 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
-"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
-"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
-"access_sale_order_line_accountant","sale.order.line accountant","model_sale_order_line","account.group_account_user",1,1,0,0
-"access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
-"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
-"access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
-"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,0
-"access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","base.group_sale_salesman",1,0,0,0
-"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","base.group_sale_salesman",1,1,1,0
-"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","base.group_sale_salesman",1,1,1,0
-"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","base.group_sale_salesman",1,1,1,0
-"access_stock_move_manager","stock_move manager","stock.model_stock_move","base.group_sale_manager",1,1,1,1
-"access_procurement_salesman","procurement.order salesman","procurement.model_procurement_order","base.group_sale_salesman",1,1,1,0
-"access_procurement_manager","procurement.order manager","procurement.model_procurement_order","base.group_sale_manager",1,1,1,1
-"access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
-"access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
-"access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,1,1,1
-"access_sale_order_accountant","sale.order.accountant","model_sale_order","account.group_account_user",1,1,0,0
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1
-"access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0
-"access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
-"access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
-"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_manager","res.partner.sale.manager","base.model_res_partner","base.group_sale_manager",1,1,1,0
-"access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
-"access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
-"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
-"access_product_product_sale_user","product.product sale use","product.model_product_product","base.group_sale_salesman",1,0,0,0
-"access_product_template_sale","product.template sale manager","product.model_product_template","base.group_sale_manager",1,0,0,0
-"access_product_product_sale","product.product sale manager","product.model_product_product","base.group_sale_manager",1,0,0,0
-"access_sale_shop_manager","account.journal sale order.user","model_sale_shop","base.group_sale_manager",1,1,1,1
-"access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0
-"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,0,0,0
-"access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
-"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,0,0,0
-"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0
-"access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0
-"access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_stock_warehouse_manager","stock.warehouse.manager","stock.model_stock_warehouse","base.group_sale_manager",1,0,0,0
-"access_product_uom_manager","product.uom.manager","product.model_product_uom","base.group_sale_manager",1,0,0,0
-"access_product_supplierinfo_manager","product.supplierinfo.manager","product.model_product_supplierinfo","base.group_sale_manager",1,0,0,0
-"access_product_packaging_manager","product.packaging.manager","product.model_product_packaging","base.group_sale_manager",1,0,0,0
-"access_stock_location_manager","stock.location.manager","stock.model_stock_location","base.group_sale_manager",1,0,0,0
-"access_stock_warehouse_user","stock.warehouse.user","stock.model_stock_warehouse","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_manager","res.partner.bank.type.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
-"access_res_partner_bank_type_user","res.partner.bank.type.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
-"access_stock_location_user","stock.location.user","stock.model_stock_location","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_field_user","res.partner.bank.type.field.user","base.model_res_partner_bank_type_field","base.group_sale_salesman",1,0,0,0
-"access_product_uom_user","product.uom.user","product.model_product_uom","base.group_sale_salesman",1,0,0,0
-"access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
-"access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
-"access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
-"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,0,0,0
-"access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
-"access_product_uom_categ_sale_manager","product.uom.categ salemanager","product.model_product_uom_categ","base.group_sale_manager",1,1,1,1
-"access_product_uom_sale_manager","product.uom salemanager","product.model_product_uom","base.group_sale_manager",1,1,1,1
-"access_product_ul_sale_manager","product.ul salemanager","product.model_product_ul","base.group_sale_manager",1,1,1,1
-"access_product_category_sale_manager","product.category salemanager","product.model_product_category","base.group_sale_manager",1,1,1,1
-"access_product_packaging_sale_manager","product.packaging salemanager","product.model_product_packaging","base.group_sale_manager",1,1,1,1
-"access_product_supplierinfo_sale_manager","product.supplierinfo salemanager","product.model_product_supplierinfo","base.group_sale_manager",1,1,1,1
-"access_pricelist_partnerinfo_sale_manager","pricelist.partnerinfo salemanager","product.model_pricelist_partnerinfo","base.group_sale_manager",1,1,1,1
-"access_product_price_type_sale_manager","product.price.type salemanager","product.model_product_price_type","base.group_sale_manager",1,1,1,1
-"access_product_pricelist_type_sale_manager","product.pricelist.type salemanager","product.model_product_pricelist_type","base.group_sale_manager",1,1,1,1
-"access_product_pricelist_sale_manager","product.pricelist salemanager","product.model_product_pricelist","base.group_sale_manager",1,1,1,1
-"access_ir_property_group_sale_manager","ir_property group_sale_manager","base.model_ir_property","base.group_sale_manager",1,1,1,1
-"access_product_group_res_partner_sale_manager","res_partner group_sale_manager","base.model_res_partner","base.group_sale_manager",1,1,1,0
-"access_product_pricelist_version_sale_manager","product.pricelist.version sale_manager","product.model_product_pricelist_version","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_shop,sale.shop,model_sale_shop,base.group_user,1,0,0,0
+access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
+access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
+access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0
+access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0
+access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,1,1,0
+access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,1,1,1
+access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0
+access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0
+access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0
+access_stock_picking_salesman,stock_picking salesman,stock.model_stock_picking,base.group_sale_salesman,1,1,1,0
+access_stock_move_salesman,stock_move salesman,stock.model_stock_move,base.group_sale_salesman,1,1,1,0
+access_stock_move_manager,stock_move manager,stock.model_stock_move,base.group_sale_manager,1,1,1,1
+access_procurement_salesman,procurement.order salesman,procurement.model_procurement_order,base.group_sale_salesman,1,1,1,0
+access_procurement_manager,procurement.order manager,procurement.model_procurement_order,base.group_sale_manager,1,1,1,1
+access_sale_order_stock_worker,sale.order stock worker,model_sale_order,stock.group_stock_user,1,1,0,0
+access_sale_order_line_stock_worker,sale.order.line stock worker,model_sale_order_line,stock.group_stock_user,1,1,0,0
+access_sale_order_manager,sale.order.manager,model_sale_order,base.group_sale_manager,1,1,1,1
+access_sale_order_accountant,sale.order.accountant,model_sale_order,account.group_account_user,1,1,0,0
+access_sale_report_salesman,sale.report,model_sale_report,base.group_sale_salesman,1,1,1,0
+access_sale_report_manager,sale.report,model_sale_report,base.group_sale_manager,1,1,1,1
+access_ir_property_sales,ir.property.sales,base.model_ir_property,base.group_sale_salesman,1,1,1,1
+access_sale_account_journal,account.journal sale order.user,account.model_account_journal,base.group_sale_salesman,1,0,0,0
+access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,base.group_sale_salesman,1,0,0,0
+access_res_partner_sale_manager,res.partner.sale.manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
+access_report_stock_move_sales,report.stock.move.sale,stock.model_report_stock_move,base.group_sale_manager,1,1,1,1
+access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,base.group_sale_manager,1,1,1,1
+access_product_template_sale_user,product.template sale use,product.model_product_template,base.group_sale_salesman,1,0,0,0
+access_product_product_sale_user,product.product sale use,product.model_product_product,base.group_sale_salesman,1,0,0,0
+access_sale_shop_manager,account.journal sale order.user,model_sale_shop,base.group_sale_manager,1,1,1,1
+access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_sale_salesman,1,0,0,0
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_sale_salesman,1,0,0,0
+access_account_tax_user,account.tax.user,account.model_account_tax,base.group_sale_salesman,1,0,0,0
+access_product_packaging_user,product.packaging.user,product.model_product_packaging,base.group_sale_salesman,1,1,1,0
+access_ir_attachment_sales,ir.attachment.sales,base.model_ir_attachment,base.group_sale_salesman,1,1,1,0
+access_ir_attachment_manager,ir.attachment.manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
+access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,base.group_sale_manager,1,0,0,0
+access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
+access_res_partner_bank_type_user,res.partner.bank.type.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
+access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_sale_salesman,1,0,0,0
+access_res_partner_bank_type_field_user,res.partner.bank.type.field.user,base.model_res_partner_bank_type_field,base.group_sale_salesman,1,0,0,0
+access_product_uom_user,product.uom.user,product.model_product_uom,base.group_sale_salesman,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
+access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_product_pricelist,base.group_sale_salesman,1,0,0,0
+access_account_account_salesman,account_account salesman,account.model_account_account,base.group_sale_salesman,1,0,0,0
+access_sale_shop_sale_user,sale.shop.sale.user,model_sale_shop,base.group_sale_salesman,1,0,0,0
+access_sale_shop_sale_manager,sale.shop.sale.manager,model_sale_shop,base.group_sale_manager,1,1,1,1
+access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,base.group_sale_manager,1,1,1,1
+access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,base.group_sale_manager,1,1,1,1
+access_product_ul_sale_manager,product.ul salemanager,product.model_product_ul,base.group_sale_manager,1,1,1,1
+access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1
+access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,base.group_sale_manager,1,1,1,1
+access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
+access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
+access_product_price_type_sale_manager,product.price.type salemanager,product.model_product_price_type,base.group_sale_manager,1,1,1,1
+access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,product.model_product_pricelist_type,base.group_sale_manager,1,1,1,1
+access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1
+access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
+access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 453a51fc724..5401ad42967 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Sales Management',
     'description': """
 The base module to manage analytic distribution and sales orders.
 =================================================================
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 9d383a4ac28..b34e8880a10 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -9,22 +9,8 @@
             <field name="arch" type="xml">
             <xpath expr="/form/board/column/action[@string='My Quotations']" position="before">
                 <action name="%(crm.act_my_oppor)d"
-                     string="My Open Opportunities"
+                     string="My Opportunities"
                      />
-                     <!--groups="base.group_sale_salesman,base.group_sale_manager"-->
-            </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.board_sales_form"/>
-            <field name="arch" type="xml">
-            <xpath expr="/form/board/column/action[@string='My Quotations']" position="after">
-                <action name="%(crm.act_my_meetings)d"
-                     string="My Meetings"/>
             </xpath>
             </field>
         </record>
@@ -39,7 +25,6 @@
                 <action name="%(crm.act_my_oppor_stage)d"
                      string="My Planned Revenues by Stage"
                      />
-                     <!--groups="base.group_sale_salesman,base.group_sale_manager"-->
             </xpath>
             </field>
         </record>
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 9ad402a8321..8b12b395e48 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -7,48 +7,48 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:21+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 07:09+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr "Stranka"
+msgstr "Kupac"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Pretvori u ponudu"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "Prilika '%s' je pretvorena u ponudu."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Nedovoljno podataka!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Kupac nema definiranu adresu"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Napravi prodaju"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -66,81 +66,93 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul pruža prečicu na jednu ili više prilika u CRM-u.\n"
+"Prečica omogućava generiranje prodajnih naloga na osnovi izabranog slučaja.\n"
+"Ako si izabrani različiti slučajevi (lista), generira jedan prodajni nalog "
+"po \n"
+"slučaju.\n"
+"Slučaj je tada zatvoren i povezan sa generiranim prodajnim nalogom.\n"
+"\n"
+"Sugeriramo instalaciju ovo modula ako ste instalirali i prodajni i CRM "
+"modul.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Kreiraj"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Označi ovo da bi se prilika zatvorila nakon kreiranja prodajnog naloga."
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr "Pretvori u Ponudu"
+msgstr "Pretvori u ponudu"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Mjesečni obrtaj"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Pretvoreno u prodajnu ponudu (id: %s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Prilika: %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Kreira prodajnu ponudu iz prilike"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr "Shop"
+msgstr "Trgovina"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Prilike po fazama"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Moje ponude"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Zatvori priliku"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Prodajni tim"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -155,7 +167,7 @@ msgstr "Otkaži"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #~ msgid "Opportunity Analytic"
 #~ msgstr "Analitika prilike"
diff --git a/addons/sale_crm/security/ir.model.access.csv b/addons/sale_crm/security/ir.model.access.csv
index a1bd4896f5f..d4e6eede351 100644
--- a/addons/sale_crm/security/ir.model.access.csv
+++ b/addons/sale_crm/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_invoice_report_salesman","account.invoice.report salesman","account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 1cd2eef2d77..cb54b039222 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -23,7 +23,7 @@
     'name': 'Invoicing Journals',
     'version': '1.0',
     'category': 'Sales Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals.
 ========================================================================================================================
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index cca79e1562a..53083681d93 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:04+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 07:53+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: sale_journal
@@ -25,22 +25,22 @@ msgstr "Bilješka"
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "Vrsta temeljnice korištene za prodaju i prijenos"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Prodaje i Kupnje"
+msgstr "Prodaja i nabava"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -48,6 +48,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na NE, možete sakriti vrstu računa bez da "
+"ga uklonite."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -57,7 +59,7 @@ msgstr "Bilješke"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr "Način Izrade Računa"
+msgstr "Način izrade računa"
 
 #. module: sale_journal
 #: model:ir.module.module,description:sale_journal.module_meta_information
@@ -86,11 +88,35 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul temeljnice u prodaji omogućuje vam kategorizaciju\n"
+"     prodaje i dostava (lista prijenosa) između različitih temeljnica.\n"
+"     Ovaj modul je od pomoći većim organizacijama koje rade po \n"
+"     odjelima.    \n"
+"\n"
+"    Temeljnicu možete koristiti za različite namjene, npr.:\n"
+"    * za izoliranje prodaje različitih odjela\n"
+"    * temljnice za dostavu kamionom ili poštom\n"
+"\n"
+"    Temeljnice imaju odgovornu osobu i različite statuse:\n"
+"    * nacrt, otvoreno, otkazano, završeno.\n"
+"\n"
+"    Grupne operacije se mogu odvijati na različitim temeljnicama\n"
+"    kako bi potvrdili sve prodaje odjednom, potvrdili ili fakturirali "
+"otpremu, ....\n"
+"\n"
+"    Također podržava skupno fakturiranje koje se može konfigurirati po \n"
+"    partnerima ili prodajnim nalozima, npr.:\n"
+"    * dnevno fakturiranje,\n"
+"    * mjesečno fakturiranje, ...\n"
+"\n"
+"    Postoje i neke statistike po temeljnicama.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr "Nije grupirano"
+msgstr ""
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -100,7 +126,7 @@ msgstr "Grupirano"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne pridružene članove."
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -109,16 +135,19 @@ msgid ""
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
 msgstr ""
+"Vrste računa koriste se za partnere, prodajne naloge i dostavnice. Možete "
+"kreirati posebnu temeljnicu za fakturiranje kako bi grupirali fakturiranje "
+"sukladno potrebama kupca: dnevno, svake srijede, mjesečno, itd."
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 msgid "Invoicing method"
-msgstr "Način Izrade Računa"
+msgstr "Način fakturiranja"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -126,7 +155,7 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr "Tip Računa"
+msgstr "Vrsta računa"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
@@ -136,14 +165,14 @@ msgstr "Aktivan"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoice Types"
-msgstr "Tipovi Računa"
+msgstr "Vrste računa"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
@@ -153,7 +182,7 @@ msgstr ""
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr "Upravljanje prodajom i narudžbama prema Pregledu"
+msgstr "Upravljanje prodajom i dostavama po temeljnicama"
 
 #~ msgid "Assigned packing"
 #~ msgstr "Dodijeljeno pakiranje"
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index e4d7ef6f137..afa57440ceb 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-04 09:20+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:02+0000\n"
+"Last-Translator: Paulino Ascenção <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: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -24,7 +24,7 @@ msgstr "Nota"
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "O tipo de diário usado nas vendas e remessas"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index bc1a3b003c3..377e78b8c37 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,1,1,1
-"access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
-"access_sale_journal_invoice_type_salesman","sale_journal.invoice.type salesman","model_sale_journal_invoice_type","base.group_sale_salesman",1,0,0,0
-"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","base.group_sale_manager",1,1,1,1
-"access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_journal_invoice_type_finance_invoice,sale_journal.invoice.type invoice,model_sale_journal_invoice_type,account.group_account_invoice,1,1,1,1
+access_sale_journal_invoice_type_partner_manager,sale_journal.invoice.type partner manager,model_sale_journal_invoice_type,base.group_partner_manager,1,0,0,0
+access_sale_journal_invoice_type_salesman,sale_journal.invoice.type salesman,model_sale_journal_invoice_type,base.group_sale_salesman,1,0,0,0
+access_sale_journal_invoice_type_manager,sale_journal.invoice.type.manager,model_sale_journal_invoice_type,base.group_sale_manager,1,1,1,1
+access_sale_journal_invoice_type_stock_worker,sale_journal.invoice_type stock worker,model_sale_journal_invoice_type,stock.group_stock_user,1,0,0,0
diff --git a/addons/sale_layout/i18n/hr.po b/addons/sale_layout/i18n/hr.po
new file mode 100644
index 00000000000..e88466c8651
--- /dev/null
+++ b/addons/sale_layout/i18n/hr.po
@@ -0,0 +1,302 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-10 08:37+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Međuzbroj"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Ovaj modul omogućuje značajke za poboljšanje naloga u prodaji   \n"
+" \n"
+"    Omogućavam vam: \n"
+"    It gives you the possibility to\n"
+"        * uređivanje svih redaka prodajnog naloga\n"
+"        * dodavanje naslova, komentara i međuzbrojeva\n"
+"        * crtanje hrozontalinih linija i umetanje prijeloma stranica\n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Naziv"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Popust (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Bilješka"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Stavke naloga"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Vrsta rasporeda"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naloga mora biti jedinstvena"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Naš prodavač"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Automatska deklaracija"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Stavke računa"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Ponuda broj"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "PDV"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Napravi račun"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Značajke"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Adresa fakture :"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Raspored naloga u prodaji"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Prijelom stranice"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Adresa otpreme"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Uvjeti plaćanja"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Povijest"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Stavke prodajnog naloga"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Linija za razdvajanje"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Vaša oznaka"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Datum ponude"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Statusi"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Stavke prodajnog naloga"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Nalog s rasporedom"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatne informacije"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Porezi :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Stavka naloga"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Cijena"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Skladišni prijenosi"
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index c7eae6daea2..62f436680fd 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name":"Margins in Sales Orders",
+    "name": "Margins in Sales Orders",
     "version":"1.0",
     "category" : "Sales Management",
     "description": """
diff --git a/addons/sale_margin/i18n/hr.po b/addons/sale_margin/i18n/hr.po
new file mode 100644
index 00000000000..45468a03ef3
--- /dev/null
+++ b/addons/sale_margin/i18n/hr.po
@@ -0,0 +1,415 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-10 07:37+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Kategorija"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Odobrenje kupcu"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Izlazni račun"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "veljača"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Trenutno"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid ""
+" \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the "
+"Unit Price and Cost Price\n"
+"    "
+msgstr ""
+" \n"
+"    Ovaj modul dodaje RUC na prodajni nalog\n"
+"     koji  prikazuje profitabilnost računajući razliku između jedinične "
+"cijene i troška.\n"
+"    "
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+"Daje profitabilnost računajući razliku između jedinične cijene  jediničnog "
+"troška."
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Statistika računa"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naloga mora biti jedinstvena"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Računi po partneru"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "kolovoz"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "svibanj"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "lipanj"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Datum fakturiranja"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "RUC u prodajnim nalozima"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Traži RUC"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Ove godine"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "srpanj"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Prošireni filtri..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Ovaj mjesec"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Cijena koštanja"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "listopad"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "siječanj"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "rujan"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "travanj"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Odobrenje dobavljača"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "ožujak"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "RUC"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "studeni"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Računi po artiklu"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Ulazni račun"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "prosinac"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Stavka računa"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Poništeno"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+"Ovaj izvještaj vam daje pregled svih računa napravljenih u sustavu. Možete "
+"sortirati i grupirati rezultate prema\r\n"
+"specifičnim kriterijima kako bi brzo pronašli ono što tražite."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Izvještaj računa"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Izlazni računi"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Otvoren"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Analiza računa"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
diff --git a/addons/sale_margin/security/ir.model.access.csv b/addons/sale_margin/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/sale_margin/security/ir.model.access.csv
+++ b/addons/sale_margin/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/sale_mrp/i18n/hr.po b/addons/sale_mrp/i18n/hr.po
new file mode 100644
index 00000000000..a48201c1c49
--- /dev/null
+++ b/addons/sale_mrp/i18n/hr.po
@@ -0,0 +1,72 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-10 07:22+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Označi kupčevu referencu iz prodajnog naloga"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Prodajna referenca"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Nalog za proizvodnju"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sales "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+"\n"
+"    Ovaj  modulomogućava korisniku instalaciju MRP i prodajnog modula.\n"
+"     Koristi se kad želimo pratiti radne naloge u proizvodnji nastale iz \n"
+"     prodajnih naloga.     \n"
+"     Dodaje naziv prodaje i prodajnu referencu na nalog za proizvodnju.\n"
+"    "
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Naziv prodaje"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Upravljanje prodajom i MRP"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Količina na nalogu ne smije biti negativna ili nula!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Navedi ime prodajnog naloga"
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index dcfd11c49e8..e863ce80491 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-03 07:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:06+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -44,6 +44,11 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo serve para manter o controle das ordens de\n"
+"    produção geradas a partir de ordens de venda.\n"
+"    Regista o nome e referência da venda na ordem de produção.\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
@@ -53,7 +58,7 @@ msgstr "Nome da Venda"
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "Gestão de vendas e fabrico"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index a504c9a9e5a..a0f117b61e5 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0
-"access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0
-"access_sale_order_manufacturing_user","sale.order manufacturing.user","sale.model_sale_order","mrp.group_mrp_user",1,1,0,0
-"access_sale_order_line_manufacturing_user","sale.order.line manufacturing.user","sale.model_sale_order_line","mrp.group_mrp_user",1,1,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
+access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
+access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index f88a2777a00..72aa496b6bc 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Full Dates on Sales Order',
+    'name': 'Dates on Sales Order',
     'version': '1.0',
     'category': 'Sales Management',
     'complexity': "easy",
diff --git a/addons/sale_order_dates/i18n/hr.po b/addons/sale_order_dates/i18n/hr.po
new file mode 100644
index 00000000000..bb845637559
--- /dev/null
+++ b/addons/sale_order_dates/i18n/hr.po
@@ -0,0 +1,74 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-09 14:35+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naloga mora biti jedinstvena"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Efektivni datum"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Datumi naloga u prodaji"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Traženi datum"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+"Dodaj datum prihvaćanja obveze, traženi i efektivni datum na prodajnom "
+"nalogu.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Datum kada bi trebalo dostaviti artikl."
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 882f0f78e97..8e116fa7adb 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Inventory Management",
+    "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
     'complexity': "easy",
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 66de741c3df..656f0caffd7 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -22,7 +22,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
-            <field name="name">Incoming Products Delay</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -31,7 +31,7 @@
             <field name="context">{'search_default_in':1}</field>
          </record>
         <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
-            <field name="name">Outgoing Products Delay</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -52,8 +52,8 @@
                         </column>
 
                         <column>
-                            <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" creatable="true"/>
-                            <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay" creatable="true"/>
+                            <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products" creatable="true"/>
+                            <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products" creatable="true"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 7d32743d21a..83d3f217828 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-06 15:41+0000\n"
+"PO-Revision-Date: 2011-12-09 16:41+0000\n"
 "Last-Translator: moelyana <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: 2011-11-12 04:50+0000\n"
-"X-Generator: Launchpad (build 14277)\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -81,7 +81,7 @@ msgstr "Produk Bergerak"
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr ""
+msgstr "Analisa Perpindahan"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -2506,7 +2506,7 @@ msgstr "Lihat Stok Produk"
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Internal Picking List"
+msgid "Internal Picking list"
 msgstr "Daftar pengambilan internal"
 
 #. module: stock
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 9e8cc34813f..b11fe36d8d8 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -107,7 +107,7 @@
                         <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
                         <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,stock.group_stock_user"/>
+                            type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
                         <newline/>
                         <field name="virtual_available"/>
                     </group>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 9d4498139bd..2aa889d8174 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,7 +44,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="product_id"/>
-                 <field name="day_diff2" operator="+"/>
+                 <field name="product_qty" operator="+"/>
              </graph>
          </field>
     </record>
@@ -55,7 +55,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="day"/>
-                 <field name="day_diff2" operator="+" string="Delay(Days)"/>
+                 <field name="product_qty" operator="avg"/>
              </graph>
          </field>
     </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index ab1036ea2ea..f65ef8d5e79 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -1,62 +1,58 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_incoterms_all","stock.incoterms all","model_stock_incoterms",,1,0,0,0
-"access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms","stock.group_stock_manager",1,1,1,1
-"access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
-"access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
-"access_stock_location__partner_manager","stock.location.partner.manager","model_stock_location","base.group_partner_manager",1,1,1,1
-"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
-"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
-"access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
-"access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
-"access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
-"access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
-"access_stock_tracking_sales_user","stock.tracking sales.user","model_stock_tracking","base.group_sale_salesman",1,1,1,0
-"access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
-"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,1,0,0
-"access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","stock.group_stock_user",1,1,1,1
-"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1
-"access_stock_move_manager","stock.move manager","model_stock_move","stock.group_stock_manager",1,1,0,0
-"access_stock_move_user","stock.move user","model_stock_move","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_user","stock.inventory user","model_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_manager","stock.inventory manager","model_stock_inventory","stock.group_stock_manager",1,0,0,0
-"access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
-"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
-"access_stock_location_sale_manager","stock.location sale manager","model_stock_location","base.group_sale_manager",1,0,0,0
-"access_stock_location_stock_manager","stock.location stock manager","model_stock_location","stock.group_stock_manager",1,0,0,0
-"access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
-"access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
-"access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
-"access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
-"access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
-"access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
-"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,0,0,0
-"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,0,0,0
-"access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0
-"access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0
-"access_account_invoice_user","account.invoice stock user","account.model_account_invoice","stock.group_stock_user",1,1,1,0
-"access_account_invoice_line_user","account.invoice.line stock user","account.model_account_invoice_line","stock.group_stock_user",1,1,1,0
-"access_account_invoice_tax_user","account.invoice.tax stock user","account.model_account_invoice_tax","stock.group_stock_user",1,1,1,0
-"access_account_journal_user","account.journal stock user","account.model_account_journal","stock.group_stock_user",1,0,0,0
-"access_account_fiscalyear","account.fiscalyear stock user","account.model_account_fiscalyear","stock.group_stock_user",1,0,0,0
-"access_product_pricelist_item_sale_manager","product.pricelist.item salemanager","product.model_product_pricelist_item","base.group_sale_manager",1,1,1,1
-"access_product_uom_categ_stock_manager","product.uom.categ stock_manager","product.model_product_uom_categ","stock.group_stock_manager",1,1,1,1
-"access_product_uom_stock_manager","product.uom stock_manager","product.model_product_uom","stock.group_stock_manager",1,1,1,1
-"access_product_ul_stock_manager","product.ul stock_manager","product.model_product_ul","stock.group_stock_manager",1,1,1,1
-"access_product_category_stock_manager","product.category stock_manager","product.model_product_category","stock.group_stock_manager",1,1,1,1
-"access_product_template_stock_manager","product.template stock_manager","product.model_product_template","stock.group_stock_manager",1,1,1,1
-"access_product_product_stock_manager","product.product stock_manager","product.model_product_product","stock.group_stock_manager",1,1,1,1
-"access_product_packaging_stock_manager","product.packaging stock_manager","product.model_product_packaging","stock.group_stock_manager",1,1,1,1
-"access_product_supplierinfo_stock_manager","product.supplierinfo stock_manager","product.model_product_supplierinfo","stock.group_stock_manager",1,1,1,1
-"access_pricelist_partnerinfo_stock_manager","pricelist.partnerinfo stock_manager","product.model_pricelist_partnerinfo","stock.group_stock_manager",1,1,1,1
-"access_product_price_type_stock_manager","product.price.type stock_manager","product.model_product_price_type","stock.group_stock_manager",1,1,1,1
-"access_product_pricelist_type_stock_manager","product.pricelist.type stock_manager","product.model_product_pricelist_type","stock.group_stock_manager",1,1,1,1
-"access_product_pricelist_stock_manager","product.pricelist stock_manager","product.model_product_pricelist","stock.group_stock_manager",1,1,1,1
-"access_ir_property_group_stock_manager","ir_property group_stock_manager","base.model_ir_property","stock.group_stock_manager",1,1,1,1
-"access_product_group_res_partner_stock_manager","res_partner group_stock_manager","base.model_res_partner","stock.group_stock_manager",1,1,1,0
-"access_product_pricelist_version_stock_manager","product.pricelist.version stock_manager","product.model_product_pricelist_version","stock.group_stock_manager",1,1,1,1
-"access_product_pricelist_item_stock_manager","product.pricelist.item stock_manager","product.model_product_pricelist_item","stock.group_stock_manager",1,1,1,1
-"access_account_account_stock_manager","account.account stock manager","account.model_account_account","stock.group_stock_manager",1,0,0,0
-"access_account_journal_stock_manager","account.journal stock manager","account.model_account_journal","stock.group_stock_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_incoterms_all,stock.incoterms all,model_stock_incoterms,,1,0,0,0
+access_stock_incoterms_manager,stock.incoterms manager,model_stock_incoterms,stock.group_stock_manager,1,1,1,1
+access_stock_warehouse_manager,stock.warehouse.manager,model_stock_warehouse,stock.group_stock_manager,1,1,1,1
+access_stock_warehouse_user,stock.warehouse.user,model_stock_warehouse,base.group_user,1,0,0,0
+access_stock_location__partner_manager,stock.location.partner.manager,model_stock_location,base.group_partner_manager,1,1,1,1
+access_stock_location_manager,stock.location.manager,model_stock_location,stock.group_stock_manager,1,1,1,1
+access_stock_location_user,stock.location.user,model_stock_location,base.group_user,1,0,0,0
+access_stock_journal_user,stock.journal.user,model_stock_journal,base.group_user,1,0,0,0
+access_stock_journal_manager,stock.journal.manager,model_stock_journal,stock.group_stock_manager,1,1,1,1
+access_stock_tracking_user,stock.tracking user,model_stock_tracking,stock.group_stock_user,1,1,1,1
+access_stock_tracking_manager,stock.tracking manager,model_stock_tracking,stock.group_stock_manager,1,0,0,0
+access_stock_tracking_sales_user,stock.tracking sales.user,model_stock_tracking,base.group_sale_salesman,1,1,1,0
+access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,1
+access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,0,0
+access_stock_production_lot_manager,stock.production.lot manager,model_stock_production_lot,stock.group_stock_manager,1,0,0,0
+access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
+access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
+access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
+access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,1
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,1
+access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,0,0,0
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,1
+access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,0,0,0
+access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
+access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
+access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0
+access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lines_date,stock.group_stock_user,1,0,0,0
+access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1
+access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklots,stock.group_stock_user,1,1,1,1
+access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
+access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
+access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
+access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0
+access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,0,0,0
+access_account_invoice_user,account.invoice stock user,account.model_account_invoice,stock.group_stock_user,1,1,1,0
+access_account_invoice_line_user,account.invoice.line stock user,account.model_account_invoice_line,stock.group_stock_user,1,1,1,0
+access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
+access_account_journal_user,account.journal stock user,account.model_account_journal,stock.group_stock_user,1,0,0,0
+access_account_fiscalyear,account.fiscalyear stock user,account.model_account_fiscalyear,stock.group_stock_user,1,0,0,0
+access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1
+access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1
+access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1
+access_product_ul_stock_manager,product.ul stock_manager,product.model_product_ul,stock.group_stock_manager,1,1,1,1
+access_product_category_stock_manager,product.category stock_manager,product.model_product_category,stock.group_stock_manager,1,1,1,1
+access_product_template_stock_manager,product.template stock_manager,product.model_product_template,stock.group_stock_manager,1,1,1,1
+access_product_product_stock_manager,product.product stock_manager,product.model_product_product,stock.group_stock_manager,1,1,1,1
+access_product_packaging_stock_manager,product.packaging stock_manager,product.model_product_packaging,stock.group_stock_manager,1,1,1,1
+access_product_supplierinfo_stock_manager,product.supplierinfo stock_manager,product.model_product_supplierinfo,stock.group_stock_manager,1,1,1,1
+access_pricelist_partnerinfo_stock_manager,pricelist.partnerinfo stock_manager,product.model_pricelist_partnerinfo,stock.group_stock_manager,1,1,1,1
+access_product_price_type_stock_manager,product.price.type stock_manager,product.model_product_price_type,stock.group_stock_manager,1,1,1,1
+access_product_pricelist_type_stock_manager,product.pricelist.type stock_manager,product.model_product_pricelist_type,stock.group_stock_manager,1,1,1,1
+access_product_pricelist_stock_manager,product.pricelist stock_manager,product.model_product_pricelist,stock.group_stock_manager,1,1,1,1
+access_ir_property_group_stock_manager,ir_property group_stock_manager,base.model_ir_property,stock.group_stock_manager,1,1,1,1
+access_product_group_res_partner_stock_manager,res_partner group_stock_manager,base.model_res_partner,stock.group_stock_manager,1,1,1,0
+access_product_pricelist_version_stock_manager,product.pricelist.version stock_manager,product.model_product_pricelist_version,stock.group_stock_manager,1,1,1,1
+access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
+access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
diff --git a/addons/stock/static/src/img/icon.png b/addons/stock/static/src/img/icon.png
new file mode 100644
index 00000000000..a70ccfe18d5
--- /dev/null
+++ b/addons/stock/static/src/img/icon.png
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 63d145136c5..703406e92fd 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -94,6 +94,7 @@ You can use the demo data as follow:
         'stock_location_demo_cpu1.xml',
         'stock_location_demo_cpu3.yml',
     ],
+    'complexity': 'expert',
     'installable': True,
     'test':[
             'test/stock_location_pull_flow.yml',
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index 09773a66893..ebee12cbeae 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -1,15 +1,12 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_pulled_flow_user","product_pulled_flow user","model_product_pulled_flow","stock.group_stock_user",1,0,0,0
-"access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
-"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
-"access_stock_location_path_internal_user","stock location path internal user","model_stock_location_path","base.group_user",1,0,0,0
-"access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
-"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1
-"access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0
-"access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0
-"access_product_pulled_flow_internal","product.pulled.flow internal","model_product_pulled_flow","base.group_user",1,0,0,0
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_pulled_flow_user,product_pulled_flow user,model_product_pulled_flow,stock.group_stock_user,1,0,0,0
+access_product_pulled_flow_manager,product_pulled_flow manager,model_product_pulled_flow,stock.group_stock_manager,1,1,1,1
+access_product_pulled_flow_salemanager,product_pulled_flow salemanager,model_product_pulled_flow,base.group_sale_manager,1,1,1,1
+access_product_pulled_flow_stock_manager,product_pulled_flow stock manager,model_product_pulled_flow,stock.group_stock_manager,1,1,1,1
+access_stock_location_path_user,stock location path user,model_stock_location_path,stock.group_stock_user,1,0,0,0
+access_stock_location_path_internal_user,stock location path internal user,model_stock_location_path,base.group_user,1,0,0,0
+access_stock_location_path_sale_manager,stock.location.path partner salemanager,model_stock_location_path,base.group_sale_manager,1,1,1,1
+access_stock_location_path_stock_user,stock.location.path stock user,model_stock_location_path,stock.group_stock_user,1,1,1,1
+access_stock_location_path,stock.location.path,model_stock_location_path,base.group_sale_salesman,1,0,0,0
+access_product_pulled_flow,product.pulled.flow,model_product_pulled_flow,base.group_sale_salesman,1,0,0,0
+access_product_pulled_flow_internal,product.pulled.flow internal,model_product_pulled_flow,base.group_user,1,0,0,0
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 8b3458e0f73..0b70e84e0a0 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Stock No Auto-Picking',
+    'name': 'Picking Before Manufacturing',
     'version': '1.0',
     "category" : "Warehouse Management",
     'description': """
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index f90fd1b162e..4846c79905f 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning_manager","stock.planning manager","model_stock_planning","stock.group_stock_manager",1,0,0,0
-"access_stock_planning_user","stock.planning user","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_sale_forecast_user","stock.sale.forecast user","model_stock_sale_forecast","base.group_sale_salesman",1,1,1,1
-"access_stock_sale_forecast_manager","stock.sale.forecast manager","model_stock_sale_forecast","base.group_sale_manager",1,0,0,0
-"access_stock_period_manager","stock.period manager","model_stock_period","base.group_sale_salesman",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_planning_manager,stock.planning manager,model_stock_planning,stock.group_stock_manager,1,0,0,0
+access_stock_planning_user,stock.planning user,model_stock_planning,stock.group_stock_user,1,1,1,1
+access_stock_sale_forecast_user,stock.sale.forecast user,model_stock_sale_forecast,base.group_sale_salesman,1,1,1,1
+access_stock_sale_forecast_manager,stock.sale.forecast manager,model_stock_sale_forecast,base.group_sale_manager,1,0,0,0
+access_stock_period_manager,stock.period manager,model_stock_period,base.group_sale_salesman,1,1,1,1
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 4d4f829092b..35352cfa024 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
-access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
-access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index b5c96a7a9c4..f522ff5a36f 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -52,7 +52,6 @@ Partners are also sent mails with user name and password for the invitation of t
         'test/survey_report.yml',
     ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '001131639736864143245',
     'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 85bd76ba4be..1566a32aa28 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,37 +1,25 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
-"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
-"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
-"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
-"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
-"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
-"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
-"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_survey_user","survey.survey.user","model_survey","base.group_survey_user",1,1,1,1
-"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","base.group_survey_user",1,1,1,1
-"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","base.group_survey_user",1,1,1,1
-"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","base.group_survey_user",1,1,1,1
-"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","base.group_survey_user",1,1,1,1
-"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","base.group_survey_user",1,1,1,1
-"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","base.group_survey_user",1,1,1,1
-"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","base.group_survey_user",1,1,1,1
-"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_survey_type_manager,survey.type.manager,model_survey_type,base.group_tool_manager,1,1,1,1
+access_survey_request_manager,survey.request manager,model_survey_request,base.group_tool_manager,1,1,1,1
+access_survey_tbl_column_heading_manager,survey.tbl.column.heading manager,model_survey_tbl_column_heading,base.group_tool_manager,1,1,1,1
+access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_survey_user,survey.user,model_survey,base.group_tool_user,1,1,1,1
+access_survey_page_user,survey.page user,model_survey_page,base.group_tool_user,1,1,1,1
+access_survey_question_user,survey.question user,model_survey_question,base.group_tool_user,1,1,1,1
+access_survey_answer_user,survey.answer user,model_survey_answer,base.group_tool_user,1,1,1,1
+access_survey_response_user,survey.response user,model_survey_response,base.group_tool_user,1,1,1,1
+access_survey_response_answer_user,survey.response.answer user,model_survey_response_answer,base.group_tool_user,1,1,1,1
+access_survey_history_user,survey.history.user,model_survey_history,base.group_tool_user,1,1,1,1
+access_survey_response_line_user,survey.response.line user,model_survey_response_line,base.group_tool_user,1,1,1,1
+access_survey_res_partner_address_user,survey.res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,0
+access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,1,1
+access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,1,1,1
+access_survey_question_survey_user,survey.question.survey.user,model_survey_question,base.group_survey_user,1,1,1,1
+access_survey_answer_survey_user,survey.answer.survey.user,model_survey_answer,base.group_survey_user,1,1,1,1
+access_survey_response_survey_user,survey.response.survey.user,model_survey_response,base.group_survey_user,1,1,1,1
+access_survey_response_answer_survey_user,survey.response.answer.survey.user,model_survey_response_answer,base.group_survey_user,1,1,1,1
+access_survey_history_survey_user,survey.history.survey.user,model_survey_history,base.group_survey_user,1,1,1,1
+access_survey_response_line_survey_user,survey.response.line.survey.user,model_survey_response_line,base.group_survey_user,1,1,1,1
+access_survey_question_column_heading_survey_user,survey.question.column.heading.survey.user,model_survey_question_column_heading,base.group_survey_user,1,0,0,0
+access_survey_question_column_heading_user,survey.question.column.heading user,model_survey_question_column_heading,base.group_tool_user,1,1,1,1
diff --git a/addons/thunderbird/security/ir.model.access.csv b/addons/thunderbird/security/ir.model.access.csv
index 6c3e9555132..df19161a518 100644
--- a/addons/thunderbird/security/ir.model.access.csv
+++ b/addons/thunderbird/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_thunderbird_ir_actions_todo","ir.actions.todo.thunderbird.installer","base.model_ir_actions_todo","base.group_sale_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_thunderbird_ir_actions_todo,ir.actions.todo.thunderbird.installer,base.model_ir_actions_todo,base.group_sale_manager,1,0,0,0
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 52eba24b3ce..e8f13aa2a34 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -24,7 +24,7 @@
     "depends" : ["base"],
     "images" : ["images/ldap_configuration.jpeg"],
     "author" : "OpenERP SA",
-    'complexity': "easy",
+    'complexity': "expert",
     "description": """
 Adds support for authentication by LDAP server.
 ===============================================
diff --git a/addons/users_ldap/security/ir.model.access.csv b/addons/users_ldap/security/ir.model.access.csv
index d26bd0a6d48..7e61451eb3d 100644
--- a/addons/users_ldap/security/ir.model.access.csv
+++ b/addons/users_ldap/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_company_ldap","res_company_ldap","model_res_company_ldap","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_company_ldap,res_company_ldap,model_res_company_ldap,base.group_system,1,1,1,1
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
index 57b610500d2..a3b59811ff8 100644
--- a/addons/web_livechat/publisher_warranty.py
+++ b/addons/web_livechat/publisher_warranty.py
@@ -44,7 +44,7 @@ class publisher_warranty_contract(osv.osv):
 
     @cache(skiparg=3)
     def get_default_livechat_text(self, cr, uid):
-        return '<a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank"><img src="/web_livechat/static/src/img/busy.png"/>Support</a>'
+        return '<a href="#" target="_blank"><img src="/web_livechat/static/src/img/busy.png"/>Support</a>'
 
 publisher_warranty_contract()
 
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
index 13c4bbe28d4..e35b726ef77 100644
--- a/addons/web_livechat/static/src/js/web_livechat.js
+++ b/addons/web_livechat/static/src/js/web_livechat.js
@@ -33,7 +33,16 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({
         var pwc = new openerp.web.Model(self.session, "publisher_warranty.contract");
         pwc.get_func('get_default_livechat_text')().then(function(text) {
             self.$element.html(text);
+            console.log('receiving text', text);
             self.do_update();
+            pwc.get_func('is_livechat_enable')().then(function(res) {
+                console.log('result', res);
+                if(res) {
+                    self.$element.click(self.do_load_livechat);
+                } else {
+                    self.do_action({type: 'ir.act.url', url: 'http://www.openerp.com/support-or-publisher-warranty-contract'});
+                }
+            })
         });
 
         openerp.webclient.header.do_update.add_last(this.do_update);
@@ -45,7 +54,14 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({
             self.$element.remove();
             return;
         }
-        
+     },
+
+    do_load_livechat: function(evt) {
+        evt.preventDefault();    
+        var self = this;
+
+        this.$element.unbind('click', this.do_load_livechat);
+
         var lc_id = _.uniqueId('livechat_');
         this.$element.attr('id', lc_id);
 
@@ -56,6 +72,8 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({
             if(!res) {
                 //return;
             }
+        // connect to LiveChat
+        __lc_load();
 
             __lc_buttons.push({
                 elementId: lc_id, //'livechat_status',
@@ -77,17 +95,28 @@ if (openerp.webclient) {
         params = '',
         lang = 'en',
         skill = '0';
-    __lc_load = function (p) { if (typeof __lc_loaded != 'function')
-      if (p) { var d = document, l = d.createElement('script'), s =
-        d.getElementsByTagName('script')[0], a = unescape('%26'),
-        h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true;
-        l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
-        if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
-          l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
-          l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s);
-        } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);}
-      } else __lc_load(Math.ceil(Math.random()*5)); }
-    __lc_load();
+    __lc_load = function (p) { 
+      if (typeof __lc_loaded != 'function')
+        if (p) { 
+          var d = document,
+            l = d.createElement('script'),
+            s = d.getElementsByTagName('script')[0],
+            a = unescape('%26'),
+            h = ('https:' == d.location.protocol ? 'https://' : 'http://');
+          l.type = 'text/javascript';
+          l.async = true;
+          l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
+          if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
+            l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
+            l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params));
+            s.parentNode.insertBefore(l, s);
+          } else 
+            setTimeout(__lc_load, 1000);
+          if(typeof __lc_serv != 'string'){
+            s.parentNode.insertBefore(l, s);
+          }
+        } else __lc_load(Math.ceil(Math.random()*5));
+    }
 
     // and add widget to webclient
     openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient);
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 1c6aae0baaf..ab9203a9afd 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    'name': 'Collaborative Content (Wiki)',
+    'name': 'Wiki',
     'version': '1.0.1',
     'category': 'Knowledge Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 The base module to manage documents(wiki).
 ==========================================
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 96545498ffc..0cbce7333f3 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"wiki_wiki_all","wiki.wiki","model_wiki_wiki",,1,0,0,0
-"wiki_groups_all","wiki.groups","model_wiki_groups",,1,0,0,0
-"wiki_wiki","wiki.wiki","model_wiki_wiki","base.group_user",1,1,1,1
-"wiki_groups","wiki.groups","model_wiki_groups","base.group_system",1,1,1,1
-"wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
-"access_wiki_wiki_sale_manager","wiki.wiki.manager","model_wiki_wiki","base.group_sale_manager",1,1,1,1
-"wiki_wiki_user","wiki.wiki user","model_wiki_wiki","base.group_document_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+wiki_wiki_all,wiki.wiki,model_wiki_wiki,,1,0,0,0
+wiki_groups_all,wiki.groups,model_wiki_groups,,1,0,0,0
+wiki_wiki,wiki.wiki,model_wiki_wiki,base.group_user,1,1,1,1
+wiki_groups,wiki.groups,model_wiki_groups,base.group_system,1,1,1,1
+wiki_wiki_history,wiki.wiki.history,model_wiki_wiki_history,base.group_user,1,0,1,0
+access_wiki_wiki_sale_manager,wiki.wiki.manager,model_wiki_wiki,base.group_sale_manager,1,1,1,1
+wiki_wiki_user,wiki.wiki user,model_wiki_wiki,base.group_document_user,1,1,1,1
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 96b8c2cdc11..d078e98f3b8 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Template: Internal FAQ',
+    'name': 'Wiki: Internal FAQ',
     'version': '1.0',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index c03b466af0b..6aeee109ba3 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Template: Quality Manual',
+    'name': 'Wiki: Quality Manual',
     'version': '1.0',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 1e56baf58cc..29b926e5927 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Sale FAQ',
+    'name': 'Wiki: Sale FAQ',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
author	Harry (OpenERP) <hmo@tinyerp.com>	2011-12-13 13:11:29 +0530
committer	Harry (OpenERP) <hmo@tinyerp.com>	2011-12-13 13:11:29 +0530
commit	359f0b42e22e69e9965462c8e8d5b8c57239d2f8 (patch)
tree	64412070716c5949d6c8703e5f2bd83235177ce1
parent	eb4c08585db4868fbf03dc0a019a383e9e653e7e (diff)
parent	78f56f29f2469f2e4a398d7d6cbdcafaa622341c (diff)