From c21ea1fd86ca3ca7da66d7de195c1770646d2322 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 1 Jul 2010 08:29:31 +0200
Subject: [PATCH 01/14] fi

bzr revid: fp@tinyerp.com-20100701062931-1rj74kisseczbgcx
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ad28bda6d6a..1d5ade40e69 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -431,7 +431,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
+                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>

From 05a6df943a3a95d37c433ad60858cdd1e51366e6 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sat, 3 Jul 2010 04:48:05 +0100
Subject: [PATCH 02/14] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100703034805-zrew32ynm9z5p9dq
---
 addons/account/i18n/zh_CN.po               | 263 ++++++++-------
 addons/multi_company/i18n/sl.po            |  33 +-
 addons/product_visible_discount/i18n/sl.po |  47 +++
 addons/sale_margin/i18n/sl.po              | 370 +++++++++++++++++++++
 4 files changed, 570 insertions(+), 143 deletions(-)
 create mode 100644 addons/product_visible_discount/i18n/sl.po
 create mode 100644 addons/sale_margin/i18n/sl.po

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 061747e8fcb..87c11dff871 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-02 03:32+0000\n"
+"PO-Revision-Date: 2010-07-03 03:39+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-02 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -277,8 +277,8 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"如果你使用付款条件,到期日期将在自动生成会计分录. 如果付款条件和到期日期为空,则意味着直接付款. "
-"付款条件可以计算出几个到期日，例如现在先付50%,然后在一个月内支付余下的50%."
+"如果你使用付款条款, 到期将自动生成会计分录.  如果付款条款和到期日期为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如现在先付50%, "
+"然后在一个月内支付余下的50%."
 
 #. module: account
 #: selection:account.tax,type:0
@@ -322,7 +322,7 @@ msgstr "参考"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr "周期计算"
+msgstr "周期性分录计算"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -352,13 +352,13 @@ msgstr "借方交易"
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: account
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr "子税"
+msgstr "基于子税"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -375,7 +375,7 @@ msgstr "发票说明"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误! 你不能创建递归的辅助核算科目"
+msgstr "错误! 你不能创建递归的辅助核算项"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -487,7 +487,7 @@ msgstr "税用在"
 msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
-msgstr "在下一个税额计算前，如果本税额必须包含在税基里，请设置"
+msgstr "如果这税额必须包含在计算下一个税的基础金额里, 请设置"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -540,7 +540,7 @@ msgstr "递延方法"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "基础金额已包含"
+msgstr "包含在基础金额里"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -602,7 +602,7 @@ msgstr "分录控制"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
-msgstr "这序列字段使用从高到低排序"
+msgstr "这序列字段使用从低到高排序"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -624,7 +624,7 @@ msgstr "联系"
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "业务伙伴付款条件"
+msgstr "业务伙伴付款条款"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -655,7 +655,7 @@ msgstr "如果这会计年度属于几个公司留空"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "管理会计"
+msgstr "辅助核算会计"
 
 #. module: account
 #: rml:account.overdue:0
@@ -758,7 +758,7 @@ msgstr "部分支付"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr "创建凭证明细"
+msgstr "创建的凭证明细"
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -840,7 +840,7 @@ msgstr "科目模板"
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
@@ -1075,7 +1075,7 @@ msgstr "原始凭证编号"
 msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
-msgstr "这序列字段用于付款条款行的排序从低到高."
+msgstr "这序列字段用于付款条款的从低到高排序."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
@@ -1110,7 +1110,7 @@ msgstr "收入类科目"
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "新辅助核算科目"
+msgstr "新辅助核算项"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1220,7 +1220,7 @@ msgstr "财务结构模板科目一览"
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr "上级辅助核算科目"
+msgstr "上级辅助核算项"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1481,7 +1481,7 @@ msgstr "向导.公司.设置"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr "科目.辅助核算.明细.延伸"
+msgstr "项.辅助核算.明细.延伸"
 
 #. module: account
 #: field:account.journal,refund_journal:0
@@ -1598,7 +1598,7 @@ msgstr "应收款与应付款科目"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "周期明细"
+msgstr "周期性分录明细"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1712,7 +1712,7 @@ msgstr "你确定创建分录?"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr "含基本金额"
+msgstr "包含在基本金额里"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1903,7 +1903,7 @@ msgstr "客户发票草稿"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "科目周期明细"
+msgstr "周期性分录明细的科目"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -2488,7 +2488,7 @@ msgstr "横向模式"
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr "从辅助核目科目创建发票"
+msgstr "从辅助核算项创建发票"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2728,7 +2728,7 @@ msgstr "未完税"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr "反向核算余额"
+msgstr "反向辅助核算余额"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -2852,7 +2852,7 @@ msgstr "最好的祝愿"
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
 msgid "Analytic account costs and revenues"
-msgstr "成本和收入辅助核算项"
+msgstr "辅助核算项成本和收入"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -3003,7 +3003,7 @@ msgid ""
 "The maturity date of the generated entries for this model. You can chosse "
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
-msgstr "这月产生分录的应付款日期. 你能在创建日期到创建这分录加上业务伙伴付款条件里限期天数之间的选择一天."
+msgstr "这模型在到期日产生分录.  你能从创建日期到到付款期限间选择."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3127,7 +3127,7 @@ msgstr "确认"
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr "图表"
+msgstr "说明"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -3201,7 +3201,7 @@ msgstr "税"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr "关闭会计年度和新分录"
+msgstr "用新分录关闭会计年度"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3308,7 +3308,7 @@ msgstr "凭证"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "税来源"
+msgstr "源税"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -3596,7 +3596,7 @@ msgstr "数字 #"
 msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
-msgstr "当前业务伙伴将替代为这默认的付款条件"
+msgstr "当前业务伙伴将替代为这默认的付款条款"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
@@ -3676,7 +3676,7 @@ msgstr "如果你想打印总账时打印所有分录, 勾选此项. 否则打
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "付款条件明细"
+msgstr "付款条款明细"
 
 #. module: account
 #: selection:account.config.wizard,period:0
@@ -3858,7 +3858,7 @@ msgstr "手动报表"
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr "帐簿"
+msgstr "财务分录集合"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3894,7 +3894,7 @@ msgid ""
 "Gives the type of the analytic journal. When a document (eg: an invoice) "
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
-msgstr "给出这辅助核算分录集的类型. 当单据(如发票)需要创建辅助核算分录. 系统将寻找匹配同一类型的分录集合."
+msgstr "给出这辅助核算分录集的类型. 当单据(如发票)需要创建辅助核算分录. 系统将寻找同一类型匹配的分录集合."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3988,7 +3988,7 @@ msgstr "贷方"
 msgid ""
 "Indicate if the tax computation is based on the value computed for the "
 "computation of child taxes or based on the total amount."
-msgstr "如果税计算是基于计算下级税或基于总金额, 显示"
+msgstr "如果税计算是基于计算子税或基于总金额, 显示"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -4563,7 +4563,7 @@ msgstr "凭证列表"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr "辅助核算项表"
+msgstr "辅助核算项目表"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4622,7 +4622,7 @@ msgstr "运行中"
 msgid ""
 "Indicate if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
-msgstr "表明如果税款必须被包含在计算下一个税的基础金额"
+msgstr "表明如果税额必须包含在计算下一个税的基础金额里"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -5323,7 +5323,7 @@ msgstr "可选信息"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
@@ -5375,7 +5375,7 @@ msgstr "税适用"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr "周期性凭证"
+msgstr "周期性分录"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5397,19 +5397,19 @@ msgstr "会计期间数"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
 msgid "End of period"
-msgstr "期末日期"
+msgstr "结束会计期间"
 
 #. module: account
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "普通分类帐"
+msgstr "一般分录集合"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5445,7 +5445,7 @@ msgstr "发票税"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journal Definition"
-msgstr "定义辅助核算分类帐"
+msgstr "定义辅助核算分录集合"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -5455,7 +5455,7 @@ msgstr "科目.税.模板"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: constraint:account.period:0
@@ -5467,7 +5467,7 @@ msgstr "无效会计期间！一些会计期间重复或者会计期间不在这
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr "这序列用于这分类帐发票号"
+msgstr "这序列用于这分录集合的发票号"
 
 #. module: account
 #: view:account.account:0
@@ -5484,12 +5484,12 @@ msgid ""
 "This field allow you to choose the accounting journals you want for "
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
-msgstr "这字段允许你选择会计分类帐要过滤的发票.如果你设为空将搜索所有销售采购和现金分类帐"
+msgstr "这字段允许你选择要过滤的发票的会计分录集合. 如果为空将搜索所有销售, 采购和现金分录集合."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "错误!会计年度无效 "
+msgstr "错误!会计年度的期限无效 "
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5499,7 +5499,7 @@ msgstr "关闭"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "凭证编号"
+msgstr "凭证"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5532,7 +5532,7 @@ msgstr "成本分类账(只有数量)"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr "审核凭证"
+msgstr "确认"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -5553,7 +5553,7 @@ msgstr "到"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr "待处理辅助核算分类帐"
+msgstr "打开的辅助核算分录集合分录"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5568,7 +5568,7 @@ msgstr "当前日期"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr "销售分类帐"
+msgstr "销售分录集合"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5624,7 +5624,7 @@ msgstr "说明"
 msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
-msgstr "这科目将用于当前产品的默认销售收入科目"
+msgstr "这科目将替换当前产品的默认进仓"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5639,12 +5639,12 @@ msgstr "上级右"
 #. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
-msgstr "会计科目"
+msgstr "财务科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "科目表"
+msgstr "科目表模板"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -5656,7 +5656,7 @@ msgstr "科目设置"
 msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
-msgstr "这科目将用于当前业务伙伴的默认应付科目"
+msgstr "这科目将替换当前业务伙伴的默认支付科目"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -5683,7 +5683,7 @@ msgstr "打开/关闭会计期间"
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "核算余额 -"
+msgstr "辅助核算余额 -"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5715,12 +5715,12 @@ msgstr "会计属性"
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "科目.序号.会计年度"
+msgstr "科目.序列.会计年度"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr "凭证排序按"
+msgstr "分录排序按"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -5732,13 +5732,13 @@ msgstr "打印分类帐 -"
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models Definition"
-msgstr "模型定义"
+msgstr "分录模型定义"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
@@ -5756,7 +5756,7 @@ msgstr "目标科目"
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr "到期"
+msgstr "到期日期"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5792,12 +5792,12 @@ msgstr "供应商退款"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr "对账凭证"
+msgstr "对账分录"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5805,7 +5805,7 @@ msgstr "凭证"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr "支付发票时对账"
+msgstr "对账时支付发票"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -5828,7 +5828,7 @@ msgstr "科目一览"
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
-msgstr "这科目将用于当前产品分类的采购科目"
+msgstr "这科目将替换当前产品分类的默认出仓"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5850,7 +5850,7 @@ msgstr "银行详情"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "产品采购科目模板"
+msgstr "产品模板的费用科目"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5860,7 +5860,7 @@ msgstr "一般借方"
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr "辅助核算代码"
+msgstr "辅助核算项代码"
 
 #. module: account
 #: help:account.config.wizard,name:0
@@ -5876,7 +5876,7 @@ msgstr "屏幕上显示的会计年度名称"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -5906,7 +5906,7 @@ msgstr "勾选此项"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "在产品和发票中使用含税价"
+msgstr "如果产品和发票你使用含税价. 勾选"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5930,7 +5930,7 @@ msgstr "是"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr "用户允许在这科目对账凭证"
+msgstr "如果用户可以在这科目去对账分录. 勾选"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
@@ -5940,122 +5940,122 @@ msgstr "计算日期"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "关闭辅助核算项"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "发票草稿"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "会计控制台"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "科目开发票"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "成本开发票"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "以前应收款"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "会计面板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "收入科目"
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "我的指标"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "科目面板"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "以前收入"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "显示借方/贷方信息"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "所有科目"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "分录选择基于"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "通知"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "财务会计期间"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "科目余额"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "选择会计期间"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "比较选择的会计年度"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "选择会计年度(最大值为三年)"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "选择参考科目(比较%)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "科目结余会计年度比较"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6078,98 +6078,107 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"科目结余模块是一附加的财务管理模块\n"
+"    \n"
+"\t该模块为你提供各种可选择打印的资产负债表\n"
+"\t1.你能比较资产负债表的不同年份.\n"
+"\t2.你能设置两年的现金或百分比比较\n"
+"\t3.你能设置特别年份的参考科目的百分比比较\n"
+"\t4.你能选择会计期间的实际日期或在会计期间创建日期\n"
+"\t5.你可以选择打印要求的报表\n"
+"    "
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "请勾选此项你能选择‘规定格式’选项"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "显示固定格式的报表"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "合计:"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "显示对比 %"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr "选会计期间"
+msgstr "选择会计期间"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "报表选项"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "不比较"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "显示科目"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "你必须要选择多于3年."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "会计和财务管理-科目比较"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "会计年度:"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "请勾选此项你最多能选择3年"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
-msgstr ""
+msgstr "你已经选择‘百分比’选项这要2年以上. 但你没选择规定格式."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
-msgstr ""
+msgstr "你可能存在以下错误. 请纠正后再试."
 
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "留空为比较母公司"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
-msgstr ""
+msgstr "你选择2年以上, 但未选‘百分比’选项"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6177,94 +6186,94 @@ msgid ""
 "You may have selected the compare options with more than 1 year with "
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
-msgstr ""
+msgstr "你必须要选择比较选项一年以上的借方/贷方栏和%选项, 这才能产生打印的内容请再试."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "你至少要选择一个会计年度再试"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "自定义报表"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "月度"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "发票建立要在15天前"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "最近15天创建发票的报表"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "金额合计"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "按类型划分的科目"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "直到今天的应收款"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "应收款科目"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "范围"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "新的报表模块"
 
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "科目报表-报表"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "科目类型余额"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "会计年度里的周"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "旧的应收款"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "未完税金额"
 
 #~ msgid "           Start date"
 #~ msgstr "           开始日期"
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 81c947adfee..21e94b67eb1 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-07-02 12:11+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -27,22 +27,23 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
 
 #. module: multi_company
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "Napaka pri obračunu DDV"
 
 #. module: multi_company
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -59,18 +60,18 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Privzeto podjetje"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Predmet"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Za več podjetij"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
@@ -83,12 +84,12 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr ""
+msgstr "Glavna družba"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Pogoj"
 
 #. module: multi_company
 #: help:multi_company.default,company_dest_id:0
@@ -98,17 +99,17 @@ msgstr ""
 #. module: multi_company
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neveljaven XML za arhitekturo pogleda!"
 
 #. module: multi_company
 #: field:multi_company.default,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
@@ -118,7 +119,7 @@ msgstr ""
 #. module: multi_company
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Napaka. Ne morete ustvariti rekurzivnih družb."
 
 #. module: multi_company
 #: help:multi_company.default,name:0
@@ -128,7 +129,7 @@ msgstr ""
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi company"
-msgstr ""
+msgstr "Za več podjetij"
 
 #. module: multi_company
 #: model:ir.model,name:multi_company.model_multi_company_default
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
new file mode 100644
index 00000000000..6ea1da38a59
--- /dev/null
+++ b/addons/product_visible_discount/i18n/sl.po
@@ -0,0 +1,47 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-07-02 12:04+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Vidni popust"
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
new file mode 100644
index 00000000000..0b59e7db3f6
--- /dev/null
+++ b/addons/sale_margin/i18n/sl.po
@@ -0,0 +1,370 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 14:28+0000\n"
+"PO-Revision-Date: 2010-07-02 12:17+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. 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 "Dobropis kupcu"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "report.account.invoice.product"
+msgstr ""
+
+#. module: sale_margin
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
+msgid "Invoices by Product"
+msgstr "Računi po proizvodih"
+
+#. 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 "Izdan račun"
+
+#. module: sale_margin
+#: wizard_view:stock.invoice_onshipping,init:0
+msgid "Create invoices"
+msgstr "Ustvari račune"
+
+#. module: sale_margin
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
+msgid "report.account.invoice.partner.product"
+msgstr ""
+
+#. 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 "Račun dobavitelja"
+
+#. 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 ""
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr "Ustvari račun"
+
+#. 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 "Osnutek"
+
+#. module: sale_margin
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Napačno ime modela v definiciji dejanja."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
+msgid "All Months"
+msgstr "Vsi meseci"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
+msgid "report.account.invoice.partner.product.tree"
+msgstr ""
+
+#. 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
+#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Supplier Invoices"
+msgstr "Računi dobaviteljev"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner:0
+msgid "Invoices by partner"
+msgstr "Računi po partnerjih"
+
+#. module: sale_margin
+#: view:report.account.invoice.category:0
+msgid "Invoices by category"
+msgstr "Računi po vrstah"
+
+#. 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čano"
+
+#. module: sale_margin
+#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
+#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+msgid "Create invoice"
+msgstr "Ustvari račun"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
+msgid "report.account.invoice.category.tree"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
+msgid "Invoices by Partner and Product"
+msgstr "Računi po partnerjih in proizvodih"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_category
+msgid "report.account.invoice.category"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. 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 "Lastna cena"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,group:0
+msgid "Group by partner"
+msgstr "Združi po partnerjih"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
+msgid "report.account.invoice.partner"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
+msgid "Invoices by Partner"
+msgstr "Računi po partnerju"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
+msgid "Invoices by Category"
+msgstr "Računi po kategorijah"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner.product:0
+msgid "Invoices by partner and product"
+msgstr "Računi po partnerjih in proizvodih"
+
+#. 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 "Znesek"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
+msgid "Invoiced date"
+msgstr "Datum izdaje računa"
+
+#. 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 "Dobropis dobavitelja"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
+msgid "report.account.invoice.partner.tree"
+msgstr ""
+
+#. 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 "Rob"
+
+#. 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 proizvodih"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sale Orders"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice
+msgid "report.account.invoice"
+msgstr ""
+
+#. 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,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
+#: 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 "Mesec"
+
+#. 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 "Preklicano"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_margin
+#: wizard_button:stock.invoice_onshipping,init,end:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. 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.actions.act_window,name:sale_margin.action_report_account_invoice_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
+msgid "report.account.invoice.tree"
+msgstr ""
+
+#. 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 "Odpri"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
+msgid "report.account.invoice.product.tree"
+msgstr ""

From 646bae0c50c965a5fc9124ebec693cb4bde7d827 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Sat, 3 Jul 2010 15:00:47 +0530
Subject: [PATCH 03/14] [IMP] Account_followup: Cleaning and improvement in
 module (Print report has still problem)

bzr revid: mra@mra-laptop-20100703093047-2mdpngvqmvtnzlb0
---
 addons/account_followup/__init__.py           | 11 ++-
 addons/account_followup/__openerp__.py        | 15 ++---
 .../{followup.py => account_followup.py}      | 27 +++++---
 ...wup_data.xml => account_followup_data.xml} |  0
 ...wup_demo.xml => account_followup_demo.xml} |  0
 ...p_report.py => account_followup_report.py} |  0
 ...t_view.xml => account_followup_report.xml} |  0
 ...wup_view.xml => account_followup_view.xml} | 67 +++++++++++--------
 .../report/report_followup_print.py           | 14 ++--
 .../wizard/account_followup_print.py          | 40 +++++++----
 .../wizard/account_followup_print_view.xml    | 11 ---
 11 files changed, 102 insertions(+), 83 deletions(-)
 rename addons/account_followup/{followup.py => account_followup.py} (89%)
 rename addons/account_followup/{followup_data.xml => account_followup_data.xml} (100%)
 rename addons/account_followup/{followup_demo.xml => account_followup_demo.xml} (100%)
 rename addons/account_followup/{followup_report.py => account_followup_report.py} (100%)
 rename addons/account_followup/{followup_report_view.xml => account_followup_report.xml} (100%)
 rename addons/account_followup/{followup_view.xml => account_followup_view.xml} (85%)

diff --git a/addons/account_followup/__init__.py b/addons/account_followup/__init__.py
index 3065bef0130..b0067573a2f 100644
--- a/addons/account_followup/__init__.py
+++ b/addons/account_followup/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,13 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import followup
-import followup_report
+import account_followup
+import account_followup_report
 import wizard
 import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 81a5cb79cee..5aefa0abc96 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Accounting follow-ups management',
     'version': '1.0',
@@ -36,11 +35,10 @@
 
     It will generate a PDF with all the letters according the the
     different levels of recall defined. You can define different policies
-    for different companies.
-
+    for different companies. You can send also mail to the customer.
 
     Note that if you want to change the followup level for a given partner/account entry, you can do it in the menu:
-        Financial Management/Reporting/Follow-Ups/All receivable entries
+        Accounting/Reporting/Follow-Ups/All receivable entries
 
 """,
     'author': 'Tiny',
@@ -50,13 +48,14 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
-        'followup_report_view.xml',
-        'followup_view.xml',
-        'followup_data.xml'
+        'account_followup_report.xml',
+        'account_followup_view.xml',
+        'account_followup_data.xml'
     ],
-    'demo_xml': ['followup_demo.xml'],
+    'demo_xml': ['account_followup_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0072481076453',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/followup.py b/addons/account_followup/account_followup.py
similarity index 89%
rename from addons/account_followup/followup.py
rename to addons/account_followup/account_followup.py
index c8bf9537f13..02986acb184 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/account_followup.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,13 +23,17 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Follow-Up'
+    _description = 'Account Follow Up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
         'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-Up'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
+    _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
+                }
+
 followup()
 
 class followup_line(osv.osv):
@@ -42,26 +46,27 @@ class followup_line(osv.osv):
         'start': fields.selection([('days','Net Days'),('end_of_month','End of Month')], 'Type of Term', size=64, required=True),
         'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"),
         'description': fields.text('Printed Message', translate=True),
-    }
+                }
+
 followup_line()
 
 class account_move_line(osv.osv):
-    _name = 'account.move.line'
     _inherit = 'account.move.line'
     _columns = {
         'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'),
         'followup_date': fields.date('Latest Follow-up'),
-    }
+                }
+
 account_move_line()
 
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'follow_up_msg' : fields.text('Follow-up Message', translate=True),
-    }
+                }
 
     _defaults = {
-        'overdue_msg': lambda *a: '''
+        'overdue_msg': '''
 Date : %(date)s
 
 Dear %(partner_name)s,
@@ -75,8 +80,8 @@ Thanks,
 %(user_signature)s
 %(company_name)s
         '''
-    }
+                }
+
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/followup_data.xml b/addons/account_followup/account_followup_data.xml
similarity index 100%
rename from addons/account_followup/followup_data.xml
rename to addons/account_followup/account_followup_data.xml
diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/account_followup_demo.xml
similarity index 100%
rename from addons/account_followup/followup_demo.xml
rename to addons/account_followup/account_followup_demo.xml
diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/account_followup_report.py
similarity index 100%
rename from addons/account_followup/followup_report.py
rename to addons/account_followup/account_followup_report.py
diff --git a/addons/account_followup/followup_report_view.xml b/addons/account_followup/account_followup_report.xml
similarity index 100%
rename from addons/account_followup/followup_report_view.xml
rename to addons/account_followup/account_followup_report.xml
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/account_followup_view.xml
similarity index 85%
rename from addons/account_followup/followup_view.xml
rename to addons/account_followup/account_followup_view.xml
index ae31f7253a2..50c1cb5df34 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="view_account_followup_followup_line_tree" model="ir.ui.view">
             <field name="name">account_followup.followup.line.tree</field>
             <field name="model">account_followup.followup.line</field>
@@ -15,40 +15,39 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_followup_followup_line_form" model="ir.ui.view">
             <field name="name">account_followup.followup.line.form</field>
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up Lines">
-                    <field name="sequence" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="delay" select="1"/>
-                    <field name="start" select="1"/>
+                    <field name="sequence"/>
+                    <field name="name" />
+                    <field name="delay" />
+                    <field name="start" />
                     <newline/>
-                    <field colspan="4" name="description" select="1"/>
+                    <field colspan="4" name="description" />
                     <separator string="Legend" colspan="4"/>
-
-                    <label string="%%(partner_name)s: Partner name" colspan="2"/>
+                    <label string="%%(partner_name)s: Partner Name" colspan="2"/>
                     <label string="%%(date)s: Current Date" colspan="2"/>
-                    <label string="%%(user_signature)s: User name" colspan="2"/>
-                    <label string="%%(company_name)s: User's Company name" colspan="2"/>
+                    <label string="%%(user_signature)s: User Name" colspan="2"/>
+                    <label string="%%(company_name)s: User's Company Name" colspan="2"/>
                 </form>
             </field>
         </record>
-        
+
         <record id="view_account_followup_followup_form" model="ir.ui.view">
             <field name="name">account_followup.followup.form</field>
             <field name="model">account_followup.followup</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up">
-                    <field name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    <field name="name" />
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1" select="1"/>
-                    <separator colspan="4" string="Lines"/>
+                    <field colspan="4" name="description" nolabel="1" />
+                    <separator colspan="4" string="Followup Lines"/>
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -66,17 +65,30 @@
             </field>
         </record>
 
+        <record id="view_account_followup_filter" model="ir.ui.view">
+            <field name="name">account.followup.select</field>
+            <field name="model">account_followup.followup</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Followup">
+                   <group col="10" colspan="4">
+                        <field name="name"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_account_followup_definition_form" model="ir.actions.act_window">
             <field name="name">Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account_followup.followup</field>
+            <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
         </record>
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration"/>
-        
+
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
-        
-        
+
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>
             <field name="model">account.move.line</field>
@@ -99,7 +111,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.followup</field>
             <field name="model">account.move.line</field>
@@ -111,7 +123,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree.followup</field>
             <field name="model">account.move.line</field>
@@ -123,17 +135,17 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
-        
+
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
-        
+
         <menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.menu_action_followup_stat"/>
-        
+
         <act_window domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]" id="act_account_partner_account_move_payable_all" name="All payable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
-        
+
         <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
-        
+
         <record model="ir.ui.view" id="view_company_inherit_followup_form">
             <field name="name">res.company.followup.form.inherit</field>
             <field name="inherit_id" ref="account.view_company_inherit_form"/>
@@ -146,5 +158,6 @@
                 </field>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index 4f1df09c302..08c572a5ba9 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -30,12 +30,12 @@ class report_rappel(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_rappel, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
-            'time' : time,
+            'time': time,
             'ids_to_objects': self._ids_to_objects,
-            'adr_get' : self._adr_get,
-            'getLines' : self._lines_get,
-            'get_text' : self._get_text
-        })
+            'adr_get': self._adr_get,
+            'getLines': self._lines_get,
+            'get_text': self._get_text
+                                })
 
     def _ids_to_objects(self, partners_ids):
         pool = pooler.get_pool(self.cr.dbname)
@@ -91,10 +91,8 @@ class report_rappel(report_sxw.rml_parse):
 
         return text
 
-
 report_sxw.report_sxw('report.account_followup.followup.print',
         'res.partner', 'addons/account_followup/report/rappel.rml',
         parser=report_rappel)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index d7327638669..868249365ee 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -34,25 +34,32 @@ class account_followup_print(osv.osv_memory):
                 }
 
     def _get_followup(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if context.get('active_model', 'ir.ui.menu') == 'account_followup.followup':
+            return context.get('active_id', False)
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        tmp = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)])
-        return tmp and tmp[0] or False
+        followp_id = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)], context=context)
+        return followp_id and followp_id[0] or False
 
     def do_continue(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [])[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         context.update({'followup_id': data['followup_id'], 'date':data['date']})
         return {
-                'name': _('Select partners'),
-                'view_type': 'form',
-                'context': context,
-                'view_mode': 'tree,form',
-                'res_model': 'account.followup.print.all',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
+            'name': _('Select Partners'),
+            'view_type': 'form',
+            'context': context,
+            'view_mode': 'tree,form',
+            'res_model': 'account.followup.print.all',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
             }
 
     _defaults = {
@@ -74,10 +81,12 @@ class account_followup_print_all(osv.osv_memory):
         'summary': fields.text('Summary', required=True, readonly=True)
                 }
     def _get_summary(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return context.get('summary', '')
 
     def _get_partners(self, cr, uid, context=None):
-        return self._get_partners_followp(cr, uid, [], context)['partner_ids']
+        return self._get_partners_followp(cr, uid, [], context=context)['partner_ids']
 
     def _get_msg(self, cr, uid, context=None):
         return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.follow_up_msg
@@ -168,6 +177,9 @@ class account_followup_print_all(osv.osv_memory):
         move_obj = self.pool.get('account.move.line')
         user_obj = self.pool.get('res.users')
         line_obj = self.pool.get('account_followup.stat')
+
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [])[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
@@ -252,8 +264,9 @@ class account_followup_print_all(osv.osv_memory):
             context.update({'summary': summary})
         else:
             context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
+
         return {
-            'name': _('Summary'),
+            'name': _('Follwoup Summary'),
             'view_type': 'form',
             'context': context,
             'view_mode': 'tree,form',
@@ -265,6 +278,8 @@ class account_followup_print_all(osv.osv_memory):
                     }
 
     def do_print(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [])[0]
         res = self._get_partners_followp(cr, uid, ids, context)['to_update']
         to_update = res
@@ -284,6 +299,7 @@ class account_followup_print_all(osv.osv_memory):
              'model': 'account_followup.followup',
              'form': data
                  }
+
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account_followup.followup.print',
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 9e0c34c8bf5..a97e54347cb 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -2,17 +2,6 @@
 <openerp>
     <data noupdate="0">
 
-        <!--<wizard string="Send followups"
-                name="account_followup.followup.print.all"
-                id="action_account_followup_all_wizard"
-                model="account_followup.followup" />
-
-        <menuitem action="action_account_followup_all_wizard"
-                  id="account_followup_wizard_menu"
-                  parent="account.menu_finance_periodical_processing"
-                  type="wizard" />-->
-
-
         <record id="view_account_followup_print" model="ir.ui.view">
             <field name="name">account.followup.print.form</field>
             <field name="model">account.followup.print</field>

From c179005fc74c169bf6bb351021322e06188b62da Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Sat, 3 Jul 2010 15:51:52 +0530
Subject: [PATCH 04/14] [IMP] Clean hr_* module (Still need to done)

bzr revid: mra@mra-laptop-20100703102152-4ulrrzbkorpd7xei
---
 addons/hr/__openerp__.py                      |  19 +-
 addons/hr/hr.py                               |  42 ++--
 addons/hr/hr_data.xml                         |   2 +
 addons/hr/hr_department.py                    |  40 ++--
 addons/hr/hr_installer.xml                    |  42 ++--
 addons/hr/hr_view.xml                         | 185 +++++++-----------
 addons/hr/installer.py                        |  15 +-
 addons/hr/security/hr_security.xml            |   3 +
 addons/hr_attendance/__openerp__.py           |   3 +-
 addons/hr_attendance/hr_attendance.py         |  37 ++--
 addons/hr_attendance/hr_attendance_demo.xml   |  20 ++
 addons/hr_attendance/hr_attendance_report.xml |   2 +
 addons/hr_attendance/hr_attendance_view.xml   |  30 +--
 addons/hr_attendance/hr_attendance_wizard.xml |   4 +-
 .../hr_attendance/report/attendance_errors.py |   9 +-
 addons/hr_attendance/report/bymonth.py        |  10 +-
 addons/hr_attendance/report/timesheet.py      |   9 +-
 addons/hr_attendance/security/hr_security.xml |  12 +-
 .../wizard/hr_attendance_bymonth.py           |  12 +-
 .../wizard/hr_attendance_bymonth_view.xml     |   8 +-
 .../wizard/hr_attendance_byweek.py            |  10 +-
 .../wizard/hr_attendance_byweek_view.xml      |  10 +-
 .../wizard/hr_attendance_error.py             |  13 +-
 .../wizard/hr_attendance_error_view.xml       |  14 +-
 .../wizard/hr_attendance_sign_in_out.py       |  15 +-
 .../wizard/hr_attendance_sign_in_out_view.xml |  22 +--
 addons/hr_contract/__openerp__.py             |   3 +-
 addons/hr_contract/hr_contract.py             |  29 +--
 addons/hr_contract/hr_contract_data.xml       |   1 +
 addons/hr_contract/hr_contract_view.xml       |  77 ++++----
 .../security/hr_contract_security.xml         |  10 +-
 addons/hr_evaluation/__openerp__.py           |  40 ++--
 addons/hr_evaluation/hr_evaluation.py         |  77 ++++----
 addons/hr_evaluation/hr_evaluation_demo.xml   | 122 ++++++++++--
 addons/hr_evaluation/hr_evaluation_view.xml   |  84 +++-----
 addons/hr_evaluation/report/__init__.py       |   3 +-
 .../report/hr_evaluation_report.py            |   8 +-
 .../report/hr_evaluation_report_view.xml      |  48 ++---
 addons/hr_evaluation/wizard/__init__.py       |   1 -
 .../wizard/hr_evaluation_mail.py              |   4 +-
 .../wizard/hr_evaluation_mail_view.xml        |  54 ++---
 addons/hr_expense/__openerp__.py              |   9 +-
 addons/hr_expense/board_hr_expense_view.xml   |   2 +
 addons/hr_expense/hr_expense.py               |  31 ++-
 addons/hr_expense/hr_expense_demo.xml         |  24 ++-
 addons/hr_expense/hr_expense_report.xml       |   2 +
 addons/hr_expense/hr_expense_sequence.xml     |   3 +
 addons/hr_expense/hr_expense_view.xml         |  46 ++---
 addons/hr_expense/hr_expense_workflow.xml     |  15 ++
 addons/hr_expense/report/__init__.py          |   1 +
 addons/hr_expense/report/expense.py           |   5 +-
 .../report/hr_expense_report_view.xml         |  52 ++---
 addons/hr_holidays/__init__.py                |   1 +
 addons/hr_holidays/__openerp__.py             |  12 +-
 addons/hr_holidays/board_hr_holidays_view.xml |   3 +-
 addons/hr_holidays/hr_bel_holidays_2008.xml   |  10 +
 addons/hr_holidays/hr_holidays.py             |  76 ++++---
 addons/hr_holidays/hr_holidays_report.xml     |   1 +
 addons/hr_holidays/hr_holidays_view.xml       |  66 +++----
 addons/hr_holidays/hr_holidays_wizard.xml     |   1 +
 .../hr_holidays/report/available_holidays.py  |  22 ++-
 .../report/available_holidays_view.xml        |  37 ++--
 .../report/holidays_summary_report.py         |   5 +-
 .../hr_holidays/report/hr_holidays_report.py  |  17 +-
 .../report/hr_holidays_report_view.xml        |  44 ++---
 .../wizard/hr_holidays_summary_department.py  |   7 +-
 .../wizard/hr_holidays_summary_employees.py   |   6 +-
 67 files changed, 833 insertions(+), 814 deletions(-)

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index d4778237420..29e61ba5599 100755
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Human Resources",
-    "version" : "1.1",
-    "author" : "Tiny",
-    "category" : "Generic Modules/Human Resources",
-    "website" : "http://www.openerp.com",
+    "name": "Human Resources",
+    "version": "1.1",
+    "author": "Tiny",
+    "category": "Generic Modules/Human Resources",
+    "website": "http://www.openerp.com",
     "description": """
     Module for human resource management. You can manage:
     * Employees and hierarchies : You can define your employee with User and display hierarchies
@@ -45,10 +45,11 @@
         'hr_installer.xml',
         'hr_data.xml',
         'board_hr_view.xml',
-    ],
-    'demo_xml': ['hr_demo.xml',
-        'hr_department_demo.xml'],
-        
+        ],
+    'demo_xml': [
+        'hr_demo.xml',
+        'hr_department_demo.xml'
+        ],        
     'test': ['test/test_hr.yml'],    
     'installable': True,
     'active': False,
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index b5db01ac512..372b5214f6f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -27,9 +27,8 @@ from tools.translate import _
 class hr_employee_category(osv.osv):
     _name = "hr.employee.category"
     _description = "Employee Category"
-
     _columns = {
-        'name' : fields.char("Category", size=64, required=True),
+        'name': fields.char("Category", size=64, required=True),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
@@ -37,7 +36,7 @@ class hr_employee_category(osv.osv):
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
-            cr.execute('select distinct parent_id from hr_employee_category where id IN %s',(tuple(ids),))
+            cr.execute('select distinct parent_id from hr_employee_category where id IN %s', (tuple(ids), ))
             ids = filter(None, map(lambda x:x[0], cr.fetchall()))
             if not level:
                 return False
@@ -54,13 +53,14 @@ class hr_employee_marital_status(osv.osv):
     _name = "hr.employee.marital.status"
     _description = "Employee Marital Status"
     _columns = {
-        'name' : fields.char('Marital Status', size=30, required=True),
-        'description' : fields.text('Status Description'),
+        'name': fields.char('Marital Status', size=30, required=True),
+        'description': fields.text('Status Description'),
     }
 hr_employee_marital_status()
 
 class hr_job(osv.osv):
-    def _no_of_employee(self, cr, uid, ids, name,args,context=None):
+
+    def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
         for emp in self.browse(cr, uid, ids):
             res[emp.id] = len(emp.employee_ids or [])
@@ -70,19 +70,19 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees':fields.integer('Expected Employees', help='Required number of Employees'),
+        'expected_employees': fields.integer('Expected Employees', help='Required number of Employees'),
         'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'),
-        'employee_ids':fields.one2many('hr.employee', 'job_id','Employees'),
+        'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
-        'requirements':fields.text('Requirements'),
-        'department_id':fields.many2one('hr.department','Department'),
+        'requirements': fields.text('Requirements'),
+        'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open','Open'),('old','Old'),('recruit','In Recruitement')], 'State', required=True),
+        'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', required=True),
     }
     _defaults = {
-        'expected_employees': lambda *a: 1,
+        'expected_employees': 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
-        'state': lambda *args: 'open'
+        'state': 'open'
     }
 
 hr_job()
@@ -90,17 +90,17 @@ hr_job()
 class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
-    _inherits = {'resource.resource':"resource_id"}
+    _inherits = {'resource.resource': "resource_id"}
     _columns = {
-        'country_id' : fields.many2one('res.country', 'Nationality'),
-        'birthday' : fields.date("Birthday"),
+        'country_id': fields.many2one('res.country', 'Nationality'),
+        'birthday': fields.date("Birthday"),
         'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
         'sinid': fields.char('SIN No', size=32),
         'otherid': fields.char('Other ID', size=32),
-        'gender': fields.selection([('male','Male'),('female','Female')], 'Gender'),
+        'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
         'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
         'bank_account': fields.char('Bank Account', size=56),
-        'partner_id' : fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
+        'partner_id': fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
         'department_id':fields.many2one('hr.department','Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
@@ -109,8 +109,8 @@ class hr_employee(osv.osv):
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
         'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
-        'category_id' : fields.many2one('hr.employee.category', 'Category'),
-        'child_ids': fields.one2many('hr.employee', 'parent_id','Subordinates'),
+        'category_id': fields.many2one('hr.employee.category', 'Category'),
+        'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
         'coach_id': fields.many2one('res.users', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
@@ -123,7 +123,7 @@ class hr_employee(osv.osv):
                     'rb') .read().encode('base64')
 
     _defaults = {
-        'active' : 1,
+        'active': 1,
         'photo': _get_photo,
     }
 
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 7125afb17d4..f76d1457aa1 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <!-- Employee Marital Statusses -->
         <record id="hr_employee_marital_status_single" model="hr.employee.marital.status">
             <field name="name">Single</field>
@@ -14,5 +15,6 @@
         <record id="hr_employee_marital_status_widower" model="hr.employee.marital.status">
             <field name="name">Widower</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 9e190a2b0f7..d1e13e2f6ec 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -25,6 +25,8 @@ import tools
 class hr_department(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         if not len(ids):
             return []
         reads = self.read(cr, uid, ids, ['name','parent_id'], context)
@@ -36,7 +38,7 @@ class hr_department(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
+    def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = self.name_get(cr, uid, ids, context)
         return dict(res)
 
@@ -51,13 +53,19 @@ class hr_department(osv.osv):
         'manager_id': fields.many2one('res.users', 'Manager', required=True),
         'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
     }
-    def _get_members(self,cr, uid, context={}):
-        mids = self.search(cr, uid, [('manager_id','=',uid)])
+    
+    _defaults = { 
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.department', context=c),
+  }    
+
+    def _get_members(self,cr, uid, context=None):
+        mids = self.search(cr, uid, [('manager_id', '=', uid)])
         result = {uid:1}
         for m in self.browse(cr, uid, mids, context):
             for user in m.member_ids:
                 result[user.id] = 1
         return result.keys()
+
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
@@ -78,18 +86,17 @@ hr_department()
 class ir_action_window(osv.osv):
     _inherit = 'ir.actions.act_window'
 
-    def read(self, cr, uid, ids, fields=None, context=None,
-            load='_classic_read'):
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        if context is None:
+            context = {}
         select = ids
         if isinstance(ids, (int, long)):
             select = [ids]
-        res = super(ir_action_window, self).read(cr, uid, select, fields=fields,
-                context=context, load=load)
+        res = super(ir_action_window, self).read(cr, uid, select, fields=fields, context=context, load=load)
         for r in res:
             mystring = 'department_users_get()'
             if mystring in (r.get('domain', '[]') or ''):
-                r['domain'] = r['domain'].replace(mystring, str(
-                    self.pool.get('hr.department')._get_members(cr, uid)))
+                r['domain'] = r['domain'].replace(mystring, str(self.pool.get('hr.department')._get_members(cr, uid)))
         if isinstance(ids, (int, long)):
             if res:
                 return res[0]
@@ -103,7 +110,7 @@ class res_users(osv.osv):
     _inherit = 'res.users'
     _description = 'User'
 
-    def _parent_compute(self, cr, uid, ids, name, args, context={}):
+    def _parent_compute(self, cr, uid, ids, name, args, context=None):
         result = {}
         obj_dept = self.pool.get('hr.department')
         for user_id in ids:
@@ -125,10 +132,12 @@ class res_users(osv.osv):
             return [('id', 'in', [0])]
         return [('id', 'in', child_ids.get(uid,[]))]
 
-    def _child_compute(self, cr, uid, ids, name, args, context={}):
+    def _child_compute(self, cr, uid, ids, name, args, context=None):
         obj_dept = self.pool.get('hr.department')
         obj_user = self.pool.get('res.users')
         result = {}
+        if context is None:
+            context = {}
         for manager_id in ids:
             child_ids = []
             mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
@@ -137,10 +146,9 @@ class res_users(osv.osv):
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
                 childs = map(lambda x: x['member_ids'], data_dept)
                 childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id','in',childs),('active','=',True)])
+                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)])
                 if manager_id in childs:
                     childs.remove(manager_id)
-
                 child_ids.extend(tools.flatten(childs))
                 set = {}
                 map(set.__setitem__, child_ids, [])
@@ -150,7 +158,7 @@ class res_users(osv.osv):
             result[manager_id] = child_ids
         return result
 
-    def _child_search(self, cr, uid, obj, name, args, context):
+    def _child_search(self, cr, uid, obj, name, args, context=None):
         parent = []
         for arg in args:
             if arg[0] == 'child_ids':
@@ -161,9 +169,11 @@ class res_users(osv.osv):
         return [('id', 'in', child_ids.get(uid,[]))]
 
     _columns = {
-        'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
+        'parent_id': fields.function(_parent_compute, relation='res.users', fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
         'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search, method=True, string="Subordinates", type='many2many'),
         'context_department_id': fields.many2one('hr.department', 'Departments'),
     }
+
 res_users()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 6859150e855..c0d388517eb 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
+
     <record id="view_hr_installer" model="ir.ui.view">
       <field name="name">hr.installer.view</field>
       <field name="model">hr.installer</field>
@@ -7,20 +9,18 @@
       <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Select Human Resources Modules To Install</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Select Human Resources Modules To Install</attribute>
-          </separator>
-           <xpath expr='//separator[@string="vsep"]' position='attributes'>
+            <form position="attributes">
+                <attribute name="string">Select Human Resources Modules To Install</attribute>
+            </form>
+            <separator string="title" position="attributes">
+                <attribute name="string">Select Human Resources Modules To Install</attribute>
+            </separator>
+            <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
-           </xpath>
-           <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
-          </xpath>
+            </xpath>
+            <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
+            </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
             <field name="hr_expense"/>
@@ -51,16 +51,18 @@
       <field name="action_id" ref="action_hr_installer"/>
       <field name="sequence">3</field>
     </record>
-   <record id="hr_ir_actions_todo_tree" model="ir.ui.view">
-    <field name="model">ir.actions.todo</field>
-    <field name="name">hr_installer_action_replace</field>
-    <field name="type">tree</field>
-    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-    <field name="arch" type="xml">
+
+    <record id="hr_ir_actions_todo_tree" model="ir.ui.view">
+        <field name="model">ir.actions.todo</field>
+        <field name="name">hr_installer_action_replace</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+        <field name="arch" type="xml">
            <xpath expr="//button[@string='Launch']" position="replace">
             <button name="%(action_hr_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
               </xpath>
-          </field>
+        </field>
     </record>
+
   </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f03058dccc7..161064723f9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,32 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            id="menu_hr_root"
-            icon="terp-hr"
-            name="Human Resources"
-            sequence="15"/>
-        <menuitem
-            id="menu_hr_main"
-            parent="menu_hr_root"
-            name="Human Resources"
-            sequence="0"/>
-        <menuitem
-            id="menu_hr_configuration"
-            name="Configuration"
-            parent="hr.menu_hr_root"
-            groups="group_hr_manager"
-            sequence="50" />
-        <menuitem
-            id="menu_hr_management"
-            name="Human Resources"
-            parent="hr.menu_hr_configuration"
-            groups="group_hr_manager"
-            sequence="1" />
-        <menuitem
-            id="menu_view_employee_category_configuration_form"
-            parent="hr.menu_hr_management"
-            name="Employees"
+
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="group_hr_manager"    sequence="50" />
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration"       groups="group_hr_manager" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees"
             sequence="1"/>
 
         <!--
@@ -42,50 +22,50 @@
                 <form string="Employee">
                     <group colspan="4" col="8">
                         <group colspan="6" col="6">
-                            <field colspan="6" name="name" />
-                            <field name="user_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="active" groups="base.group_extended"/>
-                            <newline/>
-                            <field name="parent_id" />
-                            <field name="coach_id" />
+                        <field colspan="6" name="name" />
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="active" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="parent_id" />
+                        <field name="coach_id" />
                         </group>
                         <group colspan="2" col="1">
-                            <field name="photo" widget='image' nolabel="1"/>
+                        <field name="photo" widget='image' nolabel="1"/>
                         </group>
                     </group>
                     <notebook colspan="6">
                         <page string="Personal Information">
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Social IDs"/>
-                                <field name="ssnid"/>
-                                <field name="sinid" groups="base.group_extended"/>
-                                <field name="otherid" groups="base.group_extended"/>
+                            <separator colspan="2" string="Social IDs"/>
+                            <field name="ssnid"/>
+                            <field name="sinid" groups="base.group_extended"/>
+                            <field name="otherid" groups="base.group_extended"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Status" colspan="2"/>
-                                <field name="gender"/>
-                                <field name="marital" widget="selection"/>
-                                <field name="country_id"/>
-                                <field name="birthday"/>
+                            <separator string="Status" colspan="2"/>
+                            <field name="gender"/>
+                            <field name="marital" widget="selection"/>
+                            <field name="country_id"/>
+                            <field name="birthday"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="address_home_id" colspan="2"/>
-                                <field name="partner_id" invisible="1" />
-                                <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
-                                <field name="work_phone"/>
-                                <field name="work_email" widget="email" />
-                                <field name="work_location"/>
+                            <separator string="Contact Information" colspan="2"/>
+                            <field name="address_home_id" colspan="2"/>
+                            <field name="partner_id" invisible="1" />
+                            <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
+                            <field name="work_phone"/>
+                            <field name="work_email" widget="email" />
+                            <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Position" colspan="2"/>
-                                <field name="job_id" widget="selection"/>
-                                <field name="department_id" widget="selection"/>
-                                <field name="category_id" />
-                                <!--<separator string="Managers" colspan="2"/>
-                                <field name="parent_id" />
-                                <field name="coach_id" />-->
+                            <separator string="Position" colspan="2"/>
+                            <field name="job_id" widget="selection"/>
+                            <field name="department_id" widget="selection"/>
+                            <field name="category_id" />
+                            <!--<separator string="Managers" colspan="2"/>
+                            <field name="parent_id" />
+                            <field name="coach_id" />-->
                             </group>
                         </page>
                         <page string="Notes">
@@ -112,29 +92,30 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_employee_filter" model="ir.ui.view">
             <field name="name">Employees</field>
             <field name="model">hr.employee</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive"
-                        groups="base.group_extended"/>
+                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
-                        <separator orientation="vertical" />
-                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
+                    <separator orientation="vertical" />
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     </group>
                 </search>
              </field>
          </record>
+
         <record id="open_view_employee_tree" model="ir.actions.act_window">
             <field name="name">Employees Structure</field>
             <field name="res_model">hr.employee</field>
@@ -153,7 +134,8 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
-       <record id="open_view_employee_list_my" model="ir.actions.act_window">
+
+        <record id="open_view_employee_list_my" model="ir.actions.act_window">
             <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
@@ -162,17 +144,14 @@
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
-        <menuitem
-            action="open_view_employee_list_my"
-            id="menu_open_view_employee_list_my"
-            sequence="3"
-            parent="menu_hr_main"/>
 
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
         <!--
         =======================
         Employee marital status
-        =======================     -->
+        =======================    
+        -->
 
         <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
             <field name="name">hr.hr.employee.marital.status</field>
@@ -194,17 +173,15 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem
-            action="action_hr_marital_status"
-            id="hr_menu_marital_status"
+        <menuitem action="action_hr_marital_status" id="hr_menu_marital_status"
             parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
 
-
         <!--
         =======================
         Employee architecture
         =======================
         -->
+
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
@@ -216,10 +193,10 @@
                     <field name="ssnid"/>
                     <field name="user_id"/>
                     <field name="address_id"/>
-
                 </tree>
             </field>
         </record>
+
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Employee Hierarchy</field>
             <field name="type">ir.actions.act_window</field>
@@ -228,6 +205,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_partner_tree2"/>
         </record>
+
         <ir_set>
             <field eval="'action'" name="key"/>
             <field eval="'client_action_multi'" name="key2"/>
@@ -255,6 +233,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_employee_category_list" model="ir.ui.view">
             <field name="name">hr.employee.category.list</field>
             <field name="model">hr.employee.category</field>
@@ -267,6 +246,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_employee_category_tree" model="ir.ui.view">
             <field name="name">hr.employee.category.tree</field>
             <field name="model">hr.employee.category</field>
@@ -278,6 +258,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_view_categ_form" model="ir.actions.act_window">
             <field name="name">Categories of Employee</field>
             <field name="res_model">hr.employee.category</field>
@@ -285,10 +266,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="open_view_categ_form"
-            id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1"
-            groups="base.group_extended"/>
+        <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -316,9 +295,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem
-            action="open_view_categ_tree"
-            groups="base.group_extended"
+        <menuitem action="open_view_categ_tree" groups="base.group_extended"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
@@ -328,11 +305,11 @@
             <field name="arch" type="xml">
                 <form string="Job">
                     <group col="6" colspan="4">
-                        <field name="name" />
-                        <field name="department_id" />
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="expected_employees"/>
-                        <field name="no_of_employee"/>
+                    <field name="name" />
+                    <field name="department_id" />
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="expected_employees"/>
+                    <field name="no_of_employee"/>
                     </group>
                     <newline/>
                     <notebook colspan="4">
@@ -350,6 +327,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_hr_job_tree" model="ir.ui.view">
             <field name="name">hr.job.tree</field>
             <field name="model">hr.job</field>
@@ -364,35 +342,28 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_job_filter" model="ir.ui.view">
             <field name="name">Job</field>
             <field name="model">hr.job</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <filter icon="terp-check"
-                        domain="[('state','in',('open','recruit'))]"
-                        string="Current"
+                    <filter icon="terp-check" domain="[('state','in',('open','recruit'))]" string="Current"
                         help="Open and in recruitment positions"/>
-                    <filter icon="terp-personal+"
-                        domain="[('state','=','recruit')]"
-                        string="Recruitment"
+                    <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="Recruitment"
                         help="In Recruitment"/>
-                    <filter icon="terp-camera_test"
-                        domain="[('state','=','open')]"
-                        string="Open"
+                    <filter icon="terp-camera_test" domain="[('state','=','open')]" string="Open"
                         help="Open Positions"/>
-
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                     <field name="department_id" widget="selection">
-                            <filter icon="terp-gtk-select-all"
-                            domain="[('department_id','=',context.get('department_id',False))]"
-                            help="My Departments Jobs"/>
+                    <field name="department_id" widget="selection">
+                            <filter icon="terp-gtk-select-all" domain="[('department_id','=',context.get('department_id',False))]" help="My Departments Jobs"/>
                     </field>
                 </search>
              </field>
          </record>
+
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
@@ -400,14 +371,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem
-            name="Recruitment"
-            id="base.menu_crm_case_job_req_main"
-            parent="menu_hr_root"/>
-        <menuitem
-            parent="base.menu_crm_case_job_req_main"
-            id="menu_hr_job"
-            action="action_hr_job" sequence="2"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/>
+        <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index bc3dd7d0b71..277a315edac 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -23,29 +23,28 @@ from osv import fields, osv
 class hr_installer(osv.osv_memory):
     _name = 'hr.installer'
     _inherit = 'res.config.installer'
-
     _columns = {
         # Human Resources Management
-        'hr_holidays':fields.boolean('Holidays / Leaves Management',
+        'hr_holidays': fields.boolean('Holidays / Leaves Management',
             help="Tracks employee leaves allocations, requests and planning."
                  "\n\nCan also plug into OpenERP's agendas and calendars "
                  "applications in order to display accepted leaves requests on"
                  " OpenERP's calendars."),
-        'hr_expense':fields.boolean('Expenses',
+        'hr_expense': fields.boolean('Expenses',
             help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
-        'hr_recruitment':fields.boolean('Recruitment Process',
+        'hr_recruitment': fields.boolean('Recruitment Process',
             help="Helps you manage and streamline your recruitment process."),
         'hr_timesheet_sheet':fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
                  "and attendance."),
-        'hr_contract':fields.boolean("Employee's Contracts",
+        'hr_contract': fields.boolean("Employee's Contracts",
             help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation':fields.boolean('Periodic Evaluations',
+        'hr_evaluation': fields.boolean('Periodic Evaluations',
             help="Lets you create and manage the periodic evaluation and "
                  "performance review of employees."),
-        'hr_attendance':fields.boolean('Attendances (Sign In/Out)',
+        'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
             help="Simplifies the management of employee attendances."),
         }
     _defaults = {
@@ -55,4 +54,4 @@ class hr_installer(osv.osv_memory):
 
 hr_installer()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index c79aae15dab..bc8e7ec2496 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="1">
+
     <record id="group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
     </record>
+
     <record id="group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
+
 </data>
 </openerp>
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index c0db422b997..1e40f35891b 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -26,7 +26,6 @@
     'category': 'Generic Modules/Human Resources',
     'description': """
     This module aims to manage employee's attendances.
-
     Keeps account of the attendances of the employees on the basis of the
     actions(Sign in/Sign out) performed by them.
        """,
@@ -42,7 +41,7 @@
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
         'wizard/hr_attendance_sign_in_out_view.xml',
-    ],
+        ],
     'demo_xml': ['hr_attendance_demo.xml'],
     'test': ['test/test_hr_attendance.yml'],
     'installable': True,
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index e14a91df084..b8892837310 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from mx import DateTime
 import time
 
 from osv import fields, osv
@@ -29,16 +28,16 @@ class hr_action_reason(osv.osv):
     _name = "hr.action.reason"
     _description = "Action Reason"
     _columns = {
-        'name' : fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
-        'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
+        'name': fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
+        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
     }
     _defaults = {
-        'action_type' : lambda *a: 'sign_in',
+        'action_type': 'sign_in',
     }
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
     if ids:
         return ids[0]
     return False
@@ -51,18 +50,18 @@ class hr_attendance(osv.osv):
         res = dict.fromkeys(ids, '')
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = time.strftime('%Y-%m-%d', time.strptime(obj.name, '%Y-%m-%d %H:%M:%S'))
-
         return res
+
     _columns = {
-        'name' : fields.datetime('Date', required=True, select=1),
-        'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
-        'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
-        'employee_id' : fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
-        'day' : fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
+        'name': fields.datetime('Date', required=True, select=1),
+        'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
+        'action_desc': fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
+        'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
+        'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
-        'name' : lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'employee_id' : _employee_get,
+        'name': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'employee_id': _employee_get,
     }
 
     def _altern_si_so(self, cr, uid, ids):
@@ -75,7 +74,6 @@ class hr_attendance(osv.osv):
             and name <= (select name from hr_attendance where id=%s)
             order by name desc
             limit 2 '''
-
             cr.execute(sql,(id,id))
             atts = cr.fetchall()
             if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
@@ -113,19 +111,18 @@ class hr_employee(osv.osv):
        'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
      }
 
-    def _action_check(self, cr, uid, emp_id, dt=False,context={}):
+    def _action_check(self, cr, uid, emp_id, dt=False, context=None):
         cr.execute('select max(name) from hr_attendance where employee_id=%s', (emp_id,))
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
-    def attendance_action_change(self, cr, uid, ids, type='action', context={}, dt=False, *args):
+    def attendance_action_change(self, cr, uid, ids, type='action', context=None, dt=False, *args):
         id = False
         warning_sign = 'sign'
 
         #Special case when button calls this method :type=context
-        if isinstance(type,dict):
+        if isinstance(type, dict):
             type = type.get('type','action')
-
         if type == 'sign_in':
             warning_sign = "Sign In"
         elif type == 'sign_out':
@@ -135,15 +132,15 @@ class hr_employee(osv.osv):
             if not self._action_check(cr, uid, emp['id'], dt, context):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
 
-            res = {'action' : type, 'employee_id' : emp['id']}
+            res = {'action': type, 'employee_id': emp['id']}
 
             if dt:
                 res['name'] = dt
-
             id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
+
         return True
 
 hr_employee()
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index 93908662470..372e9112269 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -7,100 +7,120 @@
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance2" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance3" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance4" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance5" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance6" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance7" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance8" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance9" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance10" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance11" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance12" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance13" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance14" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance15" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance16" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance17" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance18" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance19" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance20" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_report.xml b/addons/hr_attendance/hr_attendance_report.xml
index 329ca641377..d3e9448ead3 100644
--- a/addons/hr_attendance/hr_attendance_report.xml
+++ b/addons/hr_attendance/hr_attendance_report.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <report auto="False" id="attendance_error_report" keyword="client_print_multi" menu="False" model="hr.employee" multi="True" name="report.hr.timesheet.attendance.error" rml="hr_attendance/report/attendance_errors.rml" string="Attendance Error Report"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 68c4ad60926..08331823667 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,13 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendance">
-                    <field name="employee_id" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="action" select="1"/>
-                    <field name="action_desc" select="1"/>
+                    <field name="employee_id"  />
+                    <field name="name"  />
+                    <field name="action"  />
+                    <field name="action_desc"  />
                 </form>
             </field>
         </record>
+
         <record id="view_attendance_tree" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
@@ -51,9 +52,9 @@
                     <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <filter icon="terp-go-today" string="Today" domain="[('name::date','=',current_date)]" />
                     <separator orientation="vertical"/>
-                    <field name="employee_id" select="1" />
-                    <field name="name" select="1"  />
-                    <field name="action" select="1" />
+                    <field name="employee_id"   />
+                    <field name="name"    />
+                    <field name="action"   />
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -74,12 +75,8 @@
 
         <!--<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
             groups="group_hr_attendance"/>-->
-        <menuitem
-           id="menu_hr_time_tracking"
-           name="Time Tracking"
-           parent="hr.menu_hr_root" sequence="3"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance"
-            parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/>
+        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking"       groups="hr.group_hr_manager" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -87,11 +84,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="action_type" select="1"/>
+                    <field colspan="4" name="name"  />
+                    <field name="action_type" />
                 </form>
             </field>
         </record>
+
         <record id="view_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.tree</field>
             <field name="model">hr.action.reason</field>
@@ -103,6 +101,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_view_attendance_reason" model="ir.actions.act_window">
             <field name="name">Attendance Reasons</field>
             <field name="type">ir.actions.act_window</field>
@@ -111,6 +110,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
+
         <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_config"/>
 
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index dad6a918447..3fc43bce7c5 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -13,9 +13,7 @@
             groups="group_hr_attendance"/>-->
         <!--Time Tracking menu for Project Management-->
          <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-         <menuitem
-             id="base.menu_project_management_time_tracking"
-             name="Time Tracking"
+         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
              parent="base.menu_main_pm" sequence="3"/>
         <!--<menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="base.menu_project_management_time_tracking" type="wizard" sequence="9"/>
 -->
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 0c21892dc5c..2c0455e10d8 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-
 import time
 from report import report_sxw
 import pooler
 import datetime
 
 class attendance_print(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(attendance_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
@@ -80,14 +80,13 @@ class attendance_print(report_sxw.rml_parse):
                 total2 += r['delay']
         
         result_dict = {
-                'total' : total and str(total).split('.')[0],
-                'total2' : total2  and  str(total2).split('.')[0]
+                'total': total and str(total).split('.')[0],
+                'total2': total2  and str(total2).split('.')[0]
                 }
 #        return (self._sign(total),total2 and self._sign(total2))
         return [result_dict]
     
-report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml',parser=attendance_print, header=2)
-
+report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header=2)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index cfebc640777..fc646e089ac 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.py
@@ -30,7 +30,7 @@ from report.interface import report_rml
 from report.interface import toxml
 
 one_day = DateTime.RelativeDateTime(days=1)
-month2name = [0,'Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
+month2name = [0, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
 
 def hour2str(h):
     hours = int(h)
@@ -38,7 +38,10 @@ def hour2str(h):
     return '%02dh%02d' % (hours, minutes)
 
 class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context):
+
+    def create_xml(self, cr, uid, ids, datas, context=None):
+        if context is None:
+            context = {}
         month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
         user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
         for employee_id in ids:
@@ -67,7 +70,7 @@ class report_custom(report_rml):
                 if attendences and attendences[0]['action'] == 'sign_out':
                     attendences.insert(0, {'name': today.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
                 if attendences and attendences[-1]['action'] == 'sign_in':
-                    attendences.append({'name' : tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+                    attendences.append({'name': tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
                 # sum up the attendances' durations
                 for att in attendences:
                     dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
@@ -88,7 +91,6 @@ class report_custom(report_rml):
         %s
         </report>
         ''' % '\n'.join(user_xml)
-
         return xml
 
 report_custom('report.hr.attendance.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 7319c366298..8b5bbdff5e7 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -22,7 +22,7 @@
 from mx import DateTime
 from mx.DateTime import now
 
-import netsvc
+
 import pooler
 
 from report.interface import report_rml
@@ -35,13 +35,12 @@ def to_hour(h):
     return int(h), int(round((h - int(h)) * 60, 0))
 
 class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context):
 
+    def create_xml(self, cr, uid, ids, datas, context=None):
         start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
         end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
         first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
         last_monday = end_date + DateTime.RelativeDateTime(days=7 - end_date.day_of_week)
-
         if last_monday < first_monday:
             first_monday, last_monday = last_monday, first_monday
 
@@ -73,9 +72,9 @@ class report_custom(report_rml):
                     # Fake sign ins/outs at week ends, to take attendances across week ends into account
                     # XXX this is wrong for the first sign-in ever and the last sign out to this date
                     if attendances and attendances[0]['action'] == 'sign_out':
-                        attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
+                        attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_in'})
                     if attendances and attendances[-1]['action'] == 'sign_in':
-                        attendances.append({'name' : n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+                        attendances.append({'name': n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_out'})
                     # sum up the attendances' durations
                     for att in attendances:
                         dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
index 7973239ebcf..fd6ad2e0ccb 100644
--- a/addons/hr_attendance/security/hr_security.xml
+++ b/addons/hr_attendance/security/hr_security.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
-    <record id="group_hr_attendance" model="res.groups">
-        <field name="name">Human Resources / Attendances User</field>
-    </record>
-</data>
+    <data noupdate="1">
+
+        <record id="group_hr_attendance" model="res.groups">
+            <field name="name">Human Resources / Attendances User</field>
+        </record>
+
+    </data>
 </openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 2b2c33cf5eb..f66e7892601 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
@@ -26,16 +27,17 @@ class hr_attendance_bymonth(osv.osv_memory):
     _name = 'hr.attendance.month'
     _description = 'Print Monthly Attendance Report'
     _columns = {
-        'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')],
-                                  'Month', required=True),
+        'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], 'Month', required=True),
         'year': fields.integer('Year', required=True)
                 }
     _defaults = {
-         'month': lambda * a: time.gmtime()[1],
-         'year': lambda * a: time.gmtime()[0],
+         'month': time.gmtime()[1],
+         'year': time.gmtime()[0],
              }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         datas = {
              'ids': [],
              'model': 'hr.employee',
@@ -49,4 +51,4 @@ class hr_attendance_bymonth(osv.osv_memory):
 
 hr_attendance_bymonth()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 725ce7b5004..6518202ac36 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
 			<form string="Print Attendance Report Monthly">
 			    <group col="4" colspan="6">
-				    <field name="month"/>
-				    <field name="year"/>
-				    <newline/>
+			    <field name="month"/>
+			    <field name="year"/>
+			    <newline/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -42,4 +42,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 30c63d69f2b..9ef48f29fff 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -28,11 +28,11 @@ class hr_attendance_byweek(osv.osv_memory):
     _columns = {
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True)
-                }
+        }
     _defaults = {
-         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
-         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
-             }
+         'init_date': time.strftime('%Y-%m-%d'),
+         'end_date': time.strftime('%Y-%m-%d'),
+        }
 
     def print_report(self, cr, uid, ids, context=None):
         datas = {
@@ -47,4 +47,4 @@ class hr_attendance_byweek(osv.osv_memory):
             }
 hr_attendance_byweek()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 220ceef2e48..1e536334675 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -9,10 +9,10 @@
             <field name="arch" type="xml">
 			<form string="Print Attendance Report Weekly">
 			    <group col="4" colspan="6">
-			    	<separator string="Select a starting and a end date" colspan="4"/>
-				    <field name="init_date"/>
-				    <field name="end_date"/>
-				    <newline/>
+		    	<separator string="Select a starting and a end date" colspan="4"/>
+			    <field name="init_date"/>
+			    <field name="end_date"/>
+			    <newline/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -43,4 +43,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 47029822741..62689705c17 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -31,15 +31,16 @@ class hr_attendance_error(osv.osv_memory):
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True),
         'max_delay': fields.integer('Max. Delay (Min)', required=True)
-
-                }
+        }
     _defaults = {
-         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
-         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'init_date': time.strftime('%Y-%m-%d'),
+         'end_date': time.strftime('%Y-%m-%d'),
          'max_delay': 120,
-             }
+        }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         emp_ids = []
         data_error = self.read(cr, uid, ids)[0]
         date_from = data_error['init_date']
@@ -67,4 +68,4 @@ class hr_attendance_error(osv.osv_memory):
 
 hr_attendance_error()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 3061c263687..fbb65993f9f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -9,12 +9,12 @@
             <field name="arch" type="xml">
 			<form string="Print Attendance Report Error">
 			    <group col="4" colspan="6">
-			    	<separator string="Analysis Information" colspan="4"/>
-				    <field name="init_date"/>
-				    <field name="end_date"/>
-				    <field name="max_delay"/>
-				    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
-				    <newline/>
+		    	<separator string="Analysis Information" colspan="4"/>
+			    <field name="init_date"/>
+			    <field name="end_date"/>
+			    <field name="max_delay"/>
+			    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+			    <newline/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -45,4 +45,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index d40829cf120..7ffd94dbca5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -20,7 +20,6 @@
 ##############################################################################
 import time
 
-import netsvc
 from osv import osv, fields
 from tools.translate import _
 
@@ -31,8 +30,11 @@ class hr_si_so_ask(osv.osv_memory):
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
         'last_time': fields.datetime('Your last sign out', required=True),
         'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
-                }
+        }
+
     def _get_empname(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
@@ -114,7 +116,7 @@ class hr_sign_in_out(osv.osv_memory):
         data = self.read(cr, uid, ids, [])[0]
         att_obj = self.pool.get('hr.attendance')
         emp_id = data['emp_id']
-        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
+        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
         last_att = att_obj.browse(cr, uid, att_id, context=context)
         if last_att:
             last_att = last_att[0]
@@ -152,11 +154,8 @@ class hr_sign_in_out(osv.osv_memory):
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
                 raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
-            self.pool.get('hr.attendance').create(cr, uid, {
-                'name': data['last_time'],
-                'action': 'sign_out',
-                'employee_id': emp_id
-            })
+            self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
+                'employee_id': emp_id})
         try:
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 7598543e302..edcdf55091f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -8,9 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out">
                     <group colspan="4" >
-                        <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
-                        <field name="name" />
-                        <field name="state" />
+                    <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
+                    <field name="name" />
+                    <field name="state" />
                     </group>
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
@@ -45,8 +45,7 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem action="action_hr_attendance_sigh_in_out"
-            id="menu_hr_attendance_sigh_in_out"
+        <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
             parent="menu_hr_time_tracking" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
@@ -56,9 +55,9 @@
             <field name="arch" type="xml">
                 <form string="hr.sign.out.ask">
                     <group colspan="4" >
-                        <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-                        <field name="name" />
-                        <field name="last_time" string="Your last sign out" />
+                    <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
+                    <field name="name" />
+                    <field name="last_time" string="Your last sign out" />
                     </group>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -75,9 +74,9 @@
             <field name="arch" type="xml">
                 <form string="hr.sign.in.out.ask">
                     <group colspan="4" >
-                        <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-                        <field name="name" />
-                        <field name="last_time" string="Your last sign in" />
+                    <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
+                    <field name="name" />
+                    <field name="last_time" string="Your last sign in" />
                     </group>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -87,6 +86,5 @@
             </field>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 29678612e34..a649a53478a 100755
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -29,7 +29,6 @@
     * Martial status,
     * Security number,
     * Place of birth, birth date, ...
-
     You can assign several contracts per employee.
     """,
     'author': 'Tiny',
@@ -40,7 +39,7 @@
         'security/hr_contract_security.xml',
         'security/ir.model.access.csv',
         'hr_contract_view.xml'
-    ],
+        ],
     'demo_xml': [],
     'test': ['test/test_hr_contract.yml'],
     'installable': True,
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 90889b6343e..edc6ee4dc74 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -34,7 +34,7 @@ class hr_employee(osv.osv):
         'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
-    }
+        }
 hr_employee()
 
 #Contract wage type period name
@@ -44,10 +44,10 @@ class hr_contract_wage_type_period(osv.osv):
     _columns = {
         'name': fields.char('Period Name', size=50, required=True, select=True),
         'factor_days': fields.float('Hours in the period', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
-    }
+        }
     _defaults = {
-        'factor_days': lambda *args: 168.0
-    }
+        'factor_days': 168.0
+        }
 hr_contract_wage_type_period()
 
 #Contract wage type (hourly, daily, monthly, ...)
@@ -55,15 +55,15 @@ class hr_contract_wage_type(osv.osv):
     _name = 'hr.contract.wage.type'
     _description = 'Wage Type'
     _columns = {
-        'name' : fields.char('Wage Type Name', size=50, required=True, select=True),
-        'period_id' : fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True),
-        'type' : fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
+        'name': fields.char('Wage Type Name', size=50, required=True, select=True),
+        'period_id': fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True),
+        'type': fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
         'factor_type': fields.float('Factor for hour cost', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
-    }
+        }
     _defaults = {
-        'type' : lambda *a : 'gross',
-        'factor_type': lambda *args: 1.8
-    }
+        'type': 'gross',
+        'factor_type': 1.8
+        }
 hr_contract_wage_type()
 
 
@@ -93,10 +93,11 @@ class hr_contract(osv.osv):
         'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
         'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)),
         'notes': fields.text('Notes'),
-    }
+        }
     _defaults = {
-        'date_start' : lambda *a : time.strftime("%Y-%m-%d"),
-    }
+        'date_start': time.strftime("%Y-%m-%d"),
+        }
+
 hr_contract()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml
index 511bbce3f4e..de77e8e4277 100644
--- a/addons/hr_contract/hr_contract_data.xml
+++ b/addons/hr_contract/hr_contract_data.xml
@@ -19,6 +19,7 @@
             <field name="type">gross</field>
             <field name="period_id" ref="hr_contract_wage_type_period_monthly"/>
         </record>
+
         <record id="hr_contract_monthly_net" model="hr.contract.wage.type">
             <field name="name">Monthly Net Wage</field>
             <field name="type">net</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 16ceebb96b3..5ff928916c9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -37,12 +37,12 @@
             <field name="arch" type="xml">
                 <search string="Search Wage Type">
                    <group col='15' colspan='4'>
-                       <field name="name"/>
-                       <field name="type"/>
+                   <field name="name"/>
+                   <field name="type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                       <filter string="Period" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}"/>
+                   <filter string="Period" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}"/>
                    </group>
                </search>
             </field>
@@ -58,7 +58,6 @@
         </record>
 
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
-
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -80,7 +79,7 @@
             <field name="arch" type="xml">
                 <search string="Search Wage Period">
                    <group col='15' colspan='4'>
-                       <field name="name"/>
+                    <field name="name"/>
                    </group>
                </search>
             </field>
@@ -94,12 +93,9 @@
             <field name="search_view_id" ref="hr_contract_wage_type_period_view_search"/>
         </record>
 
-        <menuitem
-                action="action_hr_contract_wage_type_period"
-                id="hr_menu_contract_wage_type_period"
+        <menuitem action="action_hr_contract_wage_type_period" id="hr_menu_contract_wage_type_period"
                 parent="hr_contract.next_id_56"/>
 
-
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
@@ -108,20 +104,20 @@
                 <notebook position="inside">
                     <page string="Miscelleanous">
                         <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
+                        <separator string="Personal Info" colspan="2"/>
+                        <field name="bank_account"/>
+                        <field name="place_of_birth"/>
+                        <field name="children"/>
                         </group>
                         <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" select="1"/>
-                            <field name="vehicle" select="1"/>
-                            <field name="vehicle_distance" select="1"/>
+                        <separator string="Job Info" colspan="2"/>
+                        <field name="manager" />
+                        <field name="vehicle" />
+                        <field name="vehicle_distance" />
                         </group>
                         <group colspan="2" col="2">
-                            <separator string="Others Info" colspan="2"/>
-                            <field name="medic_exam" select="1"/>
+                        <separator string="Others Info" colspan="2"/>
+                        <field name="medic_exam" />
                         </group>
                     </page>
                 </notebook>
@@ -135,14 +131,14 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                       <field name="name"/>
-                       <field name="employee_id"/>
-                       <field name="date_start"/>
-                       <field name="date_end"/>
+                   <field name="name"/>
+                   <field name="employee_id"/>
+                   <field name="date_start"/>
+                   <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                       <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                    <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
                    </group>
                </search>
             </field>
@@ -155,26 +151,26 @@
             <field name="arch" type="xml">
                 <form string="Contract">
                     <group colspan="3" col="6">
-                        <field name="name" select="1"/>
-                        <field name="employee_id" select="1"/>
-                        <field name="job_id"/>
-                        <field name="wage"/>
-                        <field name="wage_type_id" widget="selection"/>
-                        <field name="type_id" widget="selection"/>
+                    <field name="name" />
+                    <field name="employee_id" />
+                    <field name="job_id"/>
+                    <field name="wage"/>
+                    <field name="wage_type_id" widget="selection"/>
+                    <field name="type_id" widget="selection"/>
                     </group>
                     <notebook>
                     <page string="Main Data">
                         <group col="2" colspan="2">
-                            <separator colspan="2" string="Duration"/>
-                            <field name="date_start" select="1"/>
-                            <field name="date_end" select="1"/>
-                            <field name="working_hours"/>
+                        <separator colspan="2" string="Duration"/>
+                        <field name="date_start" />
+                        <field name="date_end" />
+                        <field name="working_hours"/>
                         </group>
                         <group col="2" colspan="2">
-                            <separator colspan="2" string="Advantages"/>
-                            <field name="advantages_net"/>
-                            <field name="advantages_gross"/>
-                            <field name="advantages" nolabel="1" colspan="2"/>
+                        <separator colspan="2" string="Advantages"/>
+                        <field name="advantages_net"/>
+                        <field name="advantages_gross"/>
+                        <field name="advantages" nolabel="1" colspan="2"/>
                         </group>
                         <separator colspan="4" string="Notes"/>
                         <field colspan="4" name="notes" nolabel="1"/>
@@ -241,7 +237,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group col='15' colspan='4'>
-                       <field name="name"/>
+                    <field name="name"/>
                    </group>
                </search>
             </field>
@@ -254,13 +250,12 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
-        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
+        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
 
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index b8fbf3b54ea..f407166082c 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+    <data noupdate="1">
 
-    <record id="group_hr_contract" model="res.groups">
-        <field name="name">Human Resources / Contracts</field>
-    </record>
+        <record id="group_hr_contract" model="res.groups">
+            <field name="name">Human Resources / Contracts</field>
+        </record>
 
-</data>
+    </data>
 </openerp>
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 84d4ea61b57..9292b10fd4c 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -21,27 +21,29 @@
 
 {
     "name" : "Human Resources Evaluation",
-    "version" : "0.1",
-    "author" : "Tiny",
-    "category" : "Generic Modules/Human Resources",
-    "website" : "http://www.openerp.com",
-    "depends" : ["hr",'hr_recruitment','survey'],
+    "version": "0.1",
+    "author": "Tiny",
+    "category": "Generic Modules/Human Resources",
+    "website": "http://www.openerp.com",
+    "depends": ["hr",'hr_recruitment','survey'],
     "description": """
-                      Ability to create employees evaluation.
-                      An evaluation can be created by employee for subordinates,
-                      juniors as well as his manager.The evaluation is done under a plan
-                      in which various surveys can be created and it can be defined which
-                      level of employee hierarchy fills what and final review and evaluation
-                      is done by the manager.Every evaluation filled by the employees can be viewed
-                      in the form of.Implements a dashboard for My Current Evaluations   """,
-    "init_xml" : [],
-    "demo_xml" : ["hr_evaluation_demo.xml",
+          Ability to create employees evaluation.
+          An evaluation can be created by employee for subordinates,
+          juniors as well as his manager.The evaluation is done under a plan
+          in which various surveys can be created and it can be defined which
+          level of employee hierarchy fills what and final review and evaluation
+          is done by the manager.Every evaluation filled by the employees can be viewed
+          in the form of.Implements a dashboard for My Current Evaluations  
+         """,
+    "init_xml": [],
+    "demo_xml": ["hr_evaluation_demo.xml",
                  ],
-    "update_xml" : [
-                    "security/ir.model.access.csv",
-                    "wizard/hr_evaluation_mail_view.xml",
-                    "hr_evaluation_view.xml",
-                    "report/hr_evaluation_report_view.xml"],
+    "update_xml": [
+        "security/ir.model.access.csv",
+        "wizard/hr_evaluation_mail_view.xml",
+        "hr_evaluation_view.xml",
+        "report/hr_evaluation_report_view.xml"
+        ],
     "test": ["test/test_hr_evaluation.yml"],
     "active": False,
     "installable": True
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 7592c4d6584..429b492131d 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -36,11 +36,11 @@ class hr_evaluation_plan(osv.osv):
         'month_first': fields.integer('First Evaluation After'),
         'month_next': fields.integer('Next Evaluation After'),
         'active': fields.boolean('Active')
-    }
+        }
     _defaults = {
-        'active' : True,
+        'active': True,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
-    }
+        }
 hr_evaluation_plan()
 
 class hr_evaluation_plan_phase(osv.osv):
@@ -75,8 +75,8 @@ class hr_evaluation_plan_phase(osv.osv):
         'email_subject':fields.text('char')
     }
     _defaults = {
-        'sequence' : lambda *a: 1,
-        'email_subject':_('''Regarding '''),
+        'sequence' : 1,
+        'email_subject': _('''Regarding '''),
         'mail_body' : lambda *a:_('''
 Date : %(date)s
 
@@ -93,8 +93,6 @@ Thanks,
 
         '''),
     }
-
-
 hr_evaluation_plan_phase()
 
 class hr_employee(osv.osv):
@@ -106,6 +104,8 @@ class hr_employee(osv.osv):
     }
 
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+        if context is None:
+            context = {}
         for id in self.browse(cr, uid, self.search(cr, uid, [], context=context), context=context):
             if id.evaluation_plan_id and id.evaluation_date:
                 if (dt.ISO.ParseAny(id.evaluation_date) + dt.RelativeDateTime(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
@@ -113,7 +113,7 @@ class hr_employee(osv.osv):
                     self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : id.id, 'plan_id': id.evaluation_plan_id}, context)
         return True
 
-    def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context={}):
+    def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
         evaluation_date = evaluation_date or False
         evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
         if evaluation_plan_id:
@@ -127,10 +127,10 @@ class hr_employee(osv.osv):
                     evaluation_date=(dt.ISO.ParseAny(evaluation_date)+ dt.RelativeDateTime(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d')
                     flag = True
             if ids and flag:
-                self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : ids[0], 'plan_id': evaluation_plan_id}, context=context)
-        return {'value': {'evaluation_date':evaluation_date}}
+                self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context)
+        return {'value': {'evaluation_date': evaluation_date}}
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         id = super(hr_employee, self).create(cr, uid, vals, context=context)
         if vals.get('evaluation_plan_id', False):
             self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : id, 'plan_id': vals['evaluation_plan_id']}, context=context)
@@ -183,7 +183,7 @@ class hr_evaluation(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def onchange_employee_id(self, cr, uid, ids, employee_id, context={}):
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         employee_obj=self.pool.get('hr.employee')
         evaluation_plan_id=''
         if employee_id:
@@ -193,7 +193,7 @@ class hr_evaluation(osv.osv):
                 employee_ids=employee_obj.search(cr, uid, [('parent_id','=',employee.id)], context=context)
         return {'value': {'plan_id':evaluation_plan_id}}
 
-    def button_plan_in_progress(self, cr, uid, ids, context={}):
+    def button_plan_in_progress(self, cr, uid, ids, context=None):
         apprai_id = []
         for evaluation in self.browse(cr, uid, ids, context):
             wait = False
@@ -224,13 +224,8 @@ class hr_evaluation(osv.osv):
                         hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [int_id], context=context)
 
                     if (not wait) and phase.mail_feature:
-                        body = phase.mail_body % {
-                            'employee_name': child.name,
-                            'user_signature': user.signature,
-                            'eval_name': phase.survey_id.title,
-                            'date': time.strftime('%Y-%m-%d'),
-                            'time': time
-                        }
+                        body = phase.mail_body % {'employee_name': child.name, 'user_signature': user.signature,
+                            'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
                         sub = phase.email_subject
                         dest = [child.work_email]
                         if dest:
@@ -239,7 +234,7 @@ class hr_evaluation(osv.osv):
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
 
-    def button_final_validation(self, cr, uid, ids, context={}):
+    def button_final_validation(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'progress'})
         request_obj = self.pool.get('hr.evaluation.interview')
         for id in self.browse(cr, uid ,ids,context=context):
@@ -247,21 +242,21 @@ class hr_evaluation(osv.osv):
                 raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state"))
         return True
 
-    def button_done(self,cr, uid, ids, context={}):
+    def button_done(self,cr, uid, ids, context=None):
         self.write(cr,uid,ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
-    def button_cancel(self, cr, uid, ids, context={}):
+    def button_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids,{'state':'cancel'}, context=context)
         return True
 
 hr_evaluation()
 
 class survey_request(osv.osv):
-    _inherit="survey.request"
+    _inherit = "survey.request"
     _columns = {
-        'is_evaluation':fields.boolean('Is Evaluation?'),
-    }
+        'is_evaluation': fields.boolean('Is Evaluation?'),
+        }
     _defaults = {
         'state': 'waiting_answer',
         }
@@ -269,19 +264,19 @@ class survey_request(osv.osv):
 survey_request()
 
 class hr_evaluation_interview(osv.osv):
-    _name='hr.evaluation.interview'
-    _inherits={'survey.request':'request_id'}
-    _description='Evaluation Interview'
+    _name = 'hr.evaluation.interview'
+    _inherits = {'survey.request': 'request_id'}
+    _description = 'Evaluation Interview'
     _columns = {
         'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade'),
         'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
-        'evaluation_id' : fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'),
-    }
+        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'),
+        }
     _defaults = {
         'is_evaluation': True,
-    }
+        }
 
-    def survey_req_waiting_answer(self, cr, uid, ids, context={}):
+    def survey_req_waiting_answer(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
         return True
 
@@ -306,16 +301,16 @@ class hr_evaluation_interview(osv.osv):
                     tot_done_req += 1
             if not flag and wating_id:
                 self.survey_req_waiting_answer(cr, uid, [wating_id], context)
-            hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress' :tot_done_req * 100 / len(records)}, context=context)
-        self.write(cr, uid, ids, { 'state' : 'done'})
+            hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress': tot_done_req * 100 / len(records)}, context=context)
+        self.write(cr, uid, ids, { 'state': 'done'})
         return True
 
-    def survey_req_draft(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, { 'state' : 'draft'}, context=context)
+    def survey_req_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, { 'state': 'draft'}, context=context)
         return True
 
-    def survey_req_cancel(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, { 'state' : 'cancel'}, context=context)
+    def survey_req_cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, { 'state': 'cancel'}, context=context)
         return True
 
     def action_print_survey(self, cr, uid, ids, context=None):
@@ -331,12 +326,12 @@ class hr_evaluation_interview(osv.osv):
         """
         if not context:
             context = {}
-
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
-        context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,})
+        context.update({'survey_id': record.survey_id.id, 'response_id': [record.response.id], 'response_no':0,})
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
         return value
+
 hr_evaluation_interview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 83776dde4cd..1147483f8fd 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="survey_2" model="survey">
             <field name="title">Employee Evaluation</field>
             <field name="max_response_limit">20</field>
@@ -10,6 +11,7 @@
             <field name="response_user">5</field>
         </record>
     </data>
+
     <data>
         <record id="survey_3" model="survey">
             <field name="title">Employee Opinion</field>
@@ -20,6 +22,7 @@
             <field name="response_user">5</field>
         </record>
     </data>
+
     <data>
         <record id="survey_page_1" model="survey.page">
             <field name="title">Employee Evaluation Form</field>
@@ -27,6 +30,7 @@
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_page_2" model="survey.page">
             <field name="title">Process</field>
@@ -42,6 +46,7 @@
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_page_6" model="survey.page">
             <field name="title">Employee Performance In Key Areas</field>
@@ -81,8 +86,6 @@
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_question_0" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -132,6 +135,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_3" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -156,6 +160,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_4" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -203,6 +208,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <!--record id="survey_question_7" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -227,6 +233,7 @@
             <field eval="0" name="allow_comment"/>
         </record-->
     </data>
+
     <data>
         <record id="survey_question_8" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -304,8 +311,6 @@
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_question_14" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -331,7 +336,6 @@
         </record>
     </data>
 
-
     <data>
         <record id="survey_question_17" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -356,6 +360,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_18" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -381,8 +386,6 @@
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_question_23" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -436,6 +439,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_40" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -460,6 +464,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_41" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -502,7 +507,6 @@
             <field name="type">descriptive_text</field>
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
             <field name="descriptive_text">* It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated.
-
 * Critical or key elements of performance and professional development needs (if any), should also be noted at this time</field>
             <field eval="0" name="make_comment_field"/>
             <field eval="1" name="in_visible_menu_choice"/>
@@ -583,7 +587,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
     <!--data>
         <record id="survey_question_42" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -727,6 +730,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_4" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -735,6 +739,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_5" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -743,6 +748,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_6" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -751,6 +757,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_7" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -759,6 +766,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_8" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -767,6 +775,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_9" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -775,6 +784,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_10" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -783,6 +793,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_11" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -791,6 +802,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_12" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -799,6 +811,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_13" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -807,6 +820,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_14" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -815,6 +829,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_15" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -823,6 +838,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_16" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -831,6 +847,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_17" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -839,6 +856,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_18" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -847,6 +865,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_19" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -855,6 +874,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_20" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -863,6 +883,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_21" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -871,6 +892,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_22" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -879,6 +901,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_23" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -887,6 +910,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_24" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -895,6 +919,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_25" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -903,6 +928,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_26" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -911,6 +937,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_27" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -919,6 +946,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_28" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -927,6 +955,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_29" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -935,6 +964,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_30" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -943,6 +973,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_31" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -951,6 +982,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_32" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -959,6 +991,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_33" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -967,6 +1000,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_34" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -975,6 +1009,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_35" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -983,6 +1018,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_36" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -991,6 +1027,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_37" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -999,6 +1036,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_38" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1007,6 +1045,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_39" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1015,6 +1054,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_40" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1023,6 +1063,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_41" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1031,6 +1072,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_42" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1039,6 +1081,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_43" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1056,6 +1099,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_1" model="survey.answer">
             <field name="answer">Name</field>
@@ -1064,6 +1108,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_2" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1072,6 +1117,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_3" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1080,6 +1126,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_4" model="survey.answer">
             <field name="in_visible_answer_type">0</field>
@@ -1089,6 +1136,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_5" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1097,6 +1145,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_6" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1105,6 +1154,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_7" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1113,6 +1163,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_8" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1121,6 +1172,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_9" model="survey.answer">
             <field name="in_visible_answer_type">0</field>
@@ -1130,6 +1182,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_10" model="survey.answer">
             <field name="answer">Position Title</field>
@@ -1138,6 +1191,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_11" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1146,6 +1200,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_12" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1154,6 +1209,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_13" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1162,6 +1218,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_14" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1170,6 +1227,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_15" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1178,6 +1236,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_16" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1187,6 +1246,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_17" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1195,6 +1255,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_18" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1203,6 +1264,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_19" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1211,6 +1273,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_20" model="survey.answer">
             <field name="answer">Appraisal for Period</field>
@@ -1219,6 +1282,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_21" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1227,6 +1291,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_22" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1235,6 +1300,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_23" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1243,6 +1309,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_24" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1251,6 +1318,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_25" model="survey.answer">
             <field name="answer">Date of Review</field>
@@ -1259,6 +1327,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_26" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1267,6 +1336,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_27" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1276,8 +1346,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_answer_31" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1287,7 +1355,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
     <data>
         <record id="survey_answer_43" model="survey.answer">
             <field name="answer">Appraiser</field>
@@ -1296,6 +1363,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_44" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1304,6 +1372,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_45" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1312,6 +1381,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_46" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1320,6 +1390,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_47" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1328,6 +1399,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_48" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1336,6 +1408,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_49" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1344,6 +1417,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_50" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1352,6 +1426,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_51" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1360,6 +1435,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_52" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1377,6 +1453,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_68" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1385,6 +1462,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_69" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1393,6 +1471,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_70" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1401,6 +1480,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_71" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1409,6 +1489,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_72" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1417,6 +1498,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_73" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1425,6 +1507,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_74" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1433,6 +1516,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_75" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1441,6 +1525,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_76" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1449,6 +1534,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_77" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1457,6 +1543,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_78" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1483,6 +1570,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_9"/>
         </record>
     </data>
+
     <data>
         <record id="survey_tbl_column_heading_results0" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1491,6 +1579,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_9"/>
         </record>
     </data>
+
     <data>
         <record id="survey_tbl_column_heading_comments0" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1500,7 +1589,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
 <!--    <data noupdate="1">-->
 <!--        <record id="survey_request_1" model="survey.request">-->
 <!--            <field name="state">waiting_answer</field>-->
@@ -1510,6 +1598,7 @@ Once the form had been filled, the employee send it to his supervisor.
 <!--            <field name="date_deadline">2010-02-21</field>-->
 <!--        </record>-->
 <!--    </data>-->
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
             <field eval="1" name="active"/>
@@ -1519,6 +1608,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="company_id" ref="base.main_company"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1534,6 +1624,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="wait"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1549,6 +1640,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="wait"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1564,6 +1656,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="wait"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1603,8 +1696,7 @@ Once the form had been filled, the employee send it to his supervisor.
 <!--    </data>-->
 
 		<data>
-		  <record forcecreate="True" id="ir_cron_scheduler_evaluation"
-		   model="ir.cron">
+		  <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
 		   <field name="name">Run Employee Evaluation</field>
 		   <field eval="True" name="active" />
 		   <field name="user_id" ref="base.user_root" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6a8770f53b5..32e93d5964b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -61,13 +61,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
 
-       <menuitem
-            name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
-        <menuitem
-            parent="menu_eval_hr_config"
-            id="menu_open_view_hr_evaluation_plan_tree"
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
+        <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
@@ -185,30 +182,19 @@
                     <newline/>
                     <group col="6" colspan="4">
                     <field name="state"/>
-                    <button name="button_plan_in_progress"
-                            string="Start Evaluation"
-                            states="draft"
-                            type="object"
+                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
                             icon="gtk-execute"/>
-                    <button name="button_final_validation"
-                            string="Final Validation"
-                            states="wait"
-                            type="object"
+                    <button name="button_final_validation" string="Final Validation" states="wait" type="object"
                             icon="gtk-execute"/>
-                    <button name="button_done"
-                            string="Done"
-                            states="progress"
-                            type="object"
+                    <button name="button_done" string="Done" states="progress" type="object"
                             icon="gtk-jump-to"/>
-                    <button name="button_cancel"
-                            string="Cancel"
-                            states="draft,wait,progress"
-                            type="object"
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
                             icon="gtk-cancel"/>
                     </group>
               </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_tree">
             <field name="name">hr_evaluation.evaluation.tree</field>
             <field name="model">hr_evaluation.evaluation</field>
@@ -225,6 +211,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_graph">
             <field name="name">hr_evaluation.evaluation.graph</field>
             <field name="model">hr_evaluation.evaluation</field>
@@ -236,6 +223,7 @@
                 </graph>
             </field>
         </record>
+
        <record id="hr_evaluation.evaluation_search" model="ir.ui.view">
             <field name="name">hr_evaluation.evaluation_search</field>
             <field name="model">hr_evaluation.evaluation</field>
@@ -243,22 +231,17 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
-                        <filter icon="terp-dialog-close" string="Final Step" domain="[('state','=','progress')]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-week" string="7 Days"
-                            help="Evaluations to close within the next 7 days"
-                            domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                    <filter icon="terp-dialog-close" string="Final Step" domain="[('state','=','progress')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
+                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed"
-                            help="Evaluations that overpassed the deadline"
-                            domain="[('date','&gt;=',(datetime.date.today()))]"
-                        />
-
+                            help="Evaluations that overpassed the deadline" domain="[('date','&gt;=',(datetime.date.today()))]" />
                         <separator orientation="vertical"/>
-                        <field name="employee_id" select="1"/>
-                        <field name="plan_id" widget="selection" select="1"/>
+                        <field name="employee_id" />
+                        <field name="plan_id" widget="selection" />
                         </group>
                         <newline/>
                         <group expand='0' string='Group by...'>
@@ -278,9 +261,8 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
         </record>
-        <menuitem
-            name="Evaluation" parent="menu_eval_hr"
-            id="menu_open_view_hr_evaluation_tree"
+
+        <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
             action="open_view_hr_evaluation_tree"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
@@ -293,10 +275,8 @@
                         <field name="survey_id"/>
                         <field name="evaluation_id"/>
                         <group col="2" colspan="2">
-                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
-                                icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
-                                icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                         </group>
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
@@ -327,10 +307,8 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
                     <field name="response" readonly="1" invisible="True"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
-                        icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
-                        icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
                     <field name="state"/>
                 </tree>
             </field>
@@ -369,17 +347,13 @@
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
-        <menuitem
-            name="Interview Requests" parent="menu_eval_hr"
-            id="menu_open_hr_evaluation_interview_requests"
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-
-      <menuitem name="Evaluation Reminders" parent="menu_eval_hr"
-           id="menu_eval_send_mail"
-           action="action_hr_evaluation_send_mail"
-           sequence="45"/>
+        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
+           action="action_hr_evaluation_send_mail" sequence="45"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window domain="[('user_to_review_id', '=', active_id)]" id="act_hr_employee_2_hr__evaluation_interview" name="Evaluation Interviews" res_model="hr.evaluation.interview" src_model="hr.employee"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/report/__init__.py b/addons/hr_evaluation/report/__init__.py
index 507f8d6715b..f8ddaab3486 100644
--- a/addons/hr_evaluation/report/__init__.py
+++ b/addons/hr_evaluation/report/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import hr_evaluation_report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 7c97ff5055e..56af08e4598 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import tools
 from osv import fields,osv
 
@@ -75,9 +76,9 @@ class hr_evaluation_report(osv.osv):
                      s.state
                      from
                  hr_evaluation_interview l
-                 left join
+                LEFT JOIN
                      hr_evaluation_evaluation s on (s.id=l.evaluation_id)
-                 group by
+                 GROUP BY
                      s.create_date,
                      date_trunc('day',s.create_date),
                      to_char(s.create_date, 'YYYY-MM-DD'),
@@ -92,5 +93,8 @@ class hr_evaluation_report(osv.osv):
                      s.plan_id
             )
         """)
+
 hr_evaluation_report()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 2a5cbe21ad9..a0f46170518 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+    <data>
+
     <record id="view_evaluation_report_tree" model="ir.ui.view">
         <field name="name">hr.evaluation.report.tree</field>
         <field name="model">hr.evaluation.report</field>
@@ -43,33 +44,18 @@
             <search string="Evaluations Analysis">
             	<group>
             		<filter icon="terp-go-year" string="365 Days"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                    	help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="30 Days"
-                    	name="month"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                    	help="Tasks performed in last 30 days"/>
-	                <filter icon="terp-go-week"
-                        string="    7 Days    "
-                        separator="1"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks during last 7 days"/>
+                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date', '&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 365 days"/>
+                    <filter icon="terp-go-month" string="30 Days" name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 30 days"/>
+	                <filter icon="terp-go-week" string="    7 Days    " separator="1"
+                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
-                    <filter string="Draft"
-                    	icon="terp-document-new"
-                    	domain="[('state','=','draft')]"
+                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]"
                     	help = "Draft Evaluations"/>
-	                <filter string="Plan In Progress"
-	                	icon="terp-camera_test"
-	                	domain="[('state', '=' ,'wait')]"
+	                <filter string="Plan In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
-                   	<filter string="Final Validation"
-                   		icon="terp-check"
-                   		domain="[('state','=','progress')]"
+                   	<filter string="Final Validation" icon="terp-check" domain="[('state','=','progress')]"
                    		help = "Final Validation Evaluations"/>
-                   	<filter icon="terp-dialog-close"
-                        string="Done"
-                        domain="[('state','=','done')]"/>
+                   	<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
 	                <field name="employee_id" widget="selection"/>
 	                <field name="plan_id" widget="selection"/>
@@ -86,13 +72,13 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
                 </group>
-                 <newline/>
+                <newline/>
 				<group expand="0" string="Extended options..." groups="base.group_extended">
-                    <field name="rating"/>
-                    <separator orientation="vertical"/>
-                    <field name="deadline"/>
-                    <separator orientation="vertical"/>
-                    <field name="state"/>
+                <field name="rating"/>
+                <separator orientation="vertical"/>
+                <field name="deadline"/>
+                <separator orientation="vertical"/>
+                <field name="state"/>
                 </group>
             </search>
         </field>
@@ -110,5 +96,5 @@
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
     <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3"/>
 
-</data>
+    </data>
 </openerp>
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
index 367cabbe90b..1a855087bbc 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -21,5 +21,4 @@
 
 import hr_evaluation_mail
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 42b0654de1b..97dd1ca01c7 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -28,7 +28,7 @@ class hr_evaluation_reminder(osv.osv_memory):
         'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluations', required=True)
     }
 
-    def send_mail(self, cr, uid, ids, context={}):
+    def send_mail(self, cr, uid, ids, context=None):
         hr_evaluation_obj = self.pool.get('hr_evaluation.evaluation')
         evaluation_data = self.read(cr, uid, ids, context=context)[0]
         for waiting_id in hr_evaluation_obj.browse(cr, uid, evaluation_data['evaluation_id'], context=context).survey_request_ids:
@@ -40,4 +40,4 @@ class hr_evaluation_reminder(osv.osv_memory):
 
 hr_evaluation_reminder()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 2e06e47505e..9319b8d88fd 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-
     <data>
-    	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
-            <field name="name">hr.evaluation.send.mail</field>
-            <field name="model">hr.evaluation.reminder</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-				<form string="Evaluation Reminders">
-					<group width="340">
-					<separator string="Send evaluation reminder" colspan="4"/>
-					<field name="evaluation_id"/>
-					<separator colspan="4"/>
-						<group colspan="4">
-							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-							<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
-						</group>
+
+	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
+        <field name="name">hr.evaluation.send.mail</field>
+        <field name="model">hr.evaluation.reminder</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+			<form string="Evaluation Reminders">
+				<group width="340">
+				<separator string="Send evaluation reminder" colspan="4"/>
+				<field name="evaluation_id"/>
+				<separator colspan="4"/>
+					<group colspan="4">
+						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+						<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
 					</group>
-             	</form>
-            </field>
-		</record>
+				</group>
+         	</form>
+        </field>
+	</record>
 
     <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
-            <field name="name">Evaluation Send Mail</field>
-            <field name="res_model">hr.evaluation.reminder</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_evaluation_send_mail"/>
-           <field name="context">{'record_id':active_id}</field>
-           <field name="target">new</field>
-      </record>
+        <field name="name">Evaluation Send Mail</field>
+        <field name="res_model">hr.evaluation.reminder</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_hr_evaluation_send_mail"/>
+        <field name="context">{'record_id':active_id}</field>
+        <field name="target">new</field>
+    </record>
 
      </data>
 </openerp>
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index dda5cd0f8a3..3be26d8ff72 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -51,10 +51,11 @@
         'process/hr_expense_process.xml',
         'report/hr_expense_report_view.xml',
         'board_hr_expense_view.xml',
-    ],
-    'demo_xml': ['hr_expense_demo.xml',
-#                'hr.expense.expense.csv'
-                ],
+        ],
+    'demo_xml': [
+        'hr_expense_demo.xml',
+#       'hr.expense.expense.csv'
+        ],
     'test': ['test/test_hr_expense.yml'],            
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 797e258cb31..cc5488a8f2e 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="action_my_expense" model="ir.actions.act_window">
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
@@ -20,5 +21,6 @@
 			</xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d32a136e0d2..d1d151c08f3 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -25,7 +25,7 @@ from osv import fields, osv
 from tools.translate import _
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
     if ids:
         return ids[0]
     return False
@@ -34,15 +34,15 @@ class hr_expense_expense(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
-        default.update( {'invoice_id':False,'date_confirm':False,'date_valid':False,'user_valid':False})
+        default.update({'invoice_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
         return super(hr_expense_expense, self).copy(cr, uid, id, default, context)
 
-    def _amount(self, cr, uid, ids, field_name, arg, context):
-        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ",(tuple(ids),))
+    def _amount(self, cr, uid, ids, field_name, arg, context=None):
+        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ", (tuple(ids),))
         res = dict(cr.fetchall())
         return res
 
-    def _get_currency(self, cr, uid, context):
+    def _get_currency(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, [uid])[0]
         if user.company_id:
             return user.company_id.currency_id.id
@@ -158,18 +158,17 @@ class hr_expense_expense(osv.osv):
                 'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
             }
             if payment_term_id:
-                to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [],
-                        payment_term_id, None)
+                to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
                 if to_update:
                     inv.update(to_update['value'])
             if exp.journal_id:
                 inv['journal_id']=exp.journal_id.id
-            inv_id = invoice_obj.create(cr, uid, inv, {'type':'in_invoice'})
-            invoice_obj.button_compute(cr, uid, [inv_id], {'type':'in_invoice'},
-                    set_total=True)
+            inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
+            invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
             self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             res = inv_id
         return res
+
 hr_expense_expense()
 
 class product_product(osv.osv):
@@ -184,7 +183,7 @@ class hr_expense_line(osv.osv):
     _name = "hr.expense.line"
     _description = "Expense Line"
 
-    def _amount(self, cr, uid, ids, field_name, arg, context):
+    def _amount(self, cr, uid, ids, field_name, arg, context=None):
         if not len(ids):
             return {}
         cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_line l WHERE id IN %s GROUP BY l.id ",(tuple(ids),))
@@ -204,11 +203,11 @@ class hr_expense_line(osv.osv):
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of expense lines."),
-    }
+        }
     _defaults = {
-        'unit_quantity': lambda *a: 1,
-        'date_value' : lambda *a: time.strftime('%Y-%m-%d'),
-    }
+        'unit_quantity': 1,
+        'date_value': time.strftime('%Y-%m-%d'),
+        }
     _order = "sequence"
 
     def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
@@ -218,13 +217,11 @@ class hr_expense_line(osv.osv):
         if product_id:
             product=self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v['name']=product.name
-
             # Compute based on pricetype of employee company
             pricetype_id = self.pool.get('hr.employee').browse(cr, uid, employee_id).user_id.company_id.property_valuation_price_type.id
             context['currency_id']=self.pool.get('hr.employee').browse(cr, uid, employee_id).user_id.company_id.currency_id.id
             pricetype=self.pool.get('product.price.type').browse(cr, uid, pricetype_id)
             amount_unit=product.price_get(pricetype.field, context)[product.id]
-
             v['unit_amount']=amount_unit
             if not uom_id:
                 v['uom_id']=product.uom_id.id
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 148ab026a0f..da348b02ab4 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -58,6 +58,7 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="1.0" name="unit_quantity"/>
 		</record>
+
 		<record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
 			<field name="name">Basic PC - Server for Seagate</field>
 			<field name="date_value">2010-05-03</field>
@@ -68,7 +69,9 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="1.0" name="unit_quantity"/>
 		</record>
+
 	</data>
+
 	<data noupdate="1">
 		<record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
 			<field name="currency_id" ref="base.EUR"/>
@@ -79,6 +82,7 @@
 			<field name="date">2010-04-20</field>
 			<field name="state">draft</field>
 		</record>
+
 		<record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
 			<field name="name">Hotel Expenses - Thymbra</field>
 			<field name="date_value">2010-05-03</field>
@@ -89,17 +93,17 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="5.0" name="unit_quantity"/>
 		</record>
-                <record id="hr_expense_line_car_travel" model="hr.expense.line">
-                        <field name="name">Bruxelles - Paris</field>
-                        <field name="date_value">2010-05-03</field>
-                        <field name="analytic_account" ref="account.analytic_thymbra"/>
-                        <field name="product_id" ref="product_product_expense_car"/>
-                        <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
-                        <field eval="0.30" name="unit_amount"/>
-                        <field name="uom_id" ref="product.product_uom_km"/>
-                        <field eval="622.0" name="unit_quantity"/>
-                </record>
 
+        <record id="hr_expense_line_car_travel" model="hr.expense.line">
+                <field name="name">Bruxelles - Paris</field>
+                <field name="date_value">2010-05-03</field>
+                <field name="analytic_account" ref="account.analytic_thymbra"/>
+                <field name="product_id" ref="product_product_expense_car"/>
+                <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+                <field eval="0.30" name="unit_amount"/>
+                <field name="uom_id" ref="product.product_uom_km"/>
+                <field eval="622.0" name="unit_quantity"/>
+        </record>
 
 	</data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index 9d5f0c3e2c1..5defbfec330 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="HR expenses"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_sequence.xml b/addons/hr_expense/hr_expense_sequence.xml
index 4350faecb47..e7de7eb1350 100644
--- a/addons/hr_expense/hr_expense_sequence.xml
+++ b/addons/hr_expense/hr_expense_sequence.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <record id="seq_type_hr_expense_invoice" model="ir.sequence.type">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>
         </record>
+
         <record id="seq_hr_expense_invoice" model="ir.sequence">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>
             <field name="prefix">EXP/</field>
             <field name="padding">3</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 9c5ebf49953..6b92e792ad5 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -81,8 +81,8 @@
                                 <form string="Expense Lines">
                                     <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
                                     <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
-                                    <field name="name" select="1"/>
-                                    <field name="date_value" select="1"/>
+                                    <field name="name" />
+                                    <field name="date_value" />
                                     <field name="unit_quantity"/>
                                     <field name="unit_amount"/>
                                     <field name="ref"/>
@@ -126,28 +126,17 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <filter
-                        icon="terp-document-new"
-                        domain="[('state','=','draft')]"
-                        string="Draft"
-                        help="Draft Expense"/>
+                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="Draft" help="Draft Expense"/>
                       <separator orientation="vertical"/>
-                      <filter
-                        icon="terp-gtk-go-back-rtl"
-                        domain="[('state','=','confirm')]"
-                        string="To Validate"
+                      <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"
                         help="Confirmed Expense"/>
-                      <filter
-                        icon="terp-gtk-go-back-rtl"
-                        domain="[('state','=','accepted')]"
-                        string="To Pay"
+                      <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
-                      <field name="user_id" select="1" string="User">
-                      <filter icon="terp-personal+"
-                            domain="[('department_id','=',context.get('department_id',False))]"
+                      <field name="user_id"  string="User">
+                      <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
                       <field name="department_id" widget="selection" groups="base.group_extended"/>
@@ -171,23 +160,20 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4"
-           parent="hr.menu_hr_root"/>
-
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
-           parent="next_id_49" groups="hr.group_hr_manager"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="hr.group_hr_manager"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
-         <field name="name">product.product.expense.form</field>
-         <field name="model">product.product</field>
-         <field name="inherit_id" ref="product.product_normal_form_view"/>
-         <field name="type">form</field>
-         <field name="arch" type="xml">
+            <field name="name">product.product.expense.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
             <field name="purchase_ok" position="after">
                <field name="hr_expense_ok"/>
             </field>
-         </field>
-      </record>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 57163b6df5f..972cdcaab8f 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -27,18 +27,21 @@
             <field name="kind">function</field>
             <field name="action">write({'state': 'draft'})</field>
         </record>
+
         <record id="act_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">confirm</field>
             <field name="kind">function</field>
             <field name="action">expense_confirm()</field>
         </record>
+
         <record id="act_accepted" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">accepted</field>
             <field name="kind">function</field>
             <field name="action">expense_accept()</field>
         </record>
+
         <record id="act_paid" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">paid</field>
@@ -46,6 +49,7 @@
             <field name="action">expense_paid()</field>
             <field name="flow_stop">True</field>
         </record>
+
         <record id="act_refused" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">refused</field>
@@ -53,6 +57,7 @@
             <field name="action">expense_canceled()</field>
 <!--            <field name="flow_stop">True</field>-->
         </record>
+
         <record id="act_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">invoice</field>
@@ -66,24 +71,28 @@
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">confirm</field>
         </record>
+
         <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_accepted"/>
             <field name="signal">validate</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <!--record model="workflow.transition" id="t3">
 			<field name="act_from" ref="act_accepted" />
 			<field name="act_to" ref="act_paid" />
 			<field name="signal">paid</field>
 			<field name="role_id" ref="HR"/>
 		</record-->
+
         <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <record id="t5" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_refused"/>
@@ -96,33 +105,39 @@
             <field name="signal">refuse</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <record id="t7" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">invoice</field>
             <field name="role_id" ref="HR_INV"/>
         </record>
+
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_paid"/>
             <field name="signal">subflow.paid</field>
         </record>
+
         <record id="t10" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">subflow.cancel</field>
         </record>
+
 		<record id="t11" model="workflow.transition">
             <field name="act_from" ref="act_refused"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
             <field name="role_id" ref="HR"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py
index 4ddd1d33933..ad0c48a0819 100644
--- a/addons/hr_expense/report/__init__.py
+++ b/addons/hr_expense/report/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import expense
 import hr_expense_report
 
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index ae368e8ef8e..7078c23d244 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -24,11 +24,10 @@ from report import report_sxw
 import datetime
 
 class expense(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(expense, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-        })
+        self.localcontext.update({'time': time, })
 
 report_sxw.report_sxw('report.hr.expense', 'hr.expense.expense', 'addons/hr_expense/report/expense.rml',parser=expense)
 
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index c97c5d2594d..1a21de08ee2 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+
     <record id="view_hr_expense_report_tree" model="ir.ui.view">
         <field name="name">hr.expense.report.tree</field>
         <field name="model">hr.expense.report</field>
@@ -58,27 +59,15 @@
 	                    name="month"
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Expenses during last month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
-	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Expenses during last 7 days"/>
+		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Draft"
-	                    icon="terp-document-new"
-	                    domain="[('state','=','draft')]"
-	                    help = "Draft Expenses"/>
-		            <filter string="Waiting"
-		                icon="terp-gtk-media-pause"
-		                domain="[('state', '=' ,'confirm')]"
+	                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
+		            <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
 		                help = "Confirm Expenses"/>
-	                <filter string="Accepted"
-	                    icon="terp-camera_test"
-	                    domain="[('state','=','accepted')]"
+	                <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
 	                    help = "Accepted Expenses"/>
-	                <filter string="Cancelled"
-	                    icon="terp-dialog-close"
-	                    domain="[('state','=','cancelled')]"
+	                <filter string="Cancelled" icon="terp-dialog-close" domain="[('state','=','cancelled')]"
 	                    help = "Cancelled Expenses"/>
 	  				<separator orientation="vertical"/>
                     <field name="employee_id"/>
@@ -105,20 +94,19 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="department_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <field name="date_valid"/>
-
+                <field name="product_id"/>
+                <separator orientation="vertical"/>
+                <field name="journal_id" widget="selection"/>
+                <separator orientation="vertical"/>
+                <field name="department_id"/>
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <separator orientation="vertical"/>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                <newline/>
+                <field name="date"/>
+                <field name="date_confirm"/>
+                <field name="date_valid"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
index 9fc701068ef..7144aa19ba8 100644
--- a/addons/hr_holidays/__init__.py
+++ b/addons/hr_holidays/__init__.py
@@ -22,5 +22,6 @@
 import hr_holidays
 import report
 import wizard
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 10e533203ba..e322a2d8786 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Human Resources: Holidays management",
-    "version" : "1.5",
-    "author" : "Tiny & Axelor",
-    "category" : "Generic Modules/Human Resources",
-    "website" : "http://www.openerp.com",
+    "name": "Human Resources: Holidays management",
+    "version": "1.5",
+    "author": "Tiny & Axelor",
+    "category": "Generic Modules/Human Resources",
+    "website": "http://www.openerp.com",
     "description": """Human Ressources: Holidays tracking and workflow
 
     This module allows you to manage leaves and leaves requests.
@@ -64,7 +64,7 @@
         'wizard/hr_holidays_summary_employees_view.xml',
         'board_hr_holidays_view.xml',
         #'process/hr_holidays_process.xml'
-    ],
+        ],
     'demo_xml': ['hr_holidays_demo.xml',],
     'test': ['test/test_hr_holiday.yml'],
     'installable': True,
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 026552f9801..4f3f2142447 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-		        <field name="domain">[('user_id','=',uid)]</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_holidays.open_allocation_holidays"/>
         </record>
         
@@ -21,6 +21,7 @@
 	        <field name="domain">[('user_id','=',uid)]</field>
 	        <field name="view_id" ref="hr_holidays.view_hr_holidays_remaining_leaves_user_graph"/>
 		</record>
+
         <record id="board_hr_holidays_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.form</field>
             <field name="model">board.board</field>
diff --git a/addons/hr_holidays/hr_bel_holidays_2008.xml b/addons/hr_holidays/hr_bel_holidays_2008.xml
index 0c09586cb0c..7b9a305704b 100644
--- a/addons/hr_holidays/hr_bel_holidays_2008.xml
+++ b/addons/hr_holidays/hr_bel_holidays_2008.xml
@@ -8,59 +8,69 @@
             <field name="date_to">2008-01-01 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Easter Monday</field>
             <field name="date_from">2008-03-24 08:00</field>
             <field name="date_to">2008-03-24 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Labour Day</field>
             <field name="date_from">2008-05-01 08:00</field>
             <field name="date_to">2008-05-01 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Ascension</field>
             <field name="date_from">2008-05-02 08:00</field>
             <field name="date_to">2008-05-02 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Pentecost Monday</field>
             <field name="date_from">2008-05-12 08:00</field>
             <field name="date_to">2008-05-12 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">National Day</field>
             <field name="date_from">2008-07-21 08:00</field>
             <field name="date_to">2008-07-21 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Assumption Day</field>
             <field name="date_from">2008-08-15 08:00</field>
             <field name="date_to">2008-08-15 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">All Saints</field>
             <field name="date_from">2008-11-01 08:00</field>
             <field name="date_to">2008-11-01 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Armistice</field>
             <field name="date_from">2008-11-11 08:00</field>
             <field name="date_to">2008-11-11 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Christmas</field>
             <field name="date_from">2008-12-25 08:00</field>
             <field name="date_to">2008-12-25 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 9e3bfca0660..a5ffdbdfc49 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -20,6 +20,7 @@
 #     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 import datetime
 
@@ -69,6 +70,7 @@ class hr_holidays_status(osv.osv):
         return_false = False
         employee_id = False
         res = {}
+        
         if context and context.has_key('employee_id'):
             if not context['employee_id']:
                 return_false = True
@@ -100,7 +102,7 @@ class hr_holidays_status(osv.osv):
     _defaults = {
         'color_name': 'red',
         'active': True,
-    }
+        }
 
 hr_holidays_status()
 
@@ -110,22 +112,22 @@ class hr_holidays(osv.osv):
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
-        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
         if ids:
             return ids[0]
         return False
 
     _columns = {
-        'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Validation'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
             If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'),
-        'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
         'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
-        'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id' : fields.many2one("hr.holidays.status", " Leave  Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id' : fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        'manager_id' : fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
-        'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
+        'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
+        'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'case_id': fields.many2one('crm.meeting', 'Case'),
@@ -140,13 +142,13 @@ class hr_holidays(osv.osv):
             }
 
     _defaults = {
-        'employee_id' : _employee_get ,
-        'state' : 'draft',
+        'employee_id': _employee_get ,
+        'state': 'draft',
         'type': 'remove',
         'allocation_type': 'employee',
         'user_id': lambda obj, cr, uid, context: uid,
         'holiday_type': 'employee'
-    }
+        }
 
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
@@ -215,10 +217,10 @@ class hr_holidays(osv.osv):
                     self.unlink(cr, uid, list_ids)
 
     def _check_date(self, cr, uid, ids):
-        for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to', 'type']):
+        for rec in self.read(cr, uid, ids, ['number_of_days_temp', 'date_from','date_to', 'type']):
             if rec['number_of_days_temp'] < 0:
                 return False
-            if rec['type']=='add':
+            if rec['type'] == 'add':
                 continue
             date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
             date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
@@ -249,7 +251,7 @@ class hr_holidays(osv.osv):
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
         return self.onchange_date_from(cr, uid, ids, date_to, date_from)
 
-    def onchange_sec_id(self, cr, uid, ids, status, context={}):
+    def onchange_sec_id(self, cr, uid, ids, status, context=None):
         warning = {}
         if status:
             brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status])[0]
@@ -263,7 +265,7 @@ class hr_holidays(osv.osv):
     def set_to_draft(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         self.write(cr, uid, ids, {
-            'state':'draft',
+            'state': 'draft',
             'manager_id': False,
             'number_of_days': 0,
         })
@@ -274,7 +276,7 @@ class hr_holidays(osv.osv):
     def holidays_validate2(self, cr, uid, ids, *args):
         vals = {'state':'validate1'}
         self.check_holidays(cr, uid, ids)
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
         else:
@@ -287,17 +289,17 @@ class hr_holidays(osv.osv):
         data_holiday = self.browse(cr, uid, ids)
         self.check_holidays(cr, uid, ids)
         vals = {'state':'validate'}
-        ids2 = obj_emp.search(cr, uid, [('user_id','=', uid)])
+        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         if ids2:
             if data_holiday[0].state == 'validate1':
                 vals['manager_id2'] = ids2[0]
             else:
                 vals['manager_id'] = ids2[0]
         else:
-            raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
+            raise osv.except_osv(_('Warning !'), _('No user related to the selected employee.'))
         self.write(cr, uid, ids, vals)
         for record in data_holiday:
-            if record.holiday_type=='employee' and record.type=='remove':
+            if record.holiday_type == 'employee' and record.type == 'remove':
                 vals = {
                    'name': record.name,
                    'date_from': record.date_from,
@@ -308,7 +310,7 @@ class hr_holidays(osv.osv):
                    'holiday_id': record.id
                      }
                 self._create_resource_leave(cr, uid, vals)
-            elif record.holiday_type=='category' and record.type=='remove':
+            elif record.holiday_type == 'category' and record.type == 'remove':
                 emp_ids = obj_emp.search(cr, uid, [('category_id', '=', record.category_id.id)])
                 for emp in obj_emp.browse(cr, uid, emp_ids):
                     vals = {
@@ -327,13 +329,13 @@ class hr_holidays(osv.osv):
         for record in self.browse(cr, uid, ids):
             user_id = False
             leave_asked = record.number_of_days_temp
-            if record.holiday_type=='employee' and record.type == 'remove':
+            if record.holiday_type == 'employee' and record.type == 'remove':
                 if record.employee_id and not record.holiday_status_id.limit:
                     leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                     if leaves_rest < leave_asked:
                         raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.employee_id.name)))
                 nb = -(record.number_of_days_temp)
-            elif record.holiday_type=='category' and record.type == 'remove':
+            elif record.holiday_type == 'category' and record.type == 'remove':
                 if record.category_id and not record.holiday_status_id.limit:
                     leaves_rest = self.pool.get('hr.holidays.status').get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                     if leaves_rest < leave_asked:
@@ -342,20 +344,14 @@ class hr_holidays(osv.osv):
             else:
                 nb = record.number_of_days_temp
 
-            if record.holiday_type=='employee' and record.employee_id:
+            if record.holiday_type == 'employee' and record.employee_id:
                 user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
 
-            self.write(cr, uid, [record.id], {
-                'state':'confirm',
-                'number_of_days': nb,
-                'user_id': user_id
-            })
+            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })
         return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
-        vals = {
-            'state':'refuse',
-        }
+        vals = {'state': 'refuse'}
         ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
@@ -364,22 +360,18 @@ class hr_holidays(osv.osv):
 
     def holidays_cancel(self, cr, uid, ids, *args):
         self._update_user_holidays(cr, uid, ids)
-        self.write(cr, uid, ids, {
-            'state':'cancel'
-            })
+        self.write(cr, uid, ids, {'state': 'cancel'})
         self._remove_resouce_leave(cr, uid, ids)
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {
-            'state':'draft'
-        })
+        self.write(cr, uid, ids, {'state': 'draft'})
         return True
 
     def check_holidays(self, cr, uid, ids):
         for record in self.browse(cr, uid, ids):
             if not record.number_of_days:
-                raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
+                raise osv.except_osv(_('Warning!'), _('Wrong leave definition.'))
             if record.holiday_type=='employee' and record.employee_id:
                 leave_asked = record.number_of_days
                 if leave_asked < 0.00:
@@ -387,7 +379,7 @@ class hr_holidays(osv.osv):
                         leaves_rest = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                         if leaves_rest < -(leave_asked):
                             raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
-            elif record.holiday_type=='category' and record.category_id:
+            elif record.holiday_type == 'category' and record.category_id:
                 leave_asked = record.number_of_days
                 if leave_asked < 0.00:
                     if not record.holiday_status_id.limit:
@@ -415,7 +407,7 @@ class hr_holidays(osv.osv):
                     user_id = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
                     if user_id:
                         vals['user_id'] = user_id[0]
-                    holiday_ids.append(self.create(cr, uid, vals, context={}))
+                    holiday_ids.append(self.create(cr, uid, vals, context=None))
                 self.holidays_confirm(cr, uid, holiday_ids)
                 self.holidays_validate(cr, uid, holiday_ids)
 
@@ -444,7 +436,7 @@ class hr_holidays(osv.osv):
                     'date' : record.date_from,
                 }
                 case_id = self.pool.get('crm.meeting').create(cr, uid, vals)
-                self.write(cr, uid, ids, {'case_id':case_id})
+                self.write(cr, uid, ids, {'case_id': case_id})
 
         return True
 
@@ -455,8 +447,8 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-                }
+        }
 
 resource_calendar_leaves()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 88670544ebf..4c8ec39a1af 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <report id="report_holidays_summary"
                 string="Summary Of Leaves"
                 model="hr.holidays"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c02984942fb..bd96de3dd82 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+
         <record id="view_hr_holidays_filter" model="ir.ui.view">
             <field name="name">hr.holidays.filter</field>
             <field name="model">hr.holidays</field>
@@ -16,8 +17,7 @@
                         <field name="user_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
-                                domain="[('department_id.manager_id','=',uid)]"
-                                />
+                                domain="[('department_id.manager_id','=',uid)]" />
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
@@ -44,21 +44,21 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="8" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130"/>
+                    <field name="name" />
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130"/>
                         <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                            <field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                            <field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
+                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
                             <field name="department_id"/>
-                            <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                            <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                            <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                            <field name="date_to" on_change="onchange_date_to(date_from, date_to)" required="1"/>
                             <field name="number_of_days_temp"/>
                             <newline/>
                             <field name="manager_id"/>
@@ -66,7 +66,7 @@
                             <separator string="Notes" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
-                            <field name="state" select="1" colspan="2"/>
+                            <field name="state" colspan="2"/>
                             <group colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -89,15 +89,15 @@
             <field name="arch" type="xml">
             <form string="Allocation Request">
                 <group col="4" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="holiday_status_id" select="1"/>
+                    <field name="name" />
+                    <field name="holiday_status_id" />
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
                     <group col="2" colspan="2">
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                            <field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
+                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                               <field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
                     </group>
                 </group>
@@ -110,7 +110,7 @@
                         <separator string="Notes" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4" />
                         <newline/>
-                        <field name="state" select="1" colspan="2"/>
+                        <field name="state" colspan="2"/>
                         <group colspan="2">
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -130,8 +130,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves"
-                    colors="red:state == 'refuse';grey:state == 'cancel'">
+                <tree string="Leaves" colors="red:state == 'refuse';grey:state == 'cancel'">
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -151,22 +150,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Management">
-                    <field name="name" select="1"/>
-                    <field name="holiday_status_id" select="1"/>
+                    <field name="name" />
+                    <field name="holiday_status_id" />
 <!--                    <field name="holiday_type"/>
-                    <field name="category_id" select="1" required="1"/>
--->                    <field name="employee_id" select="1" />
+                    <field name="category_id" required="1"/>
+-->                    <field name="employee_id"  />
                     <!--<field name="department_id"/>-->
                     <field name="type"/>
-                    <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
-                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="date_to" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="number_of_days_temp"/>
                     <notebook colspan="4">
                         <page string="General">
                             <field name="manager_id"/>
                             <field name="notes" colspan="4"/>
                             <newline/>
-                            <field name="state" select="1" colspan="2"/>
+                            <field name="state" colspan="2"/>
                             <group colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -207,8 +206,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves"
-                    colors="red:state == 'refuse';grey:state == 'cancel'">
+                <tree string="Leaves" colors="red:state == 'refuse';grey:state == 'cancel'">
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -271,10 +269,7 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem
-           name="Leave Requests"
-             parent="menu_open_ask_holidays"
-             id="menu_open_ask_holidays_new"
+        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new"
              action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
@@ -301,10 +296,7 @@
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
-        <menuitem
-          name="Allocation Requests"
-            parent="menu_open_ask_holidays"
-            id="menu_open_allocation_holidays"
+        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays"
             action="open_allocation_holidays"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
@@ -331,15 +323,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type">
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name" />
                     <field name="limit"/>
                     <field name="active"/>
-                    <field name="categ_id"  select="1" widget="selection"/>
+                    <field name="categ_id" widget="selection"/>
                     <field name="color_name"/>
                     <field name="double_validation" />
                 </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_holiday_status_tree">
             <field name="name">hr.holidays.status.tree</field>
             <field name="model">hr.holidays.status</field>
@@ -352,6 +345,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_view_holiday_status" model="ir.actions.act_window">
             <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 3c40d073853..4374e2b461a 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -6,6 +6,7 @@
             name="Reporting"
             parent="hr.menu_hr_root"
             sequence="10" />
+
      <menuitem
             id="menu_hr_reporting_holidays"
             name="Holidays"
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 5949e527f6a..8ab371c67d7 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 import tools
 
@@ -32,19 +33,19 @@ class available_holidays_report(osv.osv):
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'employee_id': fields.many2one ('hr.employee', "Employee's Name", readonly=True),
-        'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
+        'category_id': fields.many2one('hr.employee.category', "Category's Name", readonly=True),
         'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
         'max_leave': fields.float('Allocated Leaves', readonly=True),
         'taken_leaves': fields.float('Taken Leaves', readonly=True),
-        'remaining_leave': fields.float('Remaining Leaves',readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'remaining_leave': fields.float('Remaining Leaves', readonly=True),
+        'department_id': fields.many2one('hr.department', 'Department', readonly=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'available_holidays_report')
         cr.execute("""
-            create or replace view available_holidays_report as (
-                select
+            CREATE or REPLACE view available_holidays_report as (
+                SELECT
                     min(h.id) as id,
                     date_trunc('day',h.create_date) as date,
                     to_char(s.create_date, 'YYYY') as year,
@@ -67,15 +68,16 @@ class available_holidays_report(osv.osv):
                                                      and employee_id=h.employee_id
                                                      and holiday_status_id=h.holiday_status_id
                                                      and state='validate') as max_leave
-                from hr_holidays h
-                left join hr_holidays_status s on (s.id = h.holiday_status_id)
-                where h.state='validate'
+                FROM hr_holidays h
+                LEFT JOIN hr_holidays_status s on (s.id = h.holiday_status_id)
+                WHERE h.state='validate'
                 and s.active <> 'f'
-                group by h.holiday_status_id, h.employee_id,
+                GROUP BY h.holiday_status_id, h.employee_id,
                          date_trunc('day',h.create_date),to_char(s.create_date, 'YYYY'),
                          to_char(s.create_date, 'MM'), to_char(s.create_date, 'YYYY-MM-DD'), h.user_id,h.state, h.category_id, h.department_id
 
             )""")
+
 available_holidays_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 327cdab032b..111d8d2f8a6 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -48,38 +48,28 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-	                    <filter icon="terp-personal" string="Employee"
-	                            domain="[('category_id', '=', False)]"
+	                    <filter icon="terp-personal" string="Employee" domain="[('category_id', '=', False)]"
 	                            help="Leaves by empolyee"/>
 	                    <filter icon="terp-stock_symbol-selection" string="Category"
-	                            domain="[('employee_id', '=', False)]"
-	                            help="Leaves by category"/>
+	                            domain="[('employee_id', '=', False)]" help="Leaves by category"/>
                         <separator orientation="vertical"/>
 		            	<filter icon="terp-go-year" string="This Year"
 			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 			                    help="Leaves in this year"/>
-		                <filter icon="terp-go-month" string="This Month"
-		                    name="month"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Leaves in this month"/>
-			            <filter icon="terp-go-week"
-		                    string="    7 Days    "
-		                    separator="1"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Leaves during last 7 days"/>
+		                <filter icon="terp-go-month" string="This Month" name="month"
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
+			            <filter icon="terp-go-week" string="    7 Days    " separator="1"
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-
 						<field name="employee_id"/>
 		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-personal"
-		                        string="My Leaves"
-		                        domain="[('user_id','=',uid)]"/>
+		                    <filter icon="terp-personal" string="My Leaves" domain="[('user_id','=',uid)]"/>
 		                </field>
 		            </group>
 		            <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12">
-	                    <field name="holiday_status_id" widget="selection"/>
-	                	<field name="department_id" widget="selection"/>
+                    <field name="holiday_status_id" widget="selection"/>
+                	<field name="department_id" widget="selection"/>
 	                </group>
 	                <newline/>
 	                <group expand="0" string="Group By..." colspan="10" col="12">
@@ -96,8 +86,6 @@
 	        </field>
 	    </record>
 
-
-
         <record id="action_hr_available_holidays_report" model="ir.actions.act_window">
             <field name="name">Available Holidays</field>
             <field name="res_model">available.holidays.report</field>
@@ -112,20 +100,17 @@
                 <field name="view_mode">tree</field>
                 <field name="view_id" ref="view_hr_available_holidays_report_tree"/>
                 <field name="act_window_id" ref="action_hr_available_holidays_report"/>
-            </record>
-
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_graph">
                 <field name="sequence" eval="2"/>
                 <field name="view_mode">graph</field>
                 <field name="view_id" ref="view_hr_available_holidays_report_graph"/>
                 <field name="act_window_id" ref="action_hr_available_holidays_report"/>
-            </record>
-
+        </record>
 
         <menuitem name="Available Holidays" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
 
-
 	</data>
 </openerp>
 
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index 31fbe91a5a2..a0fa2cdd131 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -234,8 +234,8 @@ class report_custom(report_rml):
                     continue
                 dept_done=0
                 for d in range(0,len(result)):
-                    emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr, uid, [('user_id','=',result[d][0])])
-                    items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, emp_id[d], ['id','name'])
+                    emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr, uid, [('user_id', '=', result[d][0])])
+                    items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, emp_id[d], ['id', 'name'])
                     for item in items:
 #                        if item['id'] in done:
 #                            continue
@@ -261,5 +261,6 @@ class report_custom(report_rml):
         return xml
 
 report_custom('report.holidays.summary', 'hr.holidays', '', 'addons/hr_holidays/report/holidays_summary.xsl')
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 38995351a32..8f8ec56ffeb 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import tools
 from osv import fields,osv
 
@@ -70,8 +71,8 @@ class hr_holidays_report(osv.osv):
                      s.state
                      from
                  hr_holidays s
-                 where type='remove'
-                 group by
+                 WHERE type='remove'
+                 GROUP BY
                      s.create_date,s.state,s.date_from,s.date_to,
                      s.employee_id,s.user_id,s.holiday_status_id,
                      s.department_id, s.category_id
@@ -89,26 +90,26 @@ class hr_holidays_remaining_leaves_user(osv.osv):
         'no_of_leaves': fields.integer('Remaining leaves'),
         'user_id': fields.many2one('res.users', 'User'),
         'leave_type': fields.char('Leave Type', size=64),
+        }
 
-    }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'hr_holidays_remaining_leaves_user')
         cr.execute("""
-            create or replace view hr_holidays_remaining_leaves_user as (
-                 select
+            CREATE or REPLACE view hr_holidays_remaining_leaves_user as (
+                 SELECT
                     min(hrs.id) as id,
                     rr.name as name,
                     sum(hrs.number_of_days) as no_of_leaves,
                     rr.user_id as user_id,
                     hhs.name as leave_type
-                from
+                FROM
                     hr_holidays as hrs, hr_employee as hre,
                     resource_resource as rr,hr_holidays_status as hhs
-                where
+                WHERE
                     hrs.employee_id = hre.id and
                     hre.resource_id =  rr.id and
                     hhs.id = hrs.holiday_status_id
-                group by
+                GROUP BY
                     rr.name,rr.user_id,hhs.name
             )
         """)
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 7f42982eaad..a367506bce5 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -45,37 +45,23 @@
         <field name="arch" type="xml">
             <search string="Leaves">
             	<group>
-                    <filter icon="terp-personal" string="Employee"
-                            domain="[('category_id', '=', False)]"
+                    <filter icon="terp-personal" string="Employee" domain="[('category_id', '=', False)]"
                             help="Leaves by empolyee"/>
-                    <filter icon="terp-stock_symbol-selection" string="Category"
-                            domain="[('employee_id', '=', False)]"
+                    <filter icon="terp-stock_symbol-selection" string="Category" domain="[('employee_id', '=', False)]"
                             help="Leaves by category"/>
 	            	<separator orientation="vertical"/>
 	            	<filter icon="terp-go-year" string="This Year"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Leaves in this year"/>
-	                <filter icon="terp-go-month" string="This Month"
-	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Leaves in this month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
-	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Leaves during last 7 days"/>
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this year"/>
+	                <filter icon="terp-go-month" string="This Month" name="month"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
+		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Draft"
-	                	icon="terp-document-new"
-	                	domain="[('state','=','draft')]"
+	                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]"
 	                	help = "Draft Leaves"/>
-	                <filter string="Waiting Validation"
-	                	icon="terp-gtk-media-pause"
-	                	domain="[('state', '=' ,'confirm')]"
+	                <filter string="Waiting Validation" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
 	                	help = "In progress Leaves"/>
-	               	<filter string="Validated"
-	               		icon="terp-camera_test"
-	               		domain="[('state','=','validate')]"
+	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
 					<separator orientation="vertical"/>
 					<field name="employee_id" widget="selection"/>
@@ -96,18 +82,14 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-gtk-stop"
-                            string="Refused"
-                        name="done"
+                    <filter icon="terp-gtk-stop" string="Refused" name="done"
                             domain="[('state','=','refuse')]"/>
                     <separator orientation="vertical"/>
                     <field name="date_from"/>
                     <separator orientation="vertical"/>
                     <field name="holiday_status_id" widget="selection"/>
                     <newline/>
-                    <filter icon="terp-gtk-stop"
-                            string="Cancelled"
-                            domain="[('state','=','cancel')]"/>
+                    <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
                     <field name="date_to"/>
                     <separator orientation="vertical"/>
@@ -122,7 +104,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1,'search_default_Employee':1,'group_by':[]}</field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1, 'group_by':[]} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 9c6d1447f89..af9c92d9f59 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -31,12 +31,12 @@ class hr_holidays_summary_dept(osv.osv_memory):
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
-                }
+        }
 
     _defaults = {
          'date_from': time.strftime('%Y-%m-%d'),
          'holiday_type': 'Validated'
-                 }
+        }
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [])[0]
@@ -55,4 +55,5 @@ class hr_holidays_summary_dept(osv.osv_memory):
             }
 
 hr_holidays_summary_dept()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 1452c864c7f..8ca69ef9274 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -30,12 +30,12 @@ class hr_holidays_summary_employee(osv.osv_memory):
         'date_from': fields.date('From', required=True),
         'emp': fields.many2many('hr.employee', 'summary_emp_rel', 'sum_id', 'emp_id', 'Employee(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
-                }
+        }
 
     _defaults = {
          'date_from': time.strftime('%Y-%m-%d'),
          'holiday_type': 'Validated',
-                 }
+        }
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [])[0]
@@ -53,4 +53,4 @@ class hr_holidays_summary_employee(osv.osv_memory):
 
 hr_holidays_summary_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 77f8624f204a404e575de46c260c54f7391cdd58 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Sat, 3 Jul 2010 17:18:21 +0530
Subject: [PATCH 05/14] [FIX] account_payment: bank statement form inherit
 problem

bzr revid: mra@mra-laptop-20100703114821-i10e4pdelcq17mmj
---
 addons/account_payment/account_payment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index cb6c29aa47f..29798d34b91 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -299,8 +299,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <group colspan="2" col="3" position="inside">
-                    <button name="%(action_account_populate_statement_confirm)d" string="Import payment lines" type="action" icon="gtk-open"/>
+                <group col="6" colspan="4" position="inside">
+                    <button  colspan="2" name="%(action_account_populate_statement_confirm)d" string="Import payment lines" type="action" icon="gtk-open"/>
                 </group>
             </field>
         </record>

From 77d43d6a4158f3936b32158108c7bbe8ab665ee9 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sun, 4 Jul 2010 04:45:53 +0100
Subject: [PATCH 06/14] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100704034553-xth0uvl09ng60dty
---
 addons/account/i18n/zh_CN.po                | 80 ++++++++++-----------
 addons/account_analytic_analysis/i18n/nb.po | 22 +++---
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 87c11dff871..09937b05acb 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-03 03:39+0000\n"
+"PO-Revision-Date: 2010-07-03 17:20+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-03 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-07-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -177,7 +177,7 @@ msgstr "贷方合计"
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -608,7 +608,7 @@ msgstr "这序列字段使用从低到高排序"
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(当前状况留空为打开)"
+msgstr "(留空为打开当前状况)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
@@ -737,7 +737,7 @@ msgstr "上级符号"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "分录集合年度结帐"
+msgstr "结束会计年度分录集合"
 
 #. module: account
 #: view:product.product:0
@@ -902,7 +902,7 @@ msgstr "新的会计年度"
 msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
-msgstr "如果默认税是来自业务伙伴相同的分组的科目(或产品)的税."
+msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同一分组"
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -912,7 +912,7 @@ msgstr "打开会计年度"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr "选择科目表"
+msgstr "选择科目一览表"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -1099,7 +1099,7 @@ msgstr "税代码"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "模板"
+msgstr "一览表模板"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -1164,7 +1164,7 @@ msgstr "税务报表"
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr "打开科目表"
+msgstr "打开一览表"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -1422,7 +1422,7 @@ msgstr "子科目"
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr "显示日志"
+msgstr "显示历史"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
@@ -1524,7 +1524,7 @@ msgstr "打印普通日记帐"
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1536,7 +1536,7 @@ msgstr "发票进展"
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "从模板产生科目表"
+msgstr "从模板产生科目一览表"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -1733,7 +1733,7 @@ msgstr "控制预先生成发票"
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr "会计期间的成本分类账"
+msgstr "成本分类账的会计期间"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
@@ -1775,7 +1775,7 @@ msgstr "百分比"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "科目列表"
+msgstr "一览表"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1956,7 +1956,7 @@ msgstr "Li."
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: help:account.tax,name:0
@@ -2017,7 +2017,7 @@ msgid ""
 "Check this box if you don't want new account moves to pass through the "
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
-msgstr "如果你不想新的凭证从草稿状态生成而是直接通过手动确认到已登记状态, 勾上这选项"
+msgstr "勾选此项, 如果你不想新的凭证从草稿状态生成而是直接通过手动确认到已登记状态."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2220,7 +2220,7 @@ msgstr "增值税 :"
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
@@ -2339,7 +2339,7 @@ msgstr "科目模板"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
@@ -2602,7 +2602,7 @@ msgstr "付款单"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "如果你想在对账分录使用这科目, 选中这选项"
+msgstr "勾选此项, 如果你想用户在这科目对账分录."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2651,7 +2651,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Year Treatments"
-msgstr "期末结账"
+msgstr "结束会计年度处理"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
@@ -2692,7 +2692,7 @@ msgstr "asgfas"
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr "辅助核算项目表"
+msgstr "辅助核算项一览表"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
@@ -3037,7 +3037,7 @@ msgstr ""
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
-msgstr "如果勾选此项系统将试图在产生发票时按会计明细分组"
+msgstr "如果勾选此项, 系统将试图在从发票生成分录明细时分组"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3297,7 +3297,7 @@ msgstr "错误：需要BVR参照"
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "没可打印的发票"
+msgstr "不打印在发票上"
 
 #. module: account
 #: field:account.move.line,move_id:0
@@ -3384,7 +3384,7 @@ msgstr "业务伙伴帐目"
 msgid ""
 "If a default tax if given in the partner it only override taxes from account "
 "(or product) of the same group."
-msgstr "如果一个业务伙伴提供默认税只要覆盖相同分组(产品)科目的税"
+msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同一分组"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3492,7 +3492,7 @@ msgstr "余额结转"
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "合并子科目"
+msgstr "合并的子科目"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3548,7 +3548,7 @@ msgstr "币别"
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
@@ -3615,7 +3615,7 @@ msgstr "用在这发票的业务伙伴"
 msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
-msgstr "如果你不想发票显示任何增值税, 选中这选项"
+msgstr "勾选此项, 如果你不想发票显示任何增值税."
 
 #. module: account
 #: field:account.account.type,sequence:0
@@ -3721,7 +3721,7 @@ msgstr "开始日期"
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
-msgstr "选择科目表"
+msgstr "选择一览表"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
@@ -3961,7 +3961,7 @@ msgstr "应付款科目"
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr "第二货币"
+msgstr "外币"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4050,7 +4050,7 @@ msgstr "       包括已对账分录"
 msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
-msgstr "你能勾选与相关业务伙伴分录明细的争议标记选项"
+msgstr "你能勾选此项去标记与有关业务伙伴的分录明细存在争议"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4545,7 +4545,7 @@ msgstr "辅助核算项统计"
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "将根据选择的模板自动设置你的科目表、银行帐号、税和分录集合"
+msgstr "将根据选择的模板自动设置你的科目一览表、银行帐号、税和分录集合"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4563,7 +4563,7 @@ msgstr "凭证列表"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr "辅助核算项目表"
+msgstr "辅助核算项一览表"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4719,7 +4719,7 @@ msgid ""
 "Check this box to determine that each entry of this journal won't create a "
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
-msgstr "勾选此项确定每个分录集合的分录不会产生一个新的副本但将共享相同的副本. 这用在会计年度关闭时."
+msgstr "勾选此项, 在会计年度关闭时, 确定每个分录集合的分录不会产生新副本, 而是共享同一副本."
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4980,7 +4980,7 @@ msgstr "科目余额 -"
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group invoice lines"
-msgstr "分票明细组"
+msgstr "按发票明细分组"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -5012,7 +5012,7 @@ msgstr "产品模板的收入科目"
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr "强制这科目的所有凭证用这第二货币."
+msgstr "强制所有凭证用这外币"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
@@ -5061,7 +5061,7 @@ msgstr "新的客户退款"
 msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
-msgstr "如果你想每个创建的分录集合使用不同的序列勾选此项. 否则将使用相同序列"
+msgstr "勾选此项, 如果你想每个新建的分录集合使用不同的序列. 否则将使用同一序列"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
@@ -5644,7 +5644,7 @@ msgstr "财务科目"
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -5725,7 +5725,7 @@ msgstr "分录排序按"
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr "打印分类帐 -"
+msgstr "打印分录集合 -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -5906,7 +5906,7 @@ msgstr "勾选此项"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "如果产品和发票你使用含税价. 勾选"
+msgstr "勾选, 如果你使用的产品和发票价格含税."
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5930,7 +5930,7 @@ msgstr "是"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr "如果用户可以在这科目去对账分录. 勾选"
+msgstr "勾选, 如果用户可以在这科目对账分录."
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 3deb56e7e65..d847419e188 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:50+0000\n"
-"Last-Translator: Tor Syversen <sol-moe@online.no>\n"
+"PO-Revision-Date: 2010-07-03 18:41+0000\n"
+"Last-Translator: Mathias Bøhn Grytemark <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -32,7 +32,7 @@ msgstr "Timer, summert pr. bruker"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Forrige fakturadato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -58,7 +58,7 @@ msgstr "Mine nåværende konti"
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ugyldig XML for visningsarkitektur!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -84,7 +84,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
@@ -123,7 +123,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Gjenværende timer"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -159,7 +159,7 @@ msgstr ""
 #: field:account.analytic.account,user_ids:0
 #: field:account_analytic_analysis.summary.user,user:0
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
@@ -182,7 +182,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr ""
+msgstr "Mine kontoer"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -195,7 +195,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr ""
+msgstr "Ufakturerte timer"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0

From 97b133c0df6fd93f5cab16d795581f7fe8f83527 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 4 Jul 2010 14:49:05 +0200
Subject: [PATCH 07/14] merge

bzr revid: fp@tinyerp.com-20100704124905-p78jivhzc5axp40b
---
 addons/mrp/__openerp__.py     |  7 +--
 addons/mrp/mrp_view.xml       |  2 +-
 addons/mrp/stock.py           |  1 -
 addons/mrp/test/mrp_packs.yml | 94 +++++++++++++++++++++++++++++++++++
 addons/stock/stock_view.xml   |  8 +--
 5 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 addons/mrp/test/mrp_packs.yml

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 676e38d2e78..3065516b125 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -86,9 +86,10 @@
     ],
     'demo_xml': ['mrp_demo.xml', 'board_manufacturing_demo.xml'],
     'test': [
-             'test/mrp_phantom_bom.yml',
-             'test/mrp_production_order.yml',
-             'test/mrp_procurement.yml'
+         'test/mrp_packs.yml',
+         'test/mrp_phantom_bom.yml',
+         'test/mrp_production_order.yml',
+         'test/mrp_procurement.yml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d6cd8f573ab..ae5572b1d76 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -634,7 +634,7 @@
                                 <field name="state"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
+                                <button name="button_produce" states="ready" string="Start Production" icon="gtk-execute"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 67efd0d2753..ab22f169552 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -94,7 +94,6 @@ class StockMove(osv.osv):
                         'location_id': move.location_id.id,
                         'procure_method': prodobj.procure_method,
                         'move_id': mid,
-                        'company_id': line['company_id'],
                     })
                     wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
                 move_obj.write(cr, uid, [move.id], {
diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
new file mode 100644
index 00000000000..145b3f7e05f
--- /dev/null
+++ b/addons/mrp/test/mrp_packs.yml
@@ -0,0 +1,94 @@
+- |
+  In order to test the Packs in OpenERP, we will try to sell a "Pack of 24
+  beers" which is composed of 24 "Beers" and a "Beers Pack".
+- |
+  I start by creating the Beers product.
+- 
+  !record {model: product.product, id: product_product_beers0}:
+    categ_id: product.cat1
+    name: Beers
+    procure_method: make_to_stock
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- |
+  I create the "Beers Pack" product.
+- 
+  !record {model: product.product, id: product_product_beerspack0}:
+    categ_id: product.cat1
+    name: Beers Pack
+    procure_method: make_to_stock
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- |
+  I create the "Pack of 24 beers" product
+- 
+  !record {model: product.product, id: product_product_packofbeers0}:
+    categ_id: product.cat1
+    name: Pack of 24 Beers
+    procure_method: make_to_order
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- |
+  I define the Phantom Bill of Material for the "Pack of 24 beers"
+- 
+  !record {model: mrp.bom, id: mrp_bom_packofbeers0}:
+    bom_lines:
+      - company_id: base.main_company
+        name: Beers
+        product_id: product_product_beers0
+        product_qty: 24.0
+        product_uom: product.product_uom_unit
+        type: normal
+      - company_id: base.main_company
+        name: Beers Pack
+        product_id: product_product_beerspack0
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        type: normal
+    name: Pack of 24 Beers
+    product_id: product_product_packofbeers0
+    product_qty: 1.0
+    product_uom: product.product_uom_unit
+    type: phantom
+- |
+  As all my data are created, I will create an outgoing order picking for a
+  "Pack of 24 Beers"
+- 
+  !record {model: stock.picking, id: picking_out}:
+    address_id: base.res_partner_address_tang
+    company_id: base.main_company
+    invoice_state: none
+    move_lines:
+      - company_id: base.main_company
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: Pack of 24 Beers
+        product_id: mrp_bom_packofbeers0
+        product_qty: 2.0
+        product_uom: product.product_uom_unit
+    move_type: direct
+    type: out
+- |
+  I validate the newly created picking.
+- 
+  !python {model: stock.picking}
+    self.draft_validate(cr, uid, [ref("stock_picking_out0")], {
+        "active_ids": [ref("stock.menu_action_picking_tree")],
+        "active_id": ref("stock.menu_action_picking_tree"), }
+    )
+- |
+  I check that my Picking of a "PAck of 24 beers" as been automatically
+  converted to a picking of 24 beers and a pack of beer, so that my
+  stock of beers remains exact.
+-
+  !assert {model: stock.picking, id: stock_picking_out0}:
+    - len(move_ids) == 2
+    - move_ids[0].product_id.id <> move_ids[1].product_id.id
+    - move_ids[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
+    - move_ids[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3128b3592ed..7cdcec6e281 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -626,7 +626,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:scraped == True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped == True" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -797,7 +797,7 @@
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scraped == True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped == True" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1000,7 +1000,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scraped=True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped==True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UOM"/>
@@ -1200,7 +1200,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
-                                <tree colors="grey:scraped==True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped==True" string="Stock Moves">
                                     <field name="product_id" readonly="1"/>
                                     <field name="product_qty" readonly="1"/>
                                     <field name="product_uom" string="UOM" readonly="1"/>

From b52dfba3b648d49859b0dcd01db5939c49a808e3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 4 Jul 2010 14:57:31 +0200
Subject: [PATCH 08/14] [IMP] removed price_accuracy options

bzr revid: fp@tinyerp.com-20100704125731-4ki0efh4h01qlaay
---
 addons/account/__openerp__.py            | 1 -
 addons/account/account.py                | 8 +-------
 addons/account_voucher/voucher.py        | 2 +-
 addons/auction/wizard/auction_pay_buy.py | 8 ++++----
 addons/auction/wizard/auction_pay_sel.py | 2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 73ffe59f4f6..d3a58272b89 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -119,7 +119,6 @@ module named account_vouchers
         "wizard/account_bs_report_view.xml"
     ],
     'demo_xml': [
-        #'demo/price_accuracy00.yml',
         'account_demo.xml',
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 22c234dd0ad..a461cbe5bb7 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1230,13 +1230,7 @@ class account_move(osv.osv):
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
                         raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name)))
 
-            # Check that the move balances, the tolerance for debit/credit must
-            # be smaller than the smallest value according to price accuracy
-            # (hence the +1 below)
-            # Example:
-            #    difference == 0.01 is OK iff price_accuracy <= 1!
-            #    difference == 0.0001 is OK iff price_accuracy <= 3!
-            if abs(amount) < 10 ** -(int(config['price_accuracy'])+1):
+            if abs(amount) < 10 ** -4:
                 if not len(line_draft_ids):
                     continue
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index b40c859385f..90dbcca468f 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -51,7 +51,7 @@ ir_sequence_type()
 class account_journal(osv.osv):
     _inherit = "account.journal"
     _columns = {
-        'max_amount': fields.float('Verify Transaction', digits=(16, int(config['price_accuracy'])), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
+        'max_amount': fields.float('Verify Transaction', digits=(16, 2), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
     }
 account_journal()
 
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 28028f45538..ef8d5a98887 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -29,14 +29,14 @@ class auction_pay_buy(osv.osv_memory):
     _description = "Pay buy"
     
     _columns= {
-       'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+       'amount': fields.float('Amount paid', digits= (16, 2)), 
        'buyer_id':fields.many2one('res.partner', 'Buyer'), 
        'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
-       'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+       'amount2': fields.float('Amount paid', digits= (16, 2)), 
        'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
-       'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))), 
+       'amount3': fields.float('Amount paid', digits = (16, 2)), 
        'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
-       'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
+       'total': fields.float('Amount paid', digits = (16, 2), readonly =True), 
     }
     
     def default_get(self, cr, uid, fields, context):
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 6873092c7e9..711cb8dcedc 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -27,7 +27,7 @@ class auction_pay_sel(osv.osv_memory):
     _description = "Pay Invoice"
     
     _columns= {
-       'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True), 
+       'amount': fields.float('Amount paid', digits= (16, 2), required=True), 
        'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]), 
        'journal_id':fields.many2one('account.journal', 'Journal', required=True), 
        'period_id':fields.many2one('account.period', 'Period', required=True), 

From 1c0a021279af9a377b8e5dbef0b2994de279b6ee Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 4 Jul 2010 15:49:52 +0200
Subject: [PATCH 09/14] modifs

bzr revid: fp@tinyerp.com-20100704134952-gd6iuokhkizs8b01
---
 addons/mrp/test/mrp_packs.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
index 145b3f7e05f..309e3d2b200 100644
--- a/addons/mrp/test/mrp_packs.yml
+++ b/addons/mrp/test/mrp_packs.yml
@@ -1,4 +1,4 @@
-- |
+-
   In order to test the Packs in OpenERP, we will try to sell a "Pack of 24
   beers" which is composed of 24 "Beers" and a "Beers Pack".
 - |
@@ -77,8 +77,8 @@
 - |
   I validate the newly created picking.
 - 
-  !python {model: stock.picking}
-    self.draft_validate(cr, uid, [ref("stock_picking_out0")], {
+  !python {model: stock.picking}: |
+    self.draft_validate(cr, uid, [ref("picking_out")], {
         "active_ids": [ref("stock.menu_action_picking_tree")],
         "active_id": ref("stock.menu_action_picking_tree"), }
     )
@@ -87,7 +87,7 @@
   converted to a picking of 24 beers and a pack of beer, so that my
   stock of beers remains exact.
 -
-  !assert {model: stock.picking, id: stock_picking_out0}:
+  !assert {model: stock.picking, id: picking_out}:
     - len(move_ids) == 2
     - move_ids[0].product_id.id <> move_ids[1].product_id.id
     - move_ids[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))

From dfed3ad24c4bcbaa1bbf7fd993c922d2eef7d041 Mon Sep 17 00:00:00 2001
From: "Mod2 (OpenERP)" <>
Date: Mon, 5 Jul 2010 17:26:24 +0530
Subject: [PATCH 10/14] [FIX] base_contact: yml issue

bzr revid: hmo@tinyerp.com-20100705115624-by9vizauibiw1bxk
---
 addons/base_contact/test/base_contact00.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
index 5a76e25c424..335f525f92f 100644
--- a/addons/base_contact/test/base_contact00.yml
+++ b/addons/base_contact/test/base_contact00.yml
@@ -10,7 +10,7 @@
     !record {model: res.lang, id: res_lang_french0}:
       code: fr_BE
       date_format: '%m/%d/%Y'
-      decimal_point: .
+      decimal_point: '.'
       direction: ltr
       grouping: '[]'
       name: French
@@ -30,7 +30,6 @@
         lang_id: res_lang_french0
         mobile: (+32).10.45.18.77
         name: Williams
-        title: Mss
 -   |
     Now in order to assign this contact to partner I will create one partner assign contact laura to this partner
 - 
@@ -51,7 +50,7 @@
         lang: fr_BE
         name: Laura's Company
         ref: LC
-        title: ltd
+
 -   |
     Now I will check that the new job is assigned properly to contact or not
 -
@@ -74,7 +73,7 @@
         lang_id: res_lang_french0
         mobile: (+32).23.44.32.12
         name: Pauwels
-        title: M.
+
 -   |
     In order to check one contact working at one partner with different functions
     I will create contact with 2 different jobs with different function but the same address
@@ -92,5 +91,4 @@
     lang_id: base_contact.res_lang_french0
     mobile: (+32).10.45.18.77
     name: Mortier
-    title: Mss
 

From e729a381a5634650d8d777d3f14a553313c920e0 Mon Sep 17 00:00:00 2001
From: "Mod2 (OpenERP)" <>
Date: Mon, 5 Jul 2010 17:28:48 +0530
Subject: [PATCH 11/14] [FIX] membership: yml issue

bzr revid: hmo@tinyerp.com-20100705115848-cwby6uxeiknbdwc6
---
 addons/membership/test/test_membership.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
index 5a67ea7f476..6b0dab2a9e5 100644
--- a/addons/membership/test/test_membership.yml
+++ b/addons/membership/test/test_membership.yml
@@ -23,7 +23,6 @@
         country_id: base.fr
         name: Arthur Grosbonnet
         street: 1 rue Rockfeller
-        title: M.
         type: default
         zip: '75016'
     credit_limit: 0.0

From 2820be6629e14a091a24f10e4c2b04459faa1138 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 5 Jul 2010 18:48:51 +0530
Subject: [PATCH 12/14] [IMP] base_contact: * Replace title char field with
 many2one field of res.partner.title in res.partner.contact model * Improve
 form view of res.partner.contact

bzr revid: hmo@tinyerp.com-20100705131851-i8c4otyahwlz5emo
---
 addons/base_contact/base_contact.py       | 34 ++++--------
 addons/base_contact/base_contact_demo.xml | 38 +++++++-------
 addons/base_contact/base_contact_view.xml | 63 ++++++++++++-----------
 3 files changed, 64 insertions(+), 71 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 2bedf9d15fa..848bed39783 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -26,21 +26,7 @@ class res_partner_contact(osv.osv):
 
     _name = "res.partner.contact"
     _description = "Contact"
-
-    def _title_get(self,cr, user, context={}):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user,
-            @param context: A standard dictionary for contextual values
-        """
-
-        obj = self.pool.get('res.partner.title')
-        ids = obj.search(cr, user, [])
-        res = obj.read(cr, user, ids, ['shortcut', 'name','domain'], context)
-        res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
-        return res
-
+    
     def _main_job(self, cr, uid, ids, fields, arg, context=None):
         """
             @param self: The object pointer
@@ -62,7 +48,7 @@ class res_partner_contact(osv.osv):
         'name': fields.char('Last Name', size=30, required=True),
         'first_name': fields.char('First Name', size=30),
         'mobile': fields.char('Mobile', size=30),
-        'title': fields.selection(_title_get, 'Title'),
+        'title': fields.many2one('res.partner.title','Title'),
         'website': fields.char('Website', size=120),
         'lang_id': fields.many2one('res.lang', 'Language'),
         'job_ids': fields.one2many('res.partner.job', 'contact_id', 'Functions and Addresses'),
@@ -101,13 +87,15 @@ class res_partner_contact(osv.osv):
         if not len(ids):
             return []
         res = []
-        for r in self.read(cr, user, ids, ['name','first_name','title']):
-            addr = r['title'] and str(r['title'])+" " or ''
-            addr += r.get('name', '')
-            if r['name'] and r['first_name']:
-                addr += ' '
-            addr += (r.get('first_name', '') or '')
-            res.append((r['id'], addr))
+        for contact in self.browse(cr, user, ids, context=context):
+            _contact = ""
+            if contact.title:
+                _contact += "%s "%(contact.title.name)
+            _contact += contact.name or ""
+            if contact.name and contact.first_name:
+                _contact += " "
+            _contact += contact.first_name or ""
+            res.append((contact.id, _contact))
         return res
 
 res_partner_contact()
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 2c76b1844e8..40646d1f8eb 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -6,19 +6,19 @@
         <record id="res_partner_contact_mortier0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Mortier&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="title" ref="base.res_partner_title_sir"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_jacot0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Jacot&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_passot0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Thomas&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Passot&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lacarte0" model="res.partner.contact">
@@ -37,25 +37,25 @@
         <record id="res_partner_contact_lavente0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Jean-Guy&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lavente&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lelitre0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Sylvie&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lelitre&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Mss&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Arthur&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Grosbonnet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Karine&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lesbrouffe&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_madam" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_zen0" model="res.partner.contact">
@@ -66,73 +66,73 @@
             <field eval="&quot;&quot;&quot;http://fptiny.blogspot.com/&quot;&quot;&quot;" name="website"/>
             <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Pinckaers&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_debois0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Marc&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Debois&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_luu0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Phuong&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Luu&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_madam" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_elkhayat0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Najlaa&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Khayat&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_madam" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_depaoli0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Quentin&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Paolino&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_semal0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Fabian&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;W.&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_vandewerve0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Yvan&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;van de Werve&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lambotte0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Henry&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lambotte&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_laurent0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Olivier&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_simonis0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Christophe&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Dupont&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_wirtel0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Stéphane&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Andre&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_mignon0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Philippe&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Antoine&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9050f05acaf..c336b3e35fe 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -29,37 +29,39 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Partner Contact">
-                <field name="name" select="1"/>
-                <field name="first_name" select="1"/>
+                <group colspan="4" col="6">
+                    <field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
+                    <field name="name" select="1"/>
+                    <field name="first_name" select="1"/>
+                </group>
                 <notebook colspan="4" >
-                    <page string="General">
-                        <newline/>
-                        <separator string="General Information" colspan="4"/>
-                       <group string="Partner" colspan="2" col="2">
-                           <field name="partner_id" invisible="1" select="1"/>
-                           <field name="title" select="1"/>
-                           <field name="function" invisible="1"/>
-                        <field name="email"/>
-                           <field name="lang_id"/>
-                           <field name="active"/>
-                       </group>
-                       <group string="Communication" colspan="2" col="2">
-                           <field name="mobile"/>
-                           <field name="email"  widget="email"/>
-                           <field name="website"/>
-                       </group>
+                    <page string="General">                        
+                       <group colspan="4" col="4">
+                            <group colspan="2" col="4">
+                                <separator string="Communication" colspan="4"/>
+                                <field name="mobile"/>
+                                <field name="email"  widget="email"/>
+                                <field name="website"/>
+                            </group>
+                            <group colspan="2" col="1">
+                                <separator string="Photo" colspan="4"/>
+                                <field name="photo" widget='image' nolabel="1"/>
+                            </group>
+                       </group> 
                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
-                               <group string="Partner" colspan="2" col="4">
+                               <group colspan="4" col="4">
+                                   <field name="sequence_contact" />
                                    <field name="function"/>
-                                   <field name="address_id"/>
-                                   <field name="name"/>
+                                   <field name="name"/> 
+                                   <field name="address_id"/>                                   
                                    <field name="date_start" />
                                    <field name="date_stop" />
                                    <field name="state" />
-                                   <field name="sequence_contact" />
+                                   
                                </group>
-                               <group string="Communication" colspan="2" col="2">
+                                <separator string="Communication" colspan="4"/>
+                               <group colspan="4" col="4">
                                    <field name="phone"/>
                                    <field name="fax"/>
                                    <field name="email" widget="email"/>
@@ -81,16 +83,18 @@
                             </tree>
                         </field>
                     </page>
-                    <page string="Extra Information">
+                    <page string="Extra Information">                        
+                        <field name="active"/>
+                        <field name="lang_id" widget="selection"/>
+                        <field name="partner_id" invisible="1" select="1"/>                                
+                        <field name="function" invisible="1" />  
                         <field name="country_id"/>
                         <field name="birthdate"/>
                     </page>
                     <page string="Notes">
                         <field name="comment" nolabel="1"/>
                     </page>
-                    <page string="Picture">
-                        <field name="photo" nolabel="1" colspan="2" widget="image"/>
-                    </page>
+                    
                 </notebook>
             </form>
         </field>
@@ -174,13 +178,14 @@
                                 <field name="email"/>
                             </tree>
                             <form string="Contacts">
-                            <group string="Partner" colspan="2" col="2">
+                            <group colspan="4" col="4">
                                 <field name="sequence_partner"/>
                                 <field name="name"/>
                                 <field name="contact_id"/>
                                 <field name="function"/>
                             </group>
-                            <group string="Communication" colspan="2" col="2">
+                            <separator string="Communication" colspan="4"/>
+                            <group colspan="4" col="4">
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>

From 1376ed8833f851ca50176700571384c6b9e01d64 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 5 Jul 2010 19:58:43 +0530
Subject: [PATCH 13/14] [IMP] event: small improvement

bzr revid: hmo@tinyerp.com-20100705142843-mf24qbikfy0ndtyx
---
 addons/event/event.py                             | 1 +
 addons/event/wizard/partner_event_registration.py | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index e3398ad6ea5..b74f874e6b5 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -254,6 +254,7 @@ and users by email"),
                 'reference': False, 
                 'invoice_line': [(6, 0, lines)], 
                 'comment': "", 
+                'date_invoice': context.get('date_inv', False)
             })
         inv_id = inv_pool.create(cr, uid, val_invoice['value'])   
         inv_pool.button_compute(cr, uid, [inv_id])
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index 47c2092b5af..d78d57f83da 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -52,11 +52,15 @@ class partner_event_registration(osv.osv_memory):
         record_ids = context and context.get('active_ids', []) or []
         addr = res_obj.address_get(cr, uid, record_ids)
         contact_id = False
+        email = False
         if addr.has_key('default'):
                 job_ids = self.pool.get('res.partner.job').search(cr, uid, [('address_id', '=', addr['default'])])
                 if job_ids:
-                    contact_id = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).contact_id.id
-         
+                    contact = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0])
+                    if contact:
+                        contact_id = contact.contact_id.id
+                        email = contact.email
+                         
         event_obj = self.pool.get('event.event')
         reg_obj = self.pool.get('event.registration')
         mod_obj = self.pool.get('ir.model.data')
@@ -83,6 +87,7 @@ class partner_event_registration(osv.osv_memory):
                         'partner_invoice_id' :  record_ids[0] or False,
                         'event_product': current.event_id.product_id.name,
                         'contact_id': contact_id,
+                        'email_from': email,
                         'nb_register': current.nb_register,
  
                 }, context=context)

From aa7b817b4222f234e8e037c630dd89e3baba3594 Mon Sep 17 00:00:00 2001
From: "Mod2 (OpenERP)" <>
Date: Mon, 5 Jul 2010 20:07:17 +0530
Subject: [PATCH 14/14] [FIX] product: pricelist report

bzr revid: hmo@tinyerp.com-20100705143717-zyh3b3nwbjvhfolt
---
 addons/product/report/product_pricelist.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 5a56a45c785..328d8d5707f 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -44,9 +44,9 @@ class product_pricelist(report_sxw.rml_parse):
         qtys = 1
 
         for i in range(1,6):
-            if form['qty'+str(i)] > 0 and form['qty'+str(i)] not in vals.values():
-                vals['qty'+str(qtys)] = form['qty'+str(i)]
-                qtys += 1
+#            if form['qty'+str(i)] > 0 and form['qty'+str(i)] not in vals.values():
+            vals['qty'+str(qtys)] = form['qty'+str(i)]
+            qtys += 1
         lst.append(vals)
         return lst
 
@@ -55,8 +55,8 @@ class product_pricelist(report_sxw.rml_parse):
             q = 'qty%d'%i
             if form[q] >0 and form[q] not in self.quantity:
                 self.quantity.append(form[q])
-#            else:
-#                self.quantity.append(0)
+            else:
+                self.quantity.append(0)
         return True
 
     def _get_pricelist(self, pricelist_id):
@@ -93,12 +93,12 @@ class product_pricelist(report_sxw.rml_parse):
                 i = 1
                 for qty in self.quantity:
                     if qty == 0:
-                        val['qty'+str(i)] = ""
+                        val['qty'+str(i)] = 0.0
                     else:
                         val['qty'+str(i)]=self._get_price(self.pricelist, product['id'], qty)
-                        i += 1
+                    i += 1
                 products.append(val)
-            res.append({'name':cat['name'],'products':products})
+            res.append({'name':cat['name'],'products': products})
         return res
 
     def _get_price(self,pricelist_id, product_id,qty):