From ff9a7525c40e32d3d382be194ccc15459a802003 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 24 Jan 2009 14:13:29 +0100
Subject: [PATCH 1/3] bugfix

bzr revid: fp@tinyerp.com-20090124131329-635ywxv5i4hdsh16
---
 addons/hr_holidays/security/ir.model.access.csv | 2 +-
 addons/mrp/mrp.py                               | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 77d0bc559cd..5af36ab580e 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holidays_log","hr.holidays.log","model_hr_holidays_log_access","hr.group_hr_user",1,1,1,1
+"access_hr_holidays_log","hr.holidays.log","model_hr_holidays_log","hr.group_hr_user",1,1,1,1
 "access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1
 "access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e6bb1dc66c9..be31827a2d9 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -283,13 +283,14 @@ class mrp_bom(osv.osv):
                 for wc_use in bom.routing_id.workcenter_lines:
                     wc = wc_use.workcenter_id
                     d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
-                    cycle = (d + (m and 1.0 or 0.0)) * wc_use.cycle_nbr
+                    mult = (d + (m and 1.0 or 0.0))
+                    cycle = mult * wc_use.cycle_nbr
                     result2.append({
                         'name': bom.routing_id.name,
                         'workcenter_id': wc.id,
                         'sequence': level+(wc_use.sequence or 0),
                         'cycle': cycle,
-                        'hour': float(wc_use.hour_nbr + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)),
+                        'hour': float(wc_use.hour_nbr*mult + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)),
                     })
             for bom2 in bom.bom_lines:
                 res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)

From 698b0d9890f70a030e9edd41a955e8aa5d5e6ae1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 26 Jan 2009 08:02:58 +0100
Subject: [PATCH 2/3] bugfix

bzr revid: fp@tinyerp.com-20090126070258-itq4gnottk4h2vpw
---
 addons/account/wizard/wizard_pay_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index 525fded870f..a87ba6047e2 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -90,7 +90,7 @@ def _wo_check(self, cr, uid, data, context):
 _transaction_add_form = '''<?xml version="1.0"?>
 <form string="Information addendum">
     <separator string="Write-Off Move" colspan="4"/>
-    <field name="writeoff_acc_id"/>
+    <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
     <field name="writeoff_journal_id"/>
     <field name="comment"/>
 </form>'''

From 42015dd8e5316a9a227f2bb5c45d0b0622adf05b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Mon, 26 Jan 2009 10:35:36 +0100
Subject: [PATCH 3/3] [FIX] Change the note for the configuration wizard

lp bug: https://launchpad.net/bugs/320765 fixed

bzr revid: stephane@tinyerp.com-20090126093536-2yjzi1y2ce5whicx
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index dc9553e96e6..6ae89fdc2ac 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -274,7 +274,7 @@
 
         <record model="ir.actions.todo" id="config_auto_directory">
             <field name="name">Auto Configure Directory</field>
-            <field name="note">This wizard will be configure directory for ressource model.</field>
+            <field name="note">This wizard will configure the URL of the server of the document management system.</field>
             <field name="action_id" ref="action_config_auto_directory"/>
         </record>