From 285f382b44f82cba05a82af078c53eab279cdff2 Mon Sep 17 00:00:00 2001
From: "Sofia (Open ERP)" <sso@tinyerp.com>
Date: Wed, 31 Dec 2008 18:51:05 +0530
Subject: [PATCH 01/11] security rules assigned and bugfixed for
 crm_configuration-leads view

bzr revid: sso@tinyerp.com-20081231132105-eppcbcawp5y9ad06
---
 addons/base_module_quality/security/ir.model.access.csv | 3 ++-
 addons/crm_configuration/crm_lead_view.xml              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_module_quality/security/ir.model.access.csv b/addons/base_module_quality/security/ir.model.access.csv
index 748e3895696..6471e45563c 100644
--- a/addons/base_module_quality/security/ir.model.access.csv
+++ b/addons/base_module_quality/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_wizard_quality_check","wizard.quality.check","model_wizard_quality_check",1,1,1,1
+"access_wizard_quality_check","wizard.quality.check","model_wizard_quality_check",,1,1,1,1
+"access_quality_check_detail","quality.check.detail","model_quality_check_detail",,1,1,1,1
\ No newline at end of file
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index c3c84523deb..b67fd1630e0 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -128,7 +128,7 @@
                 <field name="name" string="Name"/>
                 <field name="partner_phone"/>
                 <field name="partner_name2" string="Email"/>
-                <field name="stage_id"  string="Status"/>
+                <field name="stage_id"/>
                 <field name="categ_id" string="Lead Source"/>
                 <field name="category2_id" string="Campaign Type"/>
                 <field name="user_id"/>

From ddd8a0e2d395c15d80b5d577bee959537d4bead4 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 31 Dec 2008 18:56:45 +0530
Subject: [PATCH 02/11] minor edits

bzr revid: jvo@tinyerp.com-20081231132645-x6fxa1oseq5ezfdx
---
 addons/account/account.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c969496beae..b6a114110ce 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2070,8 +2070,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             #create the account_account for this bank journal
             tmp = self.pool.get('res.partner.bank').name_get(cr, uid, [line.acc_no.id])[0][1]
             dig = obj_multi.code_digits
-	    print ">>>>",dig
-	    print ">>>",ref_acc_bank.code.ljust(dig,'0')
             vals={
                 'name': line.acc_no.bank and line.acc_no.bank.name+' '+tmp or tmp,
                 'currency_id': line.currency_id and line.currency_id.id or False,

From 30aad2541411b0013ed3f0f614d670a69b304945 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Wed, 31 Dec 2008 14:30:56 +0100
Subject: [PATCH 03/11] [FIX] Change the confirm button's label to "Confirm (Do
 Not Process Now)"

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

bzr revid: stephane@tinyerp.com-20081231133056-sv142tvgr612wb2s
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1a55d855865..4fef9daa20e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -563,7 +563,7 @@
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
+                                <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>

From 8e1ab5a2772b00e116a929ba7f87684a6a77d85c Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 1 Jan 2009 10:51:32 +0530
Subject: [PATCH 04/11] Correction

bzr revid: jvo@tinyerp.com-20090101052132-zqqstwkqojn7kn0x
---
 addons/l10n_be/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 608ee2c1b68..a345df5dceb 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -34,7 +34,7 @@
     * We have the account templates which can be helpful to generate Charts of Accounts.
     * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency  to create Journals.
         Thus,the pure copy of Chart Template is generated.
-    * This is the same wizard that runs from Financial Managament/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
+    * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
 
     Wizards provided by this module:
     * Enlist the partners with their related VAT  and invoiced amounts.Prepares an XML file format.Path to access : Financial Management/Reporting/Listing of VAT Customers.

From 041d35077ae351911f808a9437c21f69a461f123 Mon Sep 17 00:00:00 2001
From: "Sofia (Open ERP)" <sso@tinyerp.com>
Date: Thu, 1 Jan 2009 11:24:19 +0530
Subject: [PATCH 05/11] menu created for stages in crm_configuration

bzr revid: sso@tinyerp.com-20090101055419-dkk46akwxwg5crlz
---
 addons/crm_configuration/crm_config_view.xml | 34 ++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index eda2fe3d2e3..93a74249d08 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -62,5 +62,39 @@
                 </graph>
             </field>
         </record>
+
+    # ------------------------------------------------------ 
+    # Stage
+    # ------------------------------------------------------ 
+    <record model="ir.ui.view" id="crm_case_stage_tree">
+        <field name="name">crm.case.stage.tree</field>
+        <field name="model">crm.case.stage</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Stages">
+                <field name="name"/>
+                <field name="section_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_stage_form">
+        <field name="name">crm.case.stage.form</field>
+        <field name="model">crm.case.stage</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Stage">
+            	<field name="name" select="1"/>
+                <field name="section_id" select="1"/>
+            </form>
+        </field>
+    </record>
+    <record id="crm_case_stage_act" model="ir.actions.act_window">
+        <field name="name">Stages</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm_case_stage_tree"/>
+    </record>
+    <menuitem action="crm_case_stage_act" id="menu_crm_case_stage_act" parent="crm.next_id_51"/>
+        
     </data>
 </openerp>

From f87a4fa48f6482ad8ad4d8f0880b6b1e29bcc4a4 Mon Sep 17 00:00:00 2001
From: "hda (Tiny)" <hda@tinyerp.com>
Date: Thu, 1 Jan 2009 14:52:07 +0530
Subject: [PATCH 06/11] bugfix

bzr revid: hda@tinyerp.com-20090101092207-cqmypbz9mo08l595
---
 addons/account_tax_include/invoice_tax_incl.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/invoice_tax_incl.xml
index 87e1dba37e0..3e25d37a818 100644
--- a/addons/account_tax_include/invoice_tax_incl.xml
+++ b/addons/account_tax_include/invoice_tax_incl.xml
@@ -21,7 +21,7 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <field name="invoice_line" position="before">
+                <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" position="before">
                     <field name="price_type"/>
                 </field>
             </field>
@@ -33,7 +33,7 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <field name="invoice_line" position="before">
+                <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
                     <field name="price_type"/>
                 </field>
             </field>

From f7bc0a3ad1f3de9167c94b5eab709db02adea833 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 1 Jan 2009 15:27:06 +0530
Subject: [PATCH 07/11] [correction]Behaviour of create menu wizard of
 dashboard

bzr revid: jvo@tinyerp.com-20090101095706-z7kxzeqnq83l1lpm
---
 addons/board/wizard/board_wizard.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/board/wizard/board_wizard.py b/addons/board/wizard/board_wizard.py
index c65ad7e00a1..191cb3f294b 100644
--- a/addons/board/wizard/board_wizard.py
+++ b/addons/board/wizard/board_wizard.py
@@ -38,9 +38,17 @@ section_fields = {
     'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
 }
 
+def check_views(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    board = pool.get('board.board').browse(cr, uid, data['id'])
+    if not board.line_ids:
+        raise wizard.except_wizard('User Error!',"Please Insert Dashboard View(s) !")    
+    return data['form']
+
 def board_menu_create(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     board = pool.get('board.board').browse(cr, uid, data['id'])
+
     action_id = pool.get('ir.actions.act_window').create(cr, uid, {
         'name': board.name,
         'view_type':'form',
@@ -54,12 +62,13 @@ def board_menu_create(self, cr, uid, data, context):
         'icon': 'STOCK_SELECT_COLOR',
         'action': 'ir.actions.act_window,'+str(action_id)
     }, context)
+        
     return {}
 
 class wizard_section_menu_create(wizard.interface):
     states = {
         'init': {
-            'actions': [], 
+            'actions': [check_views], 
             'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
         },
         'create_menu': {

From 4f9faa7f009a1298d4a45e7bcaeab028426a565c Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 1 Jan 2009 15:55:30 +0530
Subject: [PATCH 08/11] fixed bug : display content if static directiory

bzr revid: hmo@tinyerp.com-20090101102530-6fa7wv1e8bguhsvy
---
 addons/document/document.py                | 35 +++++++++++-----------
 addons/document/ftpserver/abstracted_fs.py |  2 ++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 3d0b0176dce..5a0a3cefb0f 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -87,27 +87,28 @@ class node_class(object):
         if self.object2:
             where.append( ('res_model','=',self.object2._name) )
             where.append( ('res_id','=',self.object2.id) )
-            for content in self.object.content_ids:
-                if self.object2 or not content.include_name:
-                    if content.include_name:
-                        test_nodename = self.object2.name + (content.suffix or '') + (content.extension or '')
-                    else:
-                        test_nodename = (content.suffix or '') + (content.extension or '')
-                    if test_nodename.find('/'):
-                        test_nodename=test_nodename.replace('/', '_')
-                    path = self.path+'/'+test_nodename
-                    if not nodename:
-                        n = node_class(self.cr, self.uid,path, self.object2, False, content=content, type='content', root=False)
-                        res2.append( n)
-                    else:
-                        if nodename == test_nodename:
-                            n = node_class(self.cr, self.uid, path, self.object2, False, content=content, type='content', root=False)
-                            res2.append(n)
         else:
             where.append( ('parent_id','=',self.object.id) )
             where.append( ('res_id','=',False) )
         if nodename:
-            where.append( (fobj._rec_name,'like',nodename) )        
+            where.append( (fobj._rec_name,'like',nodename) ) 
+        for content in self.object.content_ids:
+            if self.object2 or not content.include_name:
+                if content.include_name:
+                    test_nodename = self.object2.name + (content.suffix or '') + (content.extension or '')
+                else:
+                    test_nodename = (content.suffix or '') + (content.extension or '')
+                if test_nodename.find('/'):
+                    test_nodename=test_nodename.replace('/', '_')
+                path = self.path+'/'+test_nodename
+                if not nodename:
+                    n = node_class(self.cr, self.uid,path, self.object2, False, content=content, type='content', root=False)
+                    res2.append( n)
+                else:
+                    if nodename == test_nodename:
+                        n = node_class(self.cr, self.uid, path, self.object2, False, content=content, type='content', root=False)
+                        res2.append(n)
+               
         ids = fobj.search(self.cr, self.uid, where+[ ('parent_id','=',self.object and self.object.id or False) ], context=self.context)
         if self.object and self.root and (self.object.type=='ressource'):
             ids += fobj.search(self.cr, self.uid, where+[ ('parent_id','=',False) ], context=self.context)
diff --git a/addons/document/ftpserver/abstracted_fs.py b/addons/document/ftpserver/abstracted_fs.py
index fe64ab44063..b7a06cf6d80 100644
--- a/addons/document/ftpserver/abstracted_fs.py
+++ b/addons/document/ftpserver/abstracted_fs.py
@@ -26,6 +26,7 @@ class file_wrapper(StringIO.StringIO):
     def close(self, *args, **kwargs):
         db,pool = pooler.get_db_and_pool(self.dbname)
         cr = db.cursor()
+        cr.commit()
         try:
             val = self.getvalue()
             val2 = {
@@ -49,6 +50,7 @@ class content_wrapper(StringIO.StringIO):
     def close(self, *args, **kwargs):
         db,pool = pooler.get_db_and_pool(self.dbname)
         cr = db.cursor()
+        cr.commit()
         try:
             getattr(self.pool.get('document.directory.content'), 'process_write_'+self.node.content.extension[1:])(cr, self.uid, self.node, self.getvalue())
         finally:

From c3ec67cc57a5a26480adf0cdaa25b2e54256ec72 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 1 Jan 2009 16:33:23 +0530
Subject: [PATCH 09/11] Corrected behaviour of project with o hours and one
 task defined

bzr revid: jvo@tinyerp.com-20090101110323-gsv6p3c3ab2dm7hr
---
 addons/project/project.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/project/project.py b/addons/project/project.py
index b7779bb3520..6a1e1dfef6d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -409,11 +409,15 @@ class project_work(osv.osv):
     }
     _order = "date desc"
     def create(self, cr, uid, vals, *args, **kwargs):
+        if 'hours' in vals and (not vals['hours']):
+            vals['hours'] = 0.00
         if 'task_id' in vals:
             cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (vals.get('hours',0.0), vals['task_id']))
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids,vals,context={}):
+        if 'hours' in vals and (not vals['hours']):
+            vals['hours'] = 0.00
         for work in self.browse(cr, uid, ids, context):
             cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (vals.get('hours',0.0), work.hours, work.task_id.id))
         return super(project_work,self).write(cr, uid, ids, vals, context)

From cd8281aeedbce9514243ac0be2976a93619ca898 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 1 Jan 2009 17:41:10 +0530
Subject: [PATCH 10/11] Bugfixes

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

bzr revid: jvo@tinyerp.com-20090101121110-t4qhrywujau370w1
---
 addons/hr/hr.py                                           | 6 ++++++
 addons/report_analytic_line/report_analytic_line_view.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 8f05ffcd1f1..4e46240f170 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -47,6 +47,12 @@ class hr_timesheet_group(osv.osv):
         while todo>0:
             cr.execute("select hour_from,hour_to from hr_timesheet where dayofweek='%s' and tgroup_id=%s order by hour_from", (dt_from.day_of_week,id))
             for (hour_from,hour_to) in cr.fetchall():
+                
+                import math
+
+                hour_from = '%02d:%02d' % (math.floor(abs(hour_from)),round(abs(hour_from)%1+0.01,2) * 60)
+                hour_to = '%02d:%02d' % (math.floor(abs(hour_to)),round(abs(hour_to)%1+0.01,2) * 60)
+                
                 h1,m1 = map(int,hour_from.split(':'))
                 h2,m2 = map(int,hour_to.split(':'))
                 d1 = DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,h1,m1)
diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml
index f0f2311f703..ef61bd70645 100644
--- a/addons/report_analytic_line/report_analytic_line_view.xml
+++ b/addons/report_analytic_line/report_analytic_line_view.xml
@@ -7,7 +7,7 @@
             <field name="model">report.account.analytic.line.to.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Lines to Invoice">
+                <form string="Analytic Lines to Invoice">
                     <field name="name" select="1"/>
                     <field name="account_id" select="1"/>
                     <newline/>
@@ -16,7 +16,7 @@
                     <newline/>
                     <field colspan="1" name="amount"/>
                     <field colspan="1" name="unit_amount"/>
-                </tree>
+                </form>
             </field>
         </record>
         

From f26cd1dbeb28f14201b17c888beb6990a5471ae7 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 2 Jan 2009 11:30:20 +0530
Subject: [PATCH 11/11] fixed bug

bzr revid: hmo@tinyerp.com-20090102060020-mt8ozl6h3iu22hv8
---
 addons/document/ftpserver/abstracted_fs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/ftpserver/abstracted_fs.py b/addons/document/ftpserver/abstracted_fs.py
index b7a06cf6d80..9b8b78b6e8a 100644
--- a/addons/document/ftpserver/abstracted_fs.py
+++ b/addons/document/ftpserver/abstracted_fs.py
@@ -619,7 +619,7 @@ class abstracted_fs:
         elif self.isfile(path):
             basedir, filename = os.path.split(path.path)
             self.lstat(path)  # raise exc in case of problems
-            return self.format_list(basedir, [filename])
+            return self.format_list(basedir, [path])
 
 
     # Ok