From c7d50354fb880f01092be16ff8a99b66d97e89d5 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 20 Oct 2010 18:59:48 +0530
Subject: [PATCH 1/7] [FIX] hr_timesheet_sheet : date_from and date_to problem,
 hr_evaluation : date deadline problem fixed

bzr revid: vir@tinyerp.com-20101020132948-1ax61wd33j1ejj18
---
 addons/hr_evaluation/hr_evaluation.py                 | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py       | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c5a150691e..4d8ef9d440f 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -124,7 +124,7 @@ class hr_employee(osv.osv):
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
-               evaluation_date=(parser.parse(datetime.date.today().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
+               evaluation_date=(parser.parse(datetime.now().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
                flag = True
             else:
                 if (parser.parse(evaluation_date) + relativedelta(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b152e0112eb..6411bae7bc0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -319,7 +319,7 @@ class hr_timesheet_sheet(osv.osv):
         if r=='month':
             return time.strftime('%Y-%m-01')
         elif r=='week':
-            return (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
         elif r=='year':
             return time.strftime('%Y-01-01')
         return time.strftime('%Y-%m-%d')
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index dedac8377a7..a4b4b434da6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -10,11 +10,12 @@
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
         </record>
 
-        <!-- record id="sheet1" model="hr_timesheet_sheet.sheet">
+        <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
+            <field name="employee_id" ref="hr.employee1" />
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
-        </record-->
+        </record>
 
     </data>
 </openerp>

From 358d1b2fe187664423e38bf6391f1de7fed77ac3 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 20 Oct 2010 19:10:08 +0530
Subject: [PATCH 2/7] [FIX] Account : Usability

bzr revid: jvo@tinyerp.com-20101020134008-bq2gce4sjbkp6i3z
---
 addons/account/wizard/account_validate_move_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 352d23d6b53..d4184dd9c8b 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <form string="Validate Account Entries">
                 <separator string="Validate Journal Entries of a Journal" colspan="4"/>
-                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields." colspan="4"/>
                 <field name="journal_id"/>
                 <newline/>
                 <field name="period_id"/>
@@ -49,7 +49,7 @@
             <form string="Validate Journal Entries">
                 <separator string="Post Journal Entries" colspan="4"/>
                 <image name="terp-referer"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accouting fields." colspan="2"/>
+                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields." colspan="2"/>
                 <separator colspan="4"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>

From b42f8f310d896e52cd89b8ed0e2bd0b55d55be6f Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 20 Oct 2010 19:13:32 +0530
Subject: [PATCH 3/7] [FIX] Account : Correction on closing fiscalyear:journal
 should be centralizaed and the boolean of skip draft state should be False

bzr revid: jvo@tinyerp.com-20101020134332-tzd7uf13nk4vigom
---
 addons/account/wizard/account_fiscalyear_close.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 2f793b77d67..4ab6201b507 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -79,9 +79,9 @@ class account_fiscalyear_close(osv.osv_memory):
         if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
             raise osv.except_osv(_('UserError'),
                     _('The journal must have default credit and debit account'))
-        if not new_journal.centralisation:
+        if (not new_journal.centralisation) or new_journal.entry_posted:
             raise osv.except_osv(_('UserError'),
-                    _('The journal must have centralised counterpart'))
+                    _('The journal must have centralised counterpart without the Skipping draft state option checked!'))
 
         move_ids = obj_acc_move_line.search(cr, uid, [
             ('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id', '=', new_fyear.id)])

From 1d537d4724ed064c0b517a03539db982762270b0 Mon Sep 17 00:00:00 2001
From: "JMA(OpenERP)" <>
Date: Wed, 20 Oct 2010 19:24:21 +0530
Subject: [PATCH 4/7] [FIX] Account_Budget : Correction on functional field
 calculation

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

bzr revid: jvo@tinyerp.com-20101020135421-hd6koh378ojcrp08
---
 addons/account_budget/account_budget.py       | 6 ++++--
 addons/account_budget/account_budget_view.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index b85e089016e..87b7573a68a 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -110,6 +110,7 @@ class crossovered_budget_lines(osv.osv):
 
     def _prac_amt(self, cr, uid, ids, context={}):
         res = {}
+        result = 0.0
         for line in self.browse(cr, uid, ids):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
             if not acc_ids:
@@ -120,10 +121,11 @@ class crossovered_budget_lines(osv.osv):
                 date_from = context['wizard_date_from']
             if context.has_key('wizard_date_to'):
                 date_to = context['wizard_date_to']
-            cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
+            if line.analytic_account_id.id:
+                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
                        "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                        "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
-            result = cr.fetchone()[0]
+                result = cr.fetchone()[0]
             if result is None:
                 result = 0.00
             res[line.id] = result
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 3faf30299c4..866021f5f24 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -131,6 +131,7 @@
                                     <field name="date_to"/>
                                     <field name="paid_date" select="1"/>
                                     <field name="planned_amount" select="1"/>
+                                    <field name="analytic_account_id"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>

From 396c02cf429f49e16fb7ce87aa3b3f70f5ba824b Mon Sep 17 00:00:00 2001
From: "JMA(OpenERP)" <>
Date: Wed, 20 Oct 2010 19:28:03 +0530
Subject: [PATCH 5/7] [FIX] Account : Validation should not throw sero division
 error

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

bzr revid: jvo@tinyerp.com-20101020135803-m4wyc0uk32aulv6f
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index ab9b90d7361..dbac0fdd745 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -830,7 +830,7 @@ class account_invoice(osv.osv):
                         total_fixed += line.value_amount
                     if line.value == 'procent':
                         total_percent += line.value_amount
-                total_fixed = (total_fixed * 100) / inv.amount_total
+                total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
                 if (total_fixed + total_percent) > 100:
                     raise osv.except_osv(_('Error !'), _("Cannot create the invoice !\nThe payment term defined gives a computed amount greater than the total invoiced amount."))
 

From 5b50147e6d0c225700994be96287e542e096f0af Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 20 Oct 2010 19:45:39 +0530
Subject: [PATCH 6/7] [FIX] Purchase_requisition : Correction for datetime
 library changes--fixes=lp:663662

bzr revid: jvo@tinyerp.com-20101020141539-q0zjcpfch0abl39d
---
 .../wizard/purchase_requisition_partner.py               | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 2ae3ae795e9..f32e8331784 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -86,14 +86,19 @@ class purchase_requisition_partner(osv.osv_memory):
                     uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
                     newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - relativedelta(days=company.po_lead)
-                    delay = partner_rec and partner_rec.delay or False
-                    newdate = newdate -(delay or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    delay = partner_rec and partner_rec.delay or 0.0
+                    newdate = newdate -(delay and relativedelta(days=delay) or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
                     partner = partner_rec and partner_rec.name or supplier_data
                     pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
                     location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
 
+                    if not newdate:
+                        date_planned = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
+                    else:
+                        date_planned = newdate.strftime('%Y-%m-%d %H:%M:%S')
+
                     purchase_order_line= {
                             'name': product.partner_ref,
                             'product_qty': line.product_qty,

From cc21b0a22177b09f04a2ab6f73039468e9fc1323 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 20 Oct 2010 21:00:15 +0530
Subject: [PATCH 7/7] [FIX] Purchase_requisition: correction

bzr revid: jvo@tinyerp.com-20101020153015-ayaqrw0k21z5nh2z
---
 .../purchase_requisition/wizard/purchase_requisition_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index f32e8331784..ad2478cb7a5 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -105,7 +105,7 @@ class purchase_requisition_partner(osv.osv_memory):
                             'product_id': line.product_id.id,
                             'product_uom': uom_id,
                             'price_unit': price,
-                            'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                            'date_planned': date_planned,
                             'notes': product.description_purchase,
                     }
                     taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id