From b57ef8135394d3ea229786ac85ac065c4d5cde93 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 8 Jul 2010 10:49:22 +0530
Subject: [PATCH 01/57] [MOD] thunderbird : changed label name in plug in and
 small change in description

bzr revid: vir@tinyerp.com-20100708051922-vywrk63l8jfw4bgj
---
 addons/thunderbird/installer.py               |   2 +-
 addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 68896 -> 68895 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 8fe0a4aac33..2225c1b8dbb 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -50,7 +50,7 @@ class thunderbird_installer(osv.osv_memory):
         'thunderbird' : True,
         'name' : 'tiny_plugin-2.0.xpi',
         'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf',
-        'description' : """ * Save the Thunderbird plug­in. \n * Follow the following step to install Thunderbird plug­in. \n -> 1.From Menu Bar of Thunderbird, open Tools ­> Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled  -> 5. Click "Install Now". \n -> 6. Restart Thunderbird."""
+        'description' : """ * Save the Thunderbird plug­in. \n * Follows the following step to install Thunderbird plug­in. \n -> 1.From Menu Bar of Thunderbird, open Tools ­> Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled  -> 5. Click "Install Now". \n -> 6. Restart Thunderbird."""
         }
 
 thunderbird_installer()
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
index 9b9e95aec2f90d321af878811286ddb5e708e38a..2cba195ac6297926cc2419bb0962b92b4dc38cba 100644
GIT binary patch
delta 54809
zcmV(+K;6HfngpMk1h8B!4Q5s7JSX<Ez)9Tz0E?4pEh2wtUNuZ;UNuZrcmx3G1Ly<1
z`~#G1-I6s7mu;W2b;_<fW!tuGyXur}+qP}nwr%r2Pv5?MZ{M$b{QZu%zi*F>%G^0d
zX64!ubH<F=Yb{v`U=S#PzYgi5Sk`M<g#}h%0D!*?0RR=i!NSa%R@UCe+{nO@#@5<I
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%0DZi*5T7blu
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
a08mQ>1^@s600#gE03`wd0OSe*0001iuj94=

delta 54786
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
D=C)ht


From d5c983ef03335aeb055b17345adf22d1f624eac8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 8 Jul 2010 10:58:32 +0530
Subject: [PATCH 02/57] [IMP]: crm: Graph view of lead report

bzr revid: rpa@tinyerp.com-20100708052832-e8llcjz95aq95zpq
---
 addons/crm/report/crm_lead_report_view.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e180d59c720..4086a04ee9d 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -41,12 +41,25 @@
             <field name="arch" type="xml">
                 <graph orientation="vertical" string="Leads Analysis" type="bar">
                     <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
+                    <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
             </field>
         </record>
 
+        <record id="view_report_crm_opportunity_graph" model="ir.ui.view">
+            <field name="name">crm.opportunity.report.graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="vertical" string="Leads Analysis" type="bar">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+        
 <!-- Leads by user and section Search View -->
 
         <record id="view_report_crm_lead_filter" model="ir.ui.view">
@@ -208,7 +221,7 @@
        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_crm_lead_graph"/>
+            <field name="view_id" ref="view_report_crm_opportunity_graph"/>
             <field name="act_window_id" ref="action_report_crm_opportunity"/>
        </record>
 

From 1d708ee12aa9468f8fb52a50dd69c2d08f2bf8fa Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 8 Jul 2010 11:27:25 +0530
Subject: [PATCH 03/57] [IMP]: crm: Minor improvements

bzr revid: rpa@tinyerp.com-20100708055725-6hcm4n74d3hnn9cs
---
 addons/crm/report/crm_phonecall_report.py | 1 -
 addons/crm/wizard/crm_send_email.py       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 25e62fb2342..1c2f85ceed3 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -143,7 +143,6 @@ class crm_phonecall_report(osv.osv):
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open
                 from
                     crm_phonecall c
-                where c.categ_id in (select res_id from ir_model_data where (name = 'categ_phone1' or name ='categ_phone2') and model = 'crm.case.categ')
             )""")
 
 crm_phonecall_report()
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 08395834115..83b1959b196 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -103,7 +103,7 @@ class crm_send_new_email2(osv.osv_memory):
                 ref_id = hist.ref_id
                 case = model_pool.browse(cr, uid, res_id)
             emails = [obj.email_to]
-            email_cc = (obj.email_cc or '').split(',')
+            email_cc = obj.email_cc and  obj.email_cc.split(',') or ''
             emails = filter(None, emails)
             body = obj.text
 

From adf10623d99a0820daaeb50e534179528d5a90e2 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 11:35:58 +0530
Subject: [PATCH 04/57] [IMP]:account:improved general ledger report.

bzr revid: apa@tinyerp.com-20100708060558-9zx4ei8h5m877w35
---
 addons/account/report/general_ledger.rml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index 5358af913de..3f1deb22e6b 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -26,7 +26,7 @@
 
 
 			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
+				<lines>0.88cm 27.7cm 20.12cm 27.7cm</lines>
 				<setFont name="Helvetica" size="8"/>
 				</pageGraphics>
     </pageTemplate>
@@ -105,7 +105,7 @@
      </blockTable>
       <section>
      <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     <blockTable rowHeights="0.65cm" colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+     <blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
 	        <blockTable colWidths="280.0,100.0,52.5,52.5,52.5" style="Table5">
@@ -141,7 +141,7 @@
 
 
 
-     <blockTable colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="72.0,93.0,65.0,40.0,89.0,49.0,49.0,49.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="date">Date</para></td>
           <td><para style="P3">Partner</para></td>
@@ -156,10 +156,10 @@
      </blockTable>
      <section>
      <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     <blockTable rowHeights="0.65cm" colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="72.0,93.0,65.0,40.0,89.0,49.0,49.0,49.0,40.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
        <tr>
           <td>
-	      	<blockTable colWidths="264.00,100.0,50.0,50.0,49.0,40.00" style="Table5">
+	      	<blockTable colWidths="260.00,93.0,49.0,49.0,48.0,40.00" style="Table5">
 			<tr>
 			  <td><para style="Standard">[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
 			  <td><para style="Standard"></para></td>

From 72d4edc4c40bc5f5093c88d41655d309fbbf7434 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 8 Jul 2010 11:48:06 +0530
Subject: [PATCH 05/57] [IMP]: crm_helpdesk: Added fields for message and logs

bzr revid: rpa@tinyerp.com-20100708061806-5pw6q2q4htap1jlt
---
 addons/crm_helpdesk/crm_helpdesk.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index f6106db5903..38352691db0 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -76,7 +76,9 @@ class crm_helpdesk(osv.osv, crm.crm_case):
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
+            'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
     }
 
     _defaults = {

From ae36086b0f6d4b99210ff8b301f8461dae868fc7 Mon Sep 17 00:00:00 2001
From: "Mod2 (OpenERP)" <>
Date: Thu, 8 Jul 2010 11:56:09 +0530
Subject: [PATCH 06/57] [IMP] base_report_creator

bzr revid: hmo@tinyerp.com-20100708062609-o4g2rsn46w3jfj0x
---
 addons/base_report_creator/__openerp__.py     |   1 -
 .../base_report_creator.py                    | 172 ++++++++++--------
 .../base_report_creator_demo.xml              |   1 -
 .../base_report_creator_view.xml              |  45 +++--
 .../base_report_creator_wizard.xml            |   1 -
 addons/base_report_creator/wizard/__init__.py |   1 -
 .../wizard/base_report_creator_open.py        |  64 -------
 .../wizard/report_menu_create.py              |  32 ++--
 .../base_report_creator/wizard/report_open.py |  71 --------
 .../wizard/report_open_view.xml               |  34 ----
 10 files changed, 154 insertions(+), 268 deletions(-)
 delete mode 100644 addons/base_report_creator/wizard/base_report_creator_open.py
 delete mode 100644 addons/base_report_creator/wizard/report_open.py
 delete mode 100644 addons/base_report_creator/wizard/report_open_view.xml

diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 22d7adffe8b..8e1ba708850 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -38,7 +38,6 @@ the "Dashboard" menu.
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/report_menu_create_view.xml',
-        'wizard/report_open_view.xml',
         'base_report_creator_wizard.xml',
         'base_report_creator_view.xml'
     ],
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 764753f5cc2..3ba79bad2c0 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -98,7 +98,7 @@ class report_creator(osv.osv):
         if context is None:
             context = {}
           
-        data = context and context.get('report_id', False) or False    
+        data = context and context.get('report_id', False) or False
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         report = self.browse(cr, user, data)
@@ -114,7 +114,7 @@ class report_creator(osv.osv):
             else:
                 fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
             
-        arch = '<?xml version="1.0" encoding="utf-8"?>\n'
+        arch = '<?xml version="1.0"?>'
         if view_type == 'graph':
             orientation_eval = {'horz':'horizontal','vert' :'vertical'}
             orientation = eval(report.view_graph_orientation,orientation_eval)
@@ -163,14 +163,14 @@ class report_creator(osv.osv):
             arch += '''>'''
             arch += ''.join(temp_list)
         else:
-            arch += '<%s string="%s">\n' % (view_type, report.name)
+            arch += '<%s string="%s">' % (view_type, report.name)
             i = 0
             for f in report.field_ids:
                 if f.field_id.model:
-                    arch += '<field name="%s" select="1"/>' % ('field' + str(i),)
+                    arch += '<field name="%s"/>' % ('field' + str(i),)
                     i += 1
                 else:
-                    arch += '<field name="%s" select="1"/>' % ('column_count',)
+                    arch += '<field name="%s"/>' % ('column_count',)
         arch += '</%s>' % (view_type,)
         result = {
             'arch': arch,
@@ -181,7 +181,6 @@ class report_creator(osv.osv):
             'action': [],
             'relate': []
         }
-        
         return result
 
     def read(self, cr, user, ids, fields = None, context = None, load = '_classic_read'):
@@ -406,55 +405,85 @@ class report_creator(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Report Name', size=64, required=True), 
+        'name': fields.char('Report Name', size=64, required=True),
         'type': fields.selection([('list', 'Rows And Columns Report'), ], 'Report Type', required=True), #('sum','Summation Report')
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the report without removing it."), 
-        'view_type1': fields.selection([('form', 'Form'), 
-                                        ('tree', 'Tree'), 
-                                        ('graph', 'Graph'), 
-                                        ('calendar', 'Calendar')], 'First View', required=True), 
-        'view_type2': fields.selection([('', '/'), 
-                                        ('form', 'Form'), 
-                                        ('tree', 'Tree'), 
-                                        ('graph', 'Graph'), 
-                                        ('calendar', 'Calendar')], 'Second View'), 
-        'view_type3': fields.selection([('', '/'), 
-                                        ('form', 'Form'), 
-                                        ('tree', 'Tree'), 
-                                        ('graph', 'Graph'), 
-                                        ('calendar', 'Calendar')], 'Third View'), 
-        'view_graph_type': fields.selection([('pie', 'Pie Chart'), 
-                                             ('bar', 'Bar Chart')], 'Graph Type', required=True), 
-        'view_graph_orientation': fields.selection([('horz', 'Horizontal'), 
-                                                    ('vert', 'Vertical')], 'Graph Orientation', required=True), 
-        'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id', 'model_id', 'Reported Objects'), 
-        'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'), 
-        'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'), 
-        'state': fields.selection([
-                ('draft', 'Draft'), 
-                ('valid', 'Valid')], 
-                'State', required=True, 
-                help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed custom report. \
-                    \n* The \'Valid\' state is used when user validates the custom report.'), 
-        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True), 
-        'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel', 'report_id', 'group_id', 'Authorized Groups'), 
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the report without removing it."),
+        'view_type1': fields.selection([('form', 'Form'),
+                                        ('tree', 'Tree'),
+                                        ('graph', 'Graph'),
+                                        ('calendar', 'Calendar')], 'First View', required=True),
+        'view_type2': fields.selection([('', '/'),
+                                        ('form', 'Form'),
+                                        ('tree', 'Tree'),
+                                        ('graph', 'Graph'),
+                                        ('calendar', 'Calendar')], 'Second View'),
+        'view_type3': fields.selection([('', '/'),
+                                        ('form', 'Form'),
+                                        ('tree', 'Tree'),
+                                        ('graph', 'Graph'),
+                                        ('calendar', 'Calendar')], 'Third View'),
+        'view_graph_type': fields.selection([('pie', 'Pie Chart'),
+                                             ('bar', 'Bar Chart')], 'Graph Type', required=True),
+        'view_graph_orientation': fields.selection([('horz', 'Horizontal'),
+                                                    ('vert', 'Vertical')], 'Graph Orientation', required=True),
+        'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id', 'model_id', 'Reported Objects'),
+        'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
+        'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
+        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
+        'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel', 'report_id', 'group_id', 'Authorized Groups'),
+        'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
     }
     _defaults = {
-        'type': lambda *args: 'list', 
-        'state': lambda *args: 'draft', 
-        'active': lambda *args: True, 
-        'view_type1': lambda *args: 'tree', 
-        'view_type2': lambda *args: 'graph', 
-        'view_graph_type': lambda *args: 'bar', 
-        'view_graph_orientation': lambda *args: 'horz', 
+        'type': lambda *args: 'list',
+        'active': lambda *args: True,
+        'view_type1': lambda *args: 'tree',
+        'view_type2': lambda *args: 'graph',
+        'view_graph_type': lambda *args: 'bar',
+        'view_graph_orientation': lambda *args: 'horz',
     }
+
+    def open_report(self, cr, uid, ids, context=None):
+        """
+        This Function opens base creator report  view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of report open's IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for base creator report form
+        """
+        if not context:
+            context = {}
+
+        rep = self.browse(cr, uid, ids, context=context)
+        if not rep:
+            return False
+        
+        rep = rep[0]
+        view_mode = rep.view_type1
+        if rep.view_type2:
+            view_mode += ',' + rep.view_type2
+        if rep.view_type3:
+            view_mode += ',' + rep.view_type3
+        value = {
+            'name': rep.name,
+            'view_type': 'form',
+            'view_mode': view_mode,
+            'res_model': 'base_report_creator.report',
+            'type': 'ir.actions.act_window',
+            'context': "{'report_id':%d}" % (rep.id,),
+            'nodestroy': True,
+        }
+
+        return value
+
     def _function_field(self, cr, uid, ids):
         """
-        constraints function which specify that 
+        constraints function which specify that
                 not display field which are not stored in Database.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Report creator's id.       
+        @param ids: List of Report creator's id.
         @return: True if display field which are  stored in database.
                      or false if display field which are not store in dtabase.
         """
@@ -514,10 +543,11 @@ class report_creator(osv.osv):
                     return False
         return True
 
+
     _constraints = [
-        (_function_field, 'You can not display field which are not stored in Database.', ['field_ids']), 
-        (_aggregation_error, 'You can apply aggregate function to the non calculated field.', ['field_ids']), 
-        (_calander_view_error, "You must have to give calendar view's color,start date and delay.", ['field_ids']), 
+        (_function_field, 'You can not display field which are not stored in Database.', ['field_ids']),
+        (_aggregation_error, 'You can apply aggregate function to the non calculated field.', ['field_ids']),
+        (_calander_view_error, "You must have to give calendar view's color,start date and delay.", ['field_ids']),
     ]
 report_creator()
 
@@ -531,25 +561,25 @@ class report_creator_field(osv.osv):
     _rec_name = 'field_id'
     _order = "sequence,id"
     _columns = {
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of fields."), 
-        'field_id': fields.many2one('ir.model.fields', 'Field'), 
-        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'), 
-        'group_method': fields.selection([('group', 'Grouped'), 
-                                          ('sum', 'Sum'), 
-                                          ('min', 'Minimum'), 
-                                          ('count', 'Count'), 
-                                          ('max', 'Maximum'), 
-                                          ('avg', 'Average')], 'Grouping Method', required=True), 
-        'graph_mode': fields.selection([('', '/'), 
-                                        ('x', 'X Axis'), 
-                                        ('y', 'Y Axis')], 'Graph Mode'), 
-        'calendar_mode': fields.selection([('', '/'), 
-                                           ('date_start', 'Starting Date'), 
-                                           ('date_end', 'Ending Date'), ('date_delay', 'Delay'), ('date_stop', 'End Date'), ('color', 'Unique Colors')], 'Calendar Mode'), 
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of fields."),
+        'field_id': fields.many2one('ir.model.fields', 'Field'),
+        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'),
+        'group_method': fields.selection([('group', 'Grouped'),
+                                          ('sum', 'Sum'),
+                                          ('min', 'Minimum'),
+                                          ('count', 'Count'),
+                                          ('max', 'Maximum'),
+                                          ('avg', 'Average')], 'Grouping Method', required=True),
+        'graph_mode': fields.selection([('', '/'),
+                                        ('x', 'X Axis'),
+                                        ('y', 'Y Axis')], 'Graph Mode'),
+        'calendar_mode': fields.selection([('', '/'),
+                                           ('date_start', 'Starting Date'),
+                                           ('date_end', 'Ending Date'), ('date_delay', 'Delay'), ('date_stop', 'End Date'), ('color', 'Unique Colors')], 'Calendar Mode'),
     }
     _defaults = {
-        'group_method': lambda *args: 'group', 
-        'graph_mode': lambda *args: '', 
+        'group_method': lambda *args: 'group',
+        'graph_mode': lambda *args: '',
     }
 report_creator_field()
 
@@ -561,14 +591,14 @@ class report_creator_filter(osv.osv):
     _name = "base_report_creator.report.filter"
     _description = "Report Filters"
     _columns = {
-        'name': fields.char('Filter Name', size=64, required=True), 
-        'expression': fields.text('Value', required=True, help='Provide an expression for the field based on which you want to filter the records.\n e.g. res_partner.id=3'), 
-        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'), 
-        'condition': fields.selection([('and', 'AND'), 
+        'name': fields.char('Filter Name', size=64, required=True),
+        'expression': fields.text('Value', required=True, help='Provide an expression for the field based on which you want to filter the records.\n e.g. res_partner.id=3'),
+        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'),
+        'condition': fields.selection([('and', 'AND'),
                                         ('or', 'OR')], 'Condition')
     }
     _defaults = {
-        'condition': lambda *args: 'and', 
+        'condition': lambda *args: 'and',
     }
 report_creator_filter()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/base_report_creator_demo.xml b/addons/base_report_creator/base_report_creator_demo.xml
index da44979f26d..3ec5cfbe987 100644
--- a/addons/base_report_creator/base_report_creator_demo.xml
+++ b/addons/base_report_creator/base_report_creator_demo.xml
@@ -10,7 +10,6 @@
 			<field eval="&quot;tree&quot;" name="view_type1"/>
 			<field eval="&quot;list&quot;" name="type"/>
 			<field eval="&quot;horz&quot;" name="view_graph_orientation"/>
-			<field eval="&quot;valid&quot;" name="state"/>
 		</record>
 		<record id="base_report_creator_report_fields_0" model="base_report_creator.report.fields">
 			<field name="report_id" ref="base_report_creator_report_salesanalysis0"/>
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 021bcbb5998..d2116171c07 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -23,7 +23,6 @@
             <tree string="Report Creator">
                 <field name="name"/>
                 <field name="type"/>
-                <field name="state"/>
             </tree>
         </field>
     </record>
@@ -42,12 +41,21 @@
                 <notebook colspan="4">
                 <page string="General Configuration">
                     <field name="model_ids" colspan="4"
-                        context="{'model_ids':model_ids}" />
-                    <separator string="State"  colspan="4"/>
-                    <field name="state"/>
-                    <button string="Create Menu"
-                        name="%(action_report_menu_create)d" type="action"
-                        colspan="2" icon="gtk-justify-fill" />
+                        context="{'model_ids':model_ids}" nolabel="1" />
+                    <separator string=""  colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="menu_id"/>
+                        </group>
+                        <group colspan="2">
+                            <button string="Create Menu"
+                                name="%(action_report_menu_create)d" type="action"
+                                icon="gtk-justify-fill" attrs="{'invisible':[('menu_id','!=',False)]}"/>
+                            <button string="Open Report"
+                                name="open_report" type="object"
+                                icon="gtk-open" />
+                        </group>
+                    </group>
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
@@ -112,6 +120,22 @@
         </field>
     </record>
 
+    <record id="view_report_filter" model="ir.ui.view">
+        <field name="name">Report Name</field>
+        <field name="model">base_report_creator.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+        <search string="Report">
+            <field name="name"></field>
+            <newline/>
+            <group expand="0" string="Group By...">
+                <filter string="Report Name" icon="terp-personal" domain="[]"
+                            context="{'group_by':'name'}" />
+            </group>
+        </search>
+        </field>
+    </record>
+
  <!-- Action for Report creator form -->
 
     <record model="ir.actions.act_window" id="base_report_creator_action">
@@ -119,6 +143,7 @@
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_report_filter"/>
     </record>
 
     <menuitem
@@ -152,11 +177,5 @@
         id="menu_base_report_creator_action"
         action="base_report_creator_action_tree"/>
 
-    <act_window id="action_report_open"
-            key2="client_action_multi" name="Open Report"
-            res_model="report.open" src_model="base_report_creator.report"
-            view_mode="form" target="new" view_type="form" />
-
-
     </data>
 </openerp>
diff --git a/addons/base_report_creator/base_report_creator_wizard.xml b/addons/base_report_creator/base_report_creator_wizard.xml
index a8dad6f9b41..68ab122edb0 100644
--- a/addons/base_report_creator/base_report_creator_wizard.xml
+++ b/addons/base_report_creator/base_report_creator_wizard.xml
@@ -3,6 +3,5 @@
 	<data>
 		<wizard id="wizard_set_filter_fields" string="Set Filter Fields"
 			name="base_report_creator.report_filter.fields" />
-
 	</data>
 </openerp>
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index d2ff1dc5fea..5616c82a370 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -21,6 +21,5 @@
 
 import wiz_set_filter_fields
 import report_menu_create
-import report_open
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/base_report_creator_open.py b/addons/base_report_creator/wizard/base_report_creator_open.py
deleted file mode 100644
index be7420c5744..00000000000
--- a/addons/base_report_creator/wizard/base_report_creator_open.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
-from tools.translate import _
-
-
-
-class report_creator_open(wizard.interface):
-    def _open_report(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        if context.get('report_id',False):
-            raise  wizard.except_wizard(_('UserError'),_('No Wizards available for this object!'))
-        rep = pool.get('base_report_creator.report').browse(cr, uid, data['id'], context)
-        view_mode = rep.view_type1
-        if rep.view_type2:
-            view_mode += ','+rep.view_type2
-        if rep.view_type3:
-            view_mode += ','+rep.view_type3
-        value = {
-            'name': rep.name,
-            'view_type': 'form',
-            'view_mode': view_mode,
-            'res_model': 'base_report_creator.report',
-            'context': {'report_id': data['id']},
-            'view_id': False,
-            'type': 'ir.actions.act_window'
-        }
-        return value
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type':'action', 'action':_open_report, 'state':'end'}
-        }
-    }
-report_creator_open('base_report_creator.report.open')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 06e48b2ee8f..84b952f976a 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -43,31 +43,41 @@ class report_menu_create(osv.osv_memory):
         if not context:
             context = {}
         context_id = context and context.get('active_id', False) or False
+        obj_menu = self.pool.get('ir.ui.menu')
+        data_obj = self.pool.get('ir.model.data')
+        obj_board = self.pool.get('base_report_creator.report')
         if context_id:
-            board = self.pool.get('base_report_creator.report').browse(cr, uid, context_id)
+            data = self.browse(cr, uid, ids, context=context)
+            if not data:
+                return {}
+            data = data[0]
+
+            board = obj_board.browse(cr, uid, context_id)
             view = board.view_type1
             if board.view_type2:
                 view += ',' + board.view_type2
             if board.view_type3:
                 view += ',' + board.view_type3
+                    
+            result = data_obj._get_id(cr, uid, 'base_report_creator', 'view_report_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
             action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
                 'name': board.name,
                 'view_type':'form',
                 'view_mode':view,
                 'context': "{'report_id':%d}" % (board.id,),
-                'res_model': 'base_report_creator.report'
-                })
-        obj_menu = self.pool.get('ir.ui.menu')
-        #start Loop
-        for data in self.read(cr, uid, ids):
-            obj_menu.create(cr, uid, {
-                'name': data.get('menu_name'),
-                'parent_id': data.get('menu_parent_id'),
+                'res_model': 'base_report_creator.report',
+                'search_view_id': res['res_id']
+                })       
+            
+            menu_id = obj_menu.create(cr, uid, {
+                'name': data.menu_name,
+                'parent_id': data.menu_parent_id.id,
                 'icon': 'STOCK_SELECT_COLOR',
                 'action': 'ir.actions.act_window, ' + str(action_id)
                 }, context=context)
-            return {}
-        #End Loop
+            obj_board.write(cr, uid, context_id, {'menu_id': menu_id})
+        return {}
 report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/wizard/report_open.py b/addons/base_report_creator/wizard/report_open.py
deleted file mode 100644
index 4476c9d4e93..00000000000
--- a/addons/base_report_creator/wizard/report_open.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-class report_open(osv.osv_memory):
-    """
-    Open report
-    """
-    _name = "report.open"
-    _description = __doc__
-
-    def open_report(self, cr, uid, ids, context=None):
-        """
-        This Function opens base creator report  view
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of report open's IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for base creator report form
-        """
-
-        if not context:
-            context = {}
-            
-        context_id = context and context.get('active_id', False) or False
-        
-        if context.get('report_id', False):
-            raise  osv.except_osv(_('UserError'), _('No Wizards available for this object!'))
-        
-        rep = self.pool.get('base_report_creator.report').browse(cr, uid, context_id, context)
-        view_mode = rep.view_type1
-        
-        if rep.view_type2:
-            view_mode += ',' + rep.view_type2
-        if rep.view_type3:
-            view_mode += ',' + rep.view_type3
-        value = {
-            'name': rep.name, 
-            'view_type': 'form', 
-            'view_mode': view_mode, 
-            'res_model': 'base_report_creator.report', 
-            'context': {'report_id': context_id}, 
-            'view_id': False, 
-            'type': 'ir.actions.act_window'
-        }
-        
-        return value
-
-report_open()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/wizard/report_open_view.xml b/addons/base_report_creator/wizard/report_open_view.xml
deleted file mode 100644
index 941bcf73b6e..00000000000
--- a/addons/base_report_creator/wizard/report_open_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-    <!-- Report Open wizard -->
-    
-  		<record id="view_report_open" model="ir.ui.view">
-            <field name="name">report.open.form</field>
-            <field name="model">report.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Report open">
-                   	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel"
-                    		string="Cancel" />
-                    	<button icon="gtk-open" string="Open Report"
-                    		name="open_report" type="object" />
-                    </group>
-                </form>
-            </field>
-  		</record>
-  		
-        <record id="action_report_open" model="ir.actions.act_window">
-            <field name="name">Open Report</field>
-            <field name="res_model">report.open</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_report_open"/> 
-            <field name="target">new</field>
-        </record>
-        
-    </data>
-</openerp>

From 2a5b07f86cbd43f2f3299f741fc4e93dd27126d7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 12:08:34 +0530
Subject: [PATCH 07/57] [IMP]:account:improved account balance report.

bzr revid: apa@tinyerp.com-20100708063834-gttzlob2xfpacnpt
---
 addons/account/report/account_balance.rml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index af4cee7a7ba..8ee7e3e17dc 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -217,11 +217,11 @@
         <td><para style="P10">Balance</para></td>
       </tr>
       <tr>
-		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
-        <td><para style="P14"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
-        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
-        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
-        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
+		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
+        <td><para style="P14"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
       </tr>
     </blockTable>
   </story>

From 0d5c37b5315512c8b3de0d48fae0db3e2d4988f1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 8 Jul 2010 12:20:47 +0530
Subject: [PATCH 08/57] [FIX]: crm: Fixed table name crm_opportunity in report
 query

bzr revid: rpa@tinyerp.com-20100708065047-1qeejljvkp8zqj4x
---
 addons/crm/report/crm_lead_report.py      | 2 +-
 addons/crm/report/crm_phonecall_report.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 0993cf2dedb..208054b3f4d 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -51,7 +51,7 @@ class crm_lead_report(osv.osv):
         for case in self.browse(cr, uid, ids, context):
             if field_name != 'avg_answers':
                 state = field_name[5:]
-                cr.execute("select count(id) from crm_opportunity where \
+                cr.execute("select count(id) from crm_lead where \
                     section_id =%s and state='%s'"%(case.section_id.id, state))
                 state_cases = cr.fetchone()[0]
                 perc_state = (state_cases / float(case.nbr)) * 100
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 1c2f85ceed3..00d13c7216c 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -53,7 +53,7 @@ class crm_phonecall_report(osv.osv):
         for case in self.browse(cr, uid, ids, context):
             if field_name != 'avg_answers':
                 state = field_name[5:]
-                cr.execute("select count(*) from crm_opportunity where \
+                cr.execute("select count(*) from crm_lead where \
                     section_id =%s and state='%s'"%(case.section_id.id, state))
                 state_cases = cr.fetchone()[0]
                 perc_state = (state_cases / float(case.nbr)) * 100

From 47634300f20c6fb2642de1ee33f085e5238fa9ed Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 12:24:32 +0530
Subject: [PATCH 09/57] [IMP]:account:improved partner balance report.(clean
 unused code.)

bzr revid: apa@tinyerp.com-20100708065432-37lmsbhbnszs3s20
---
 addons/account/report/partner_balance.rml | 190 +---------------------
 1 file changed, 7 insertions(+), 183 deletions(-)

diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index ff6e1214a1b..2df0f6b47a6 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -107,182 +107,6 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
 
-     <blockTableStyle id="TrLevel8">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel7">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel6">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-     </blockTableStyle>
-    <blockTableStyle id="TrLevel5">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel4">
-     <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel3">
-     <lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="1,0"/>
-      <blockLeftPadding length="0" start="0,3" stop="1,3"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel2">
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="-1,0"/>
-      <blockLeftPadding length="0" start="0,0" stop="1,0"/>
-    </blockTableStyle>
- 	<blockTableStyle id="TrLevel1">
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <blockLeftPadding length="0" start="0,0" stop="1,0"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="TrLevel0">
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,2" stop="-1,2"/>
-    </blockTableStyle>
-    <blockTableStyle id="LineLevel1">
-		<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-	</blockTableStyle>
-
-	<blockTableStyle id="Line1">
-		<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	</blockTableStyle>
-
-	<blockTableStyle id="Line2">
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
-	</blockTableStyle>
-
-    <paraStyle
-		name="Level8"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-     <paraStyle
-		name="Level7"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-     <paraStyle
-		name="Level6"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle
-		name="Level5"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle
-		name="Level4"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle
-		name="Level3"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle name="Level2"
-		fontSize="8.0"
-		fontName="Helvetica-Bold"
-		/>
-	<paraStyle name="Level1"
-		fontSize="8.0"
-		fontName="Helvetica-Bold"
-		/>
-
-	<paraStyle
-		name="Amt_Level8"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Amt_Level7"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Amt_Level6"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Amt_Level5"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Amt_Level4"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Amt_Level3"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Amt_Level2"
-		fontSize="8.0"
-		fontName="Helvetica-Bold" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-	<paraStyle name="Amt_Level1"
-		fontSize="8.0"
-		fontName="Helvetica-Bold" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-
-	<paraStyle
-		name="Det_Level8"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-     <paraStyle
-		name="Det_Level7"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-     <paraStyle
-		name="Det_Level6"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle
-		name="Det_Level5"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle
-		name="Det_Level4"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle
-		name="Det_Level3"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle name="Det_Level2"
-		fontSize="8.0" leading="5"
-		fontName="Times-Italic"
-		/>
-	<paraStyle name="Det_Level1"
-		fontSize="8.0" leading="5"
-		fontName="Times-Italic"
-		/>
-
-	<paraStyle
-		name="Det_Amt_Level8"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Det_Amt_Level7"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Det_Amt_Level6"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Det_Amt_Level5"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Det_Amt_Level4"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Det_Amt_Level3"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Det_Amt_Level2"
-		fontSize="8.0"
-		fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-	<paraStyle name="Det_Amt_Level1"
-		fontSize="8.0"
-		fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-
   </stylesheet>
   <story>
     <para style="P12a"></para>
@@ -305,19 +129,19 @@
       </tr>
       <tr>
         <td><para style="P7">Balance</para></td>
-        <td><para style="P8"></para></td> 
+        <td><para style="P8"></para></td>
         <td><para style="P8">[[ formatLang(solde_debit(data)) ]]</para></td>
         <td><para style="P8">[[ formatLang(solde_credit(data)) ]]</para></td>
         <td><para style="P8"></para></td>
         <td><para style="P8"></para></td>
       </tr>
       <tr>
-        <td><para style="P3">[[ repeatIn(lines(data), 'a') ]]<font>[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
-        <td><para style="P3">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['name'] ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['debit']) ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['credit']) ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['balance']) ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
+        <td><para style="P3">[[ repeatIn(lines(data), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
       </tr>
     </blockTable>
   </story>

From 00b3aab1604b276733eb554e4f61decb0ead3313 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 12:25:24 +0530
Subject: [PATCH 10/57] [FIX] survey

bzr revid: hmo@tinyerp.com-20100708065524-om7tr8bgwxpj309z
---
 addons/survey/wizard/survey_selection.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index beb0fe6571f..6477f110dc3 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -67,7 +67,6 @@ class survey_name_wiz(osv.osv_memory):
         user_rec = user_obj.read(cr, uid, uid)
         for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
             if sur.state == 'open':
-#                if group_id[0]  in user_rec['groups_id']:
                 for i in group_id:
                     if i in user_rec['groups_id']:
                         result.append((sur.id, sur.title))
@@ -137,14 +136,13 @@ class survey_name_wiz(osv.osv_memory):
     def on_change_survey(self, cr, uid, ids, survey_id, context=None):
         """
             on change event of survey_id field, if note is available in selected survey then display this note in note fields.
-
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
             @param ids: List of Survey IDs
+            @param survey_id: Id of Survey
             @param context: A standard dictionary for contextual values
             @return : Dictionary values of notes fields.
         """
+        if not survey_id:
+            return {}
         notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
         return {'value': {'note': notes}}
 

From 96f31d2880f4430365f3c86596943df1a0432aaa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 8 Jul 2010 12:28:43 +0530
Subject: [PATCH 11/57] [IMP] procurement: Improve the tooltips

bzr revid: sbh@tinyerp.com-20100708065843-1l513l6mb0482e2f
---
 addons/procurement/company.py     | 2 +-
 addons/procurement/procurement.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index f6d1e69d122..dcdff896553 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -24,7 +24,7 @@ from osv import osv,fields
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'schedule_range': fields.float('Scheduler Range', required=True,
+        'schedule_range': fields.float('Scheduler Range Days', required=True,
             help="This is the time frame analysed by the scheduler when "\
             "computing procurements. All procurements that are not between "\
             "today and today+range are skipped for futur computation."),
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index beefd9dc461..b716650ed5a 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -472,7 +472,7 @@ class stock_warehouse_orderpoint(osv.osv):
             help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Mix Quantity, Open ERP generates "\
+            help="When the virtual stock goes belong the Max Quantity, Open ERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
             help="The procurement quantity will by rounded up to this multiple."),

From cb6add0765f485fb115eeed338eed0555125534d Mon Sep 17 00:00:00 2001
From: "Mod2 (OpenERP)" <>
Date: Thu, 8 Jul 2010 12:43:21 +0530
Subject: [PATCH 12/57] [IMP] stock: split inventory line

bzr revid: hmo@tinyerp.com-20100708071321-9ivz72r32l38ryx8
---
 addons/stock/stock.py                         |  1 +
 .../wizard/stock_inventory_line_split.py      | 29 ++++---
 .../stock_inventory_line_split_view.xml       | 87 ++++++++++++-------
 3 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9bc40a1e691..e0ab1101535 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2229,6 +2229,7 @@ class stock_inventory(osv.osv):
 
                 # price = line.product_id.standard_price or 0.0
                 amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
+                #TOCHECK: Why put restriction like new inventory qty should greater available qty ?
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
                 if change:
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index b07d27c7656..5c4e8f708d2 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -47,7 +47,11 @@ class stock_inventory_line_split(osv.osv_memory):
         res = {}
         line = self.pool.get('stock.inventory.line').browse(cr, uid, record_id)        
         if 'product_id' in fields:
-            res.update({'product_id':line.product_id.id})       
+            res.update({'product_id':line.product_id.id})
+        if 'product_uom' in fields:
+            res.update({'product_uom': line.product_uom.id})
+        if 'qty' in fields:
+            res.update({'qty': line.product_qty})       
         return res
     
     def split(self, cr, uid, ids, line_ids, context=None):
@@ -68,11 +72,13 @@ class stock_inventory_line_split(osv.osv_memory):
             for inv_line in line_obj.browse(cr, uid, line_ids):
                 line_qty = inv_line.product_qty
                 quantity_rest = inv_line.product_qty                
-                new_line = []                            
-                for line in data.line_ids:
+                new_line = []   
+                if data.use_exist:
+                    lines = [l for l in data.line_exist_ids if l]
+                else:
+                    lines = [l for l in data.line_ids if l]                         
+                for line in lines:
                     quantity = line.quantity
-                    
-
                     if quantity <= 0 or line_qty == 0:
                         continue
                     quantity_rest -= quantity                    
@@ -85,14 +91,13 @@ class stock_inventory_line_split(osv.osv_memory):
                     current_line = line_obj.copy(cr, uid, inv_line.id, default_val)
                     new_line.append(current_line)
                     prodlot_id = False
-                    if line.use_exist and line.name:
-                        prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
-                        if prodlot_id:
-                            prodlot_id = prodlot_id[0]                    
+                    if data.use_exist:
+                        prodlot_id = line.prodlot_id.id
                     if not prodlot_id:
-                        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-                        prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix' : line.name}, 
-                                                 {'product_id': data.product_id.id})                    
+                        prodlot_id = prodlot_obj.create(cr, uid, {
+                            'name': line.name,
+                            'product_id': inv_line.product_id.id},
+                        context=context)
                     line_obj.write(cr, uid, [current_line], {'prod_lot_id': prodlot_id})
                     prodlot = prodlot_obj.browse(cr, uid, prodlot_id)                    
                     
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index 42b8a4648da..fc188184c42 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -1,38 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-            <record id="view_stock_inventory_line_split" model="ir.ui.view">
-                <field name="name">Split inventory lines</field>
-                <field name="model">stock.inventory.line.split</field>
-                <field name="type">form</field>
-                <field name="arch" type="xml">
-	                <form string="Split inventory lines in lots">
-	                	<field name="product_id" colspan="4" readonly="1"/>
-	                	<newline/>
-	                	<field name="line_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
-	                			<field name="name" string="Lots"/>
-	                			<field name="quantity" />
-                                <field name="use_exist" />
-	                		</tree>
-	                		<form string="Lots Number">
-	                			<field name="name" string="Lots"/>
-	                			<field name="quantity" />
-                                <field name="use_exist" />
-	                		</form>
-	                	</field>
-	                	<separator string="" colspan="4" />
-	                	<label string="" colspan="2" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="split_lot" string="Ok"
-	                		type="object" icon="gtk-ok" />
-	                </form>
-	            </field>
-	        </record>	        
-     	
-
+        <record id="view_split_in_lots_inherit" model="ir.ui.view">
+	        <field name="name">Split Inventory Line</field>
+	        <field name="model">stock.inventory.line.split</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+                <form string="Split in lots">
+                    <group width="660" height="275">
+                        <field name="product_id" colspan="4" readonly="1"/>
+                        <newline/>
+						<group colspan="4" col="4">
+						    <group colspan="1" col="2">
+						        <field name="use_exist"/>
+						    </group>
+							<group colspan="1" col="2">
+							    <field name="qty" readonly="1"/>
+							</group>
+							<group colspan="1" col="2">
+							    <field name="product_uom" readonly="1"/>
+							</group>
+	                    </group>
+	                    <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
+	                        <field name="line_ids" colspan="4" nolabel="1">
+	                            <tree string="Lots Number" editable="bottom">
+	                                <field name="name" string="Lots"/>
+	                                <field name="quantity" />
+	                            </tree>
+	                            <form string="Lots Number">
+	                                <field name="name" string="Lots"/>
+	                                <field name="quantity" />
+	                            </form>
+	                        </field>
+	                    </group>
+	                    <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
+	                        <field name="line_exist_ids" colspan="4" nolabel="1">
+	                            <tree string="Lots Number" editable="bottom">
+	                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
+	                                <field name="quantity" />
+	                            </tree>
+	                            <form string="Lots Number">
+	                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
+	                                <field name="quantity" />
+	                            </form>
+	                        </field>
+	                    </group>
+	                    <separator string="" colspan="4" />
+	                    <label string="" colspan="2" />
+	                    <button icon='gtk-cancel' special="cancel"
+	                        string="Cancel" />
+	                    <button name="split_lot" string="Ok"
+	                        type="object" icon="gtk-ok" />
+                    </group>
+                </form>
+            </field>
+        </record> 
+		
 		<record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
             <field name="name">Split inventory lines</field>
             <field name="type">ir.actions.act_window</field>

From f2697b4668b469b4f7e21f8fb1f9a2980aad3f83 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 8 Jul 2010 09:03:27 +0200
Subject: [PATCH 13/57] [IMP] account reports

bzr revid: nel@tinyerp.com-20100708070327-jwqefgjvzfpndntw
---
 .../report/account_entries_report_view.xml    | 58 ++++++++++++-------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 184b087ce95..927bba3e228 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -50,36 +50,42 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group colspan="10" col="12">
-                    <filter string="Income" name="profit" icon="terp-document-new" domain="[('user_type.report_type','=','income')]"/>
-                    <filter string="Expense" name="loss" icon="terp-document-new" domain="[('user_type.report_type','=','expense')]"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Asset" name="asset" icon="terp-document-new" domain="[('user_type.report_type','=','asset')]"/>
-                    <filter string="Liability" name="liability" icon="terp-document-new" domain="[('user_type.report_type','=','liability')]"/>
-                    <filter string="Receivable" name="asset" icon="terp-document-new" domain="[('type','=','receivable')]"/>
-                    <filter string="Payable" name="asset" icon="terp-document-new" domain="[('type','=','payable')]"/>
+                <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="Tasks performed 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="Tasks performed 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="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft entries"/>
                     <filter string="Posted" icon="terp-camera_test" domain="[('state','=','posted')]" help = "Posted entries"/>
                     <separator orientation="vertical"/>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
                     <field name="account_id"/>
-                    <field name="analytic_account_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" name="group_account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
-                    <filter string="Fiscal Year" icon="terp-go-month" context="{'group_by':'fiscalyear_id'}"/>
-                    <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
+                    <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic" name="analytic_account" icon="terp-folder-orange" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
                     <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic" name="analytic_account" icon="terp-folder-orange" context="{'group_by':'analytic_account_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
+                    <filter string="Fiscal Year" icon="terp-go-month" context="{'group_by':'fiscalyear_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'date'}"/>
@@ -88,12 +94,20 @@
                  </group>
                  <newline/>
                  <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="journal_id"/>
+                    <field name="fiscalyear_id"/>
+                    <field name="period_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="analytic_account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
                     <field name="date"/>
                     <field name="date_created"/>
                     <field name="date_maturity"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id" />
-                    <field name="partner_id" />
                  </group>
             </search>
         </field>
@@ -103,7 +117,7 @@
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_profit': 1,'search_default_group_journal':1,'search_default_group_period': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
     <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
 </data>

From 6fa56c71ced80f4ba4c59d3fbac5df9c95e94483 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 8 Jul 2010 09:24:57 +0200
Subject: [PATCH 14/57] [IMP] account: only layout of invoice..

bzr revid: nel@tinyerp.com-20100708072457-gaqwv8ozj92v8jyo
---
 addons/account/report/account_invoice_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index f4956939fce..b947f9d5f6a 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -84,7 +84,7 @@
                             help = "Done Invoices"/>
                   <separator orientation="vertical"/>
                   <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
+                    <field name="user_id" >
                     <filter icon="terp-dolar"
                             string="My Invoices"
                             help="My Invoices"
@@ -107,7 +107,7 @@
                     <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>

From 18b192d660e6edacb422f94634ca084fd3636d2c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 8 Jul 2010 13:09:11 +0530
Subject: [PATCH 15/57] [FIX] sale_order_dates

bzr revid: mra@mra-laptop-20100708073911-3ug33sby6w1dc0uz
---
 addons/sale_order_dates/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_order_dates/__init__.py b/addons/sale_order_dates/__init__.py
index ed4a8b0a952..cca0e2251db 100644
--- a/addons/sale_order_dates/__init__.py
+++ b/addons/sale_order_dates/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import sale 
+import sale_order_dates
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 94f2d94b2a3230ec5c2012d527074bd9229d9728 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 13:15:13 +0530
Subject: [PATCH 16/57] [FIX] wiki

bzr revid: hmo@tinyerp.com-20100708074513-dzvu4cny40j4uci8
---
 addons/wiki/__openerp__.py       | 4 ++--
 addons/wiki/test/wiki_test00.yml | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 074c44b0a87..1b65dd4d92b 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -42,8 +42,8 @@ keep track for the wiki groups, pages, and history
         'data/wiki_main.xml',
         'security/ir.model.access.csv'
     ],
-    'demo_xml': ['test/wiki_test00.yml'],
-  #  'test': ['test/wiki_test00.yml'],
+    'demo_xml': [],
+    'test': ['test/wiki_test00.yml'],
     'installable': True,
     'active': False,
     'certificate': '0086363630317',
diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml
index 48cdacab11d..e53871ed277 100755
--- a/addons/wiki/test/wiki_test00.yml
+++ b/addons/wiki/test/wiki_test00.yml
@@ -21,11 +21,7 @@
       FAQs, quality manuals, technical references, etc.
 
       '
--
-    I Get Help on this current page by clicking on "Basic wiki Editing" wizard
--
-    !python {model: wiki.wiki}: |
-      self.open_wiki_page(cr, uid, [ref("wiki_wiki_openerpwikiediting0")], context)
+
 -
     I create Index on this current page by clicking on "Create Index" wizard
 -

From bd08622c73682792ecff702c2a7cf12261f21eca Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 8 Jul 2010 10:07:00 +0200
Subject: [PATCH 17/57] imp

bzr revid: fp@tinyerp.com-20100708080700-xu754jda31iecknc
---
 addons/base_setup/base_setup_todo.xml  |  2 +-
 addons/base_setup/gtk_contact_form.xml | 88 +++++++++++++-------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 0bf0fbb09be..ae7ae7f23c7 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
-        <field name="sequence">1</field>
+        <field name="sequence">3</field>
         <field name="restart">onskip</field>
     </record>
   </data>
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index fcbaa9867e7..f03d8f6cc9d 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -10,50 +10,50 @@
           <form position="attributes">
             <attribute name="string">Contact Information</attribute>
           </form>
-		  <xpath expr="//label[@string='description']" position="attributes">
-	            <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute>
-	      </xpath>
-	      <xpath expr='//separator[@string="title"]' position='attributes'>
-	          	  <attribute name='string'>Would you like more information or documentation ?</attribute>
-	          	  <attribute name='colspan'>4</attribute>
-	      </xpath>
-	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>22</attribute>
-	          	  <attribute name='string'></attribute>
-	      </xpath>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="title"]' position='attributes'>
+                    <attribute name='string'>Would you like more information or documentation ?</attribute>
+                    <attribute name='colspan'>4</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='rowspan'>22</attribute>
+                    <attribute name='string'></attribute>
+          </xpath>
           <group string="res_config_contents" position="replace">
-          	<group colspan="4" height="450" width="600">
-          	 	<group colspan="4">
- 		            <field name="ebook" nolabel="1"/>
-		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
-		            <field name="updates" nolabel="1"/>
-		            <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
-		       </group>
-          		<group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
-          		 	<separator colspan="4" string="About You"/>
-	            	<field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-	            	<field name="job" colspan="2"/>
-		            <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-		            <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-		            <field name="total_employees" colspan="2"/>
-		            <field name="industry" colspan="2"/>
-		        </group>
-		        <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
-		            <separator string="Your projects with OpenERP" colspan="4"/>
-		            <field name="use_openerp" align="0.0"  colspan="1"/>
-		            <field name="already_using_openerp" align="0.0"  colspan="1"/>
-		            <field name="sell_openerp" align="0.0"  colspan="1"/>
-		            <field name="already_selling__openerp" align="0.0" colspan="1"/>
-		            <separator colspan="4" string="You would like to know more about"/>
-		            <field name="features" align="0.0" colspan="1"/>
-		            <field name="training" align="0.0" colspan="1"/>
-		            <field name="saas" align="0.0" colspan="1"/>
-		            <field name="support" align="0.0" colspan="1"/>
-		            <field name="partners_program" align="0.0" colspan="1"/>
-		            <field name="other" align="0.0" colspan="1"/>
-		       </group>
-	       </group>
-	       </group>
+              <group colspan="4" height="450" width="600">
+                   <group colspan="4">
+                     <field name="ebook" nolabel="1"/>
+                    <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
+                    <field name="updates" nolabel="1"/>
+                    <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
+               </group>
+                  <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
+                       <separator colspan="4" string="About You"/>
+                    <field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
+                    <field name="job" colspan="2"/>
+                    <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
+                    <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
+                    <field name="total_employees" colspan="2"/>
+                    <field name="industry" colspan="2"/>
+                </group>
+                <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
+                    <separator string="Your projects with OpenERP" colspan="4"/>
+                    <field name="use_openerp" align="0.0"  colspan="1"/>
+                    <field name="already_using_openerp" align="0.0"  colspan="1"/>
+                    <field name="sell_openerp" align="0.0"  colspan="1"/>
+                    <field name="already_selling__openerp" align="0.0" colspan="1"/>
+                    <separator colspan="4" string="You would like to know more about"/>
+                    <field name="features" align="0.0" colspan="1"/>
+                    <field name="training" align="0.0" colspan="1"/>
+                    <field name="saas" align="0.0" colspan="1"/>
+                    <field name="support" align="0.0" colspan="1"/>
+                    <field name="partners_program" align="0.0" colspan="1"/>
+                    <field name="other" align="0.0" colspan="1"/>
+               </group>
+           </group>
+           </group>
         </data>
       </field>
     </record>
@@ -70,7 +70,7 @@
 
     <record id="base_setup_contact_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_contact"/>
-        <field name="sequence">1</field>
+        <field name="sequence">5</field>
         <field name="restart">never</field>
     </record>
   </data>

From dbe6aa5f692e4d95f56d3c9a402e8d3765d43ede Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 13:54:08 +0530
Subject: [PATCH 18/57] [FIX] survey: small problem

bzr revid: hmo@tinyerp.com-20100708082408-yybh2nmrdw1p397e
---
 addons/survey/wizard/survey_selection.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 6477f110dc3..29eaddff164 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -67,11 +67,16 @@ class survey_name_wiz(osv.osv_memory):
         user_rec = user_obj.read(cr, uid, uid)
         for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
             if sur.state == 'open':
+                res = False
                 for i in group_id:
                     if i in user_rec['groups_id']:
-                        result.append((sur.id, sur.title))
+                        res = True
+                        break
                     elif sur.id in user_rec['survey_id']:
-                        result.append((sur.id, sur.title))
+                        res = True
+                        break
+                if res:
+                    result.append((sur.id, sur.title))
         return result
 
     _columns = {

From d0a6aeebff76728a5f850b59cb87990b97cd3780 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 10:34:25 +0200
Subject: [PATCH 19/57] [FIX] report_intrastat: correct names for uom fields -
 to be checked!

bzr revid: odo@openerp.com-20100708083425-kk3xsz8oz1obcl1l
---
 addons/report_intrastat/report_intrastat.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 3bf58ea034e..532bede5ac3 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -88,26 +88,12 @@ class report_intrastat(osv.osv):
                             else 0
                         end) as value,
                     sum(
-                        case when uom.category_id != puom.category_id then pt.weight_net * inv_line.quantity
-                        else
-                            case when uom.factor_inv_data > 0
-                                then
-                                    pt.weight_net * inv_line.quantity * uom.factor_inv_data
-                                else
-                                    pt.weight_net * inv_line.quantity / uom.factor
-                            end
-                        end
+                        case when uom.category_id != puom.category_id then (pt.weight_net * inv_line.quantity)
+                        else (pt.weight_net * inv_line.quantity * uom.factor) end
                     ) as weight,
                     sum(
                         case when uom.category_id != puom.category_id then inv_line.quantity
-                        else
-                            case when uom.factor_inv_data > 0
-                                then
-                                    inv_line.quantity * uom.factor_inv_data
-                                else
-                                    inv_line.quantity / uom.factor
-                            end
-                        end
+                        else (inv_line.quantity * uom.factor) end
                     ) as supply_units,
 
                     inv.currency_id as currency_id,

From ebcb4b9c01f067208b7ede24ee6b6fc413f9f870 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 10:43:51 +0200
Subject: [PATCH 20/57] [IMP] project_long_term: use xml_id to retrieve 'hour'
 uom instead of name search

bzr revid: odo@openerp.com-20100708084351-acqc02wodltguooa
---
 addons/project_long_term/project_long_term.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4520e798f4e..a6fbcb22ab7 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -137,6 +137,7 @@ class project_phase(osv.osv):
        """
        uom_obj = self.pool.get('product.uom')
        resource_obj = self.pool.get('resource.resource')
+       model_data_obj = self.pool.get('ir.model.data')
        cal_obj = self.pool.get('resource.calendar')
        calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
        resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)])
@@ -146,7 +147,7 @@ class project_phase(osv.osv):
             cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
             if cal_id:
                 calendar_id = cal_id
-       default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')], context=context)[0]
+       default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
        work_times = cal_obj.interval_min_get(cr, uid, calendar_id, date_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
        dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
@@ -159,6 +160,7 @@ class project_phase(osv.osv):
        Check And Compute date_end of phase if change in date_end > older time.
        """
        uom_obj = self.pool.get('product.uom')
+       model_data_obj = self.pool.get('ir.model.data')
        resource_obj = self.pool.get('resource.resource')
        cal_obj = self.pool.get('resource.calendar')
        calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
@@ -169,7 +171,7 @@ class project_phase(osv.osv):
             cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
             if cal_id:
                 calendar_id = cal_id
-       default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')], context=context)[0]
+       default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
        work_times = cal_obj.interval_get(cr, uid, calendar_id, date_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
        dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
@@ -179,6 +181,7 @@ class project_phase(osv.osv):
         resource_calendar_obj = self.pool.get('resource.calendar')
         resource_obj = self.pool.get('resource.resource')
         uom_obj = self.pool.get('product.uom')
+        model_data_obj = self.pool.get('ir.model.data')
         if context is None:
             context = {}
         if context.get('scheduler',False):
@@ -192,7 +195,7 @@ class project_phase(osv.osv):
                 cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
                 if cal_id:
                     calendar_id = cal_id
-        default_uom_id = uom_obj.search(cr, uid, [('name', '=', 'Hour')])[0]
+        default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
         avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
 
         # Change the date_start and date_end

From 55ab60a2671ccb3453606b2b8b5c6dfbc2255d0a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 10:51:38 +0200
Subject: [PATCH 21/57] [IMP] project_long_term: use xml_id to retrieve 'hour'
 uom instead of name search

bzr revid: odo@openerp.com-20100708085138-01oys0qljcc87vtc
---
 addons/project_long_term/wizard/project_compute_phases.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 3b4ac2d7b23..3ee15bc6c5a 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -60,6 +60,7 @@ class project_compute_phases(osv.osv_memory):
        phase_obj = self.pool.get('project.phase')
        resource_obj = self.pool.get('resource.resource')
        uom_obj = self.pool.get('product.uom')
+       model_data_obj = self.pool.get('ir.model.data')
        phase_resource_obj = False
 
        if context is None:
@@ -81,7 +82,7 @@ class project_compute_phases(osv.osv_memory):
                                                 'vacation': tuple(leaves),
                                                 'efficiency': time_efficiency
                                                 })
-            default_uom_id = uom_obj.search(cr, uid, [('name','=','Hour')])[0]
+            default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
             avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
             duration = str(avg_hours) + 'H'
             # Create a new project for each phase

From fdcfc717a9062223db347acb5542704bb2408c59 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 14:30:51 +0530
Subject: [PATCH 22/57] [IMP]base_report_creator: search view

bzr revid: hmo@tinyerp.com-20100708090051-qfav67lqraopjak1
---
 addons/base_report_creator/base_report_creator_view.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index d2116171c07..8752a573725 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -126,12 +126,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
         <search string="Report">
-            <field name="name"></field>
-            <newline/>
-            <group expand="0" string="Group By...">
-                <filter string="Report Name" icon="terp-personal" domain="[]"
-                            context="{'group_by':'name'}" />
-            </group>
+            <field name="name"></field>            
         </search>
         </field>
     </record>

From ec460a76eb087dde4a53e5512fad51c692ab64a1 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 15:18:42 +0530
Subject: [PATCH 23/57] [IMP]:account:Corrected Invoice Analysis SQL report.

bzr revid: apa@tinyerp.com-20100708094842-3a807noial4th9fz
---
 .../account/report/account_invoice_report.py  | 155 +++++++++---------
 1 file changed, 77 insertions(+), 78 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 43c8344f110..c15c2e670e3 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -77,84 +77,83 @@ class account_invoice_report(osv.osv):
         tools.drop_view_if_exists(cr, 'account_invoice_report')
         cr.execute("""
             create or replace view account_invoice_report as (
-                 select
-                     min(l.id) as id,
-                     s.date_invoice as date,
-                     to_char(s.date_invoice, 'YYYY') as year,
-                     to_char(s.date_invoice, 'MM') as month,
-                     to_char(s.date_invoice, 'YYYY-MM-DD') as day,
-                     l.product_id as product_id,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             l.quantity * u.factor * -1
-                         else
-                             l.quantity * u.factor
-                         end) as product_qty,
-                     s.partner_id as partner_id,
-                     s.reconciled::integer,
-                     s.payment_term as payment_term,
-                     s.period_id as period_id,
-                     u.name as uom_name,
-                     s.currency_id as currency_id,
-                     s.journal_id as journal_id,
-                     s.fiscal_position as fiscal_position,
-                     s.user_id as user_id,
-                     s.company_id as company_id,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             l.quantity*l.price_unit * -1
-                         else
-                             l.quantity*l.price_unit
-                         end) as price_total,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             l.quantity*l.price_unit * -1
-                         else
-                             l.quantity*l.price_unit
-                         end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average,
-                     count(*) as nbr,
-                     s.type as type,
-                     s.state,
-                     pt.categ_id,
-                     s.date_due as date_due,
-                     s.address_contact_id as address_contact_id,
-                     s.address_invoice_id as address_invoice_id,
-                     s.account_id as account_id,
-                     s.partner_bank as partner_bank,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             s.residual * -1
-                         else
-                             s.residual
-                         end) as residual,
-                     case when s.state != 'paid' then null else
-                     extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
-                     end as delay_to_pay
-                 from account_invoice_line l
-                 left join account_invoice s on (s.id=l.invoice_id)
-                 left join product_template pt on (pt.id=l.product_id)
-                 left join product_uom u on (u.id=l.uos_id),
-                 account_move_line am left join account_invoice i on (i.move_id=am.move_id)
-                 where am.account_id=i.account_id
-                 group by
-                     s.type,
-                     s.date_invoice,
-                     s.partner_id,
-                     l.product_id,
-                     u.name,
-                     l.uos_id,
-                     s.reconciled,
-                     s.user_id,
-                     s.state,
-                     s.residual,
-                     pt.categ_id,
-                     s.company_id,
-                     s.payment_term,
-                     s.period_id,
-                     s.fiscal_position,
-                     s.currency_id,
-                     s.journal_id,
-                     s.date_due,
-                     s.address_contact_id,
-                     s.address_invoice_id,
-                     s.account_id,
-                     s.partner_bank
+                 select min(ail.id) as id,
+                    ai.date_invoice as date,
+                    to_char(ai.date_invoice, 'YYYY') as year,
+                    to_char(ai.date_invoice, 'MM') as month,
+                    to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
+                    ail.product_id,
+                    ai.partner_id as partner_id,
+                    ai.reconciled::integer,
+                    ai.payment_term as payment_term,
+                    ai.period_id as period_id,
+                    u.name as uom_name,
+                    ai.currency_id as currency_id,
+                    ai.journal_id as journal_id,
+                    ai.fiscal_position as fiscal_position,
+                    ai.user_id as user_id,
+                    ai.company_id as company_id,
+                    count(ail.*) as nbr,
+                    ai.type as type,
+                    ai.state,
+                    pt.categ_id,
+                    ai.date_due as date_due,
+                    ai.address_contact_id as address_contact_id,
+                    ai.address_invoice_id as address_invoice_id,
+                    ai.account_id as account_id,
+                    ai.partner_bank as partner_bank,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ail.quantity * u.factor * -1
+                        else
+                         ail.quantity * u.factor
+                        end) as product_qty,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ail.quantity*ail.price_unit * -1
+                        else
+                         ail.quantity*ail.price_unit
+                        end) as price_total,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ail.quantity*ail.price_unit * -1
+                        else
+                         ail.quantity*ail.price_unit
+                        end) / sum(ail.quantity * u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
+                    sum((select extract(epoch from avg(aml.date_created-l.create_date))/(24*60*60)::decimal(16,2)
+                        from account_move_line as aml
+                        left join account_invoice as a ON (a.move_id=aml.move_id)
+                        left join account_invoice_line as l ON (a.id=l.invoice_id)
+                        where a.id=ai.id)) as delay_to_pay,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ai.residual * -1
+                        else
+                         ai.residual
+                        end) as residual
+                from account_invoice_line as ail
+                left join account_invoice as ai ON (ai.id=ail.invoice_id)
+                left join product_template pt on (pt.id=ail.product_id)
+                left join product_uom u on (u.id=ail.uos_id)
+                group by ail.product_id,
+                    ai.date_invoice,
+                    to_char(ai.date_invoice, 'YYYY'),
+                    to_char(ai.date_invoice, 'MM'),
+                    to_char(ai.date_invoice, 'YYYY-MM-DD'),
+                    ai.partner_id,
+                    ai.reconciled,
+                    ai.payment_term,
+                    ai.period_id,
+                    u.name,
+                    ai.currency_id,
+                    ai.journal_id,
+                    ai.fiscal_position,
+                    ai.user_id,
+                    ai.company_id,
+                    ai.type,
+                    ai.state,
+                    pt.categ_id,
+                    ai.date_due,
+                    ai.address_contact_id,
+                    ai.address_invoice_id,
+                    ai.account_id,
+                    ai.partner_bank
             )
         """)
 account_invoice_report()

From 9ada619c371d37f128db59676101d44f26c8e7c0 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 15:44:24 +0530
Subject: [PATCH 24/57] [IMP] set logger messages

bzr revid: hmo@tinyerp.com-20100708101424-hgbmoqco3to16jer
---
 addons/crm/crm_lead.py                        | 11 ++++++-
 addons/crm/crm_opportunity.py                 |  6 ++++
 addons/crm/wizard/crm_lead_to_opportunity.py  |  4 ++-
 addons/hr_recruitment/hr_recruitment.py       | 30 +++++++++++++++++++
 addons/mrp/mrp.py                             |  8 +++--
 addons/mrp/procurement.py                     |  5 +++-
 addons/procurement/procurement.py             |  8 ++++-
 addons/project/project.py                     | 15 ++++++++++
 .../project/wizard/project_task_delegate.py   |  6 +++-
 addons/project_issue/project_issue.py         | 20 +++++++++++++
 addons/sale_crm/wizard/crm_make_sale.py       |  4 ++-
 addons/scrum/scrum.py                         | 11 +++++++
 addons/scrum/wizard/scrum_backlog_sprint.py   | 11 +++++--
 addons/stock/stock.py                         | 12 ++++++--
 14 files changed, 139 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bf6d391ab82..6708f3e8f0e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -168,6 +168,9 @@ and users"),
         """
         res = super(crm_lead, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Lead ') + " '" + name + "' "+ _("is Open.")
+            self.log(cr, uid, id, message)
         return res
 
     def case_close(self, cr, uid, ids, *args):
@@ -180,6 +183,9 @@ and users"),
         """
         res = super(crm_lead, self).case_close(cr, uid, ids, args)
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Lead ') + " '" + name + "' "+ _("is Closed.")
+            self.log(cr, uid, id, message)
         return res
 
     def convert_opportunity(self, cr, uid, ids, context=None):
@@ -276,7 +282,10 @@ and users"),
             vals.update(res)
 
         res = self.create(cr, uid, vals, context)
-
+        
+        message = _('A Lead created') + " '" + subject + "' " + _("from Mailgate.")
+        self.log(cr, uid, res, message)
+        
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 4faebe37d91..e13a428138a 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -65,6 +65,9 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
         self.write(cr, uid, ids, {'probability' : 100.0, 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Opportunity ') + " '" + name + "' "+ _("is Won.")
+            self.log(cr, uid, id, message)
         return res
 
     def case_cancel(self, cr, uid, ids, *args):
@@ -77,6 +80,9 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_cancel(cr, uid, ids, args)
         self.write(cr, uid, ids, {'probability' : 0.0})
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Opportunity ') + " '" + name + "' "+ _("is Lost.")
+            self.log(cr, uid, id, message)
         return res
     
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index a77f553b173..7f47e27a4ff 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -86,7 +86,8 @@ class crm_lead2opportunity(osv.osv_memory):
             if lead.partner_id:
                 msg_ids = [ x.id for x in lead.message_ids]
                 self.pool.get('mailgate.message').write(cr, uid, msg_ids, {'partner_id': lead.partner_id.id}, context=context)
-
+            message = _('Lead ') + " '" + lead.name + "' "+ _("is converted to Opportunity.")
+            self.log(cr, uid, lead.id, message)
         value = {
             'name': _('Opportunity'), 
             'view_type': 'form', 
@@ -99,6 +100,7 @@ class crm_lead2opportunity(osv.osv_memory):
             'type': 'ir.actions.act_window', 
             'search_view_id': res['res_id']
         }
+        
         return value
 
     _columns = {
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 09ad521d24b..2845768f59c 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -277,6 +277,8 @@ class hr_applicant(osv.osv, crm.crm_case):
             vals.update(res)
         res = self.create(cr, uid, vals, context)
         
+        message = _('A Job Request created') + " '" + subject + "' " + _("from Mailgate.")
+        self.log(cr, uid, res, message)
         
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
@@ -338,6 +340,34 @@ class hr_applicant(osv.osv, crm.crm_case):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
+    
+    def case_open(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+        res = super(hr_applicant, self).case_open(cr, uid, ids, *args)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Job request for') + " '" + name + "' "+ _("is Open.")
+            self.log(cr, uid, id, message)
+        return res
+
+    def case_close(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+        res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Applicant ') + " '" + name + "' "+ _("is Hired.")
+            self.log(cr, uid, id, message)
+        return res
 
 hr_applicant()
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f3731bb59bb..13ded3a9694 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -757,9 +757,11 @@ class mrp_production(osv.osv):
                     new_parent_ids.append(final_product.id)
             for new_parent_id in new_parent_ids:
                 stock_mov_obj.write(cr, uid, [raw_product.id], {'move_history_ids': [(4,new_parent_id)]})
-
+        
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr)
+        message = _('Manufacturing order ') + " '" + production.name + "' "+ _("is finished.")
+        self.log(cr, uid, production_id, message)
         return True
 
     def _costs_generate(self, cr, uid, production):
@@ -925,9 +927,11 @@ class mrp_production(osv.osv):
                     'company_id': production.company_id.id,
                 })
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
-                proc_ids.append(proc_id)
+                proc_ids.append(proc_id)                
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
             self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
+            message = _('Manufacturing order ') + " '" + production.name + "' "+ _("is confirmed.")
+            self.log(cr, uid, production.id, message)
         return picking_id
 
     def force_production(self, cr, uid, ids, *args):
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 8bfefc9ceef..50a976c741a 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -40,8 +40,11 @@ class procurement_order(osv.osv):
         """
         properties = [x.id for x in procurement.property_ids]
         bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
-        if not bom_id:
+        if not bom_id:            
             cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
+            for (id, name) in self.name_get(cr, uid, procurement.id):
+                message = _('Procurement ') + " '" + name + "' "+ _("has an exception.") + _('No BoM defined for this product !')
+                self.log(cr, uid, id, message)
             return False
         return True
     
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index b716650ed5a..b098d279d78 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -331,6 +331,8 @@ class procurement_order(osv.osv):
                     })
                     move_obj.action_confirm(cr, uid, [id], context=context)
                     self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
+                    message = _('Procurement ') + " '" + procurement.name + "' "+ _("is running.")
+                    self.log(cr, uid, procurement.id, message)
         self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
         return True
 
@@ -355,8 +357,10 @@ class procurement_order(osv.osv):
             if not (procurement.move_id.state in ('done','assigned','cancel')):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
-                if not cr.fetchone()[0]:
+                if not cr.fetchone()[0]:                    
                     cr.execute('update procurement_order set message=%s where id=%s', (_('Not enough stock and no minimum orderpoint rule defined.'), procurement.id))
+                    message = _('Procurement ') + " '" + procurement.name + "' "+ _("has an exception.") + _('Not enough stock and no minimum orderpoint rule defined.')
+                    self.log(cr, uid, procurement.id, message)
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context={}):
@@ -434,6 +438,8 @@ class procurement_order(osv.osv):
             if procurement.move_id:
                 if procurement.close_move and (procurement.move_id.state <> 'done'):
                     move_obj.action_done(cr, uid, [procurement.move_id.id])
+                    message = _('Procurement ') + " '" + procurement.name + "' "+ _("is done.")
+                    self.log(cr, uid, procurement.id, message)
         res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
diff --git a/addons/project/project.py b/addons/project/project.py
index 169a2043b20..0d62929416e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -174,6 +174,9 @@ class project(osv.osv):
 
     def set_done(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'close'}, context=context)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Project ') + " '" + name + "' "+ _("is Closed.")
+            self.log(cr, uid, id, message)
         return True
 
     def set_cancel(self, cr, uid, ids, context=None):
@@ -190,6 +193,9 @@ class project(osv.osv):
 
     def reset_project(self, cr, uid, ids, context=None):
         res = self.setActive(cr, uid, ids, value=True, context=context)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Project ') + " '" + name + "' "+ _("is Open.")
+            self.log(cr, uid, id, message)
         return res
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -434,6 +440,8 @@ class task(osv.osv):
                 elif project.warn_manager:
                     task_id = ids[0]
                     mail_send = True
+            message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
+            self.log(cr, uid, task.id, message)
             self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
             for parent_id in task.parent_ids:
                 if parent_id.state in ('pending','draft'):
@@ -494,6 +502,8 @@ class task(osv.osv):
                     'ref_doc1': 'project.task,%d' % task.id,
                     'ref_doc2': 'project.project,%d' % project.id,
                 })
+            message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
+            self.log(cr, uid, task.id, message)
             self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
         return True
 
@@ -501,6 +511,8 @@ class task(osv.osv):
         tasks= self.browse(cr,uid,ids)
         for t in tasks:
             self.write(cr, uid, [t.id], {'state': 'open'})
+            message = _('Task ') + " '" + t.name + "' "+ _("is Open.")
+            self.log(cr, uid, t.id, message)
         return True
 
     def do_draft(self, cr, uid, ids, *args):
@@ -510,6 +522,9 @@ class task(osv.osv):
 
     def do_pending(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'pending'})
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Task ') + " '" + name + "' "+ _("is Pending.")
+            self.log(cr, uid, id, message)
         return True
 
     def next_type(self, cr, uid, ids, *args):
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 30fc02f9ca3..779909273df 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -82,12 +82,13 @@ class project_task_delegate(osv.osv_memory):
        'prefix': _get_prefix,
        'new_task_description': _get_new_desc,
        'state': 'pending',
-               }
+    }
 
     def validate(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         task_obj = self.pool.get('project.task')
+        user_obj = self.pool.get('res.users')
         delegate_data = self.read(cr, uid, ids, context=context)[0]
         task = task_obj.browse(cr, uid, context['active_id'], context=context)
         newname = delegate_data['prefix'] or ''
@@ -111,6 +112,9 @@ class project_task_delegate(osv.osv_memory):
             task_obj.do_pending(cr, uid, [task.id])
         else:
             task_obj.do_close(cr, uid, [task.id])
+        delegrate_user = user_obj.browse(cr, uid, delegate_data['user_id'], context=context)
+        message = _('Task ') + " '" + delegate_data['name'] + "' "+ _("is Delegated to User:") +" '"+ delegrate_user.name +"' "
+        self.log(cr, uid, task.id, message)
         return {}
 
 project_task_delegate()
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f13f816b4ca..a67ca004f09 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -52,8 +52,26 @@ class project_issue(osv.osv, crm.crm_case):
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Issue ') + " '" + name + "' "+ _("is Open.")
+            self.log(cr, uid, id, message)
         return res
 
+    def case_close(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
+        res = super(project_issue, self).case_close(cr, uid, ids, *args)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Issue ') + " '" + name + "' "+ _("is Closed.")
+            self.log(cr, uid, id, message)
+        return res
+    
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         if context is None:
             context = {}
@@ -319,6 +337,8 @@ class project_issue(osv.osv, crm.crm_case):
         if res:
             vals.update(res)
         res = self.create(cr, uid, vals, context)
+        message = _('An Issue created') + " '" + subject + "' " + _("from Mailgate.")
+        self.log(cr, uid, res, message)
         self.convert_to_bug(cr, uid, [res], context=context)
 
         attachents = msg.get('attachments', [])
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index ca0230b1ddf..e54d5d2a374 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -98,7 +98,7 @@ class crm_make_sale(osv.osv_memory):
                     raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
     
                 vals = {
-                    'origin': 'CRM-Opportunity:%s' % str(case.id),
+                    'origin': 'Opportunity:%s' % str(case.id),
                     'section_id': case.section_id and case.section_id.id or False,
                     'picking_policy': make.picking_policy,
                     'shop_id': make.shop_id.id,
@@ -129,6 +129,8 @@ class crm_make_sale(osv.osv_memory):
     
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
+                message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Sales Quotation.")
+                self.log(cr, uid, case.id, message)
     
             if make.close:
                 case_obj.case_close(cr, uid, data)
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 614ef493e96..d4434968c51 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -92,10 +92,16 @@ class scrum_sprint(osv.osv):
 
     def button_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Sprint ') + " '" + name + "' "+ _("is Open.")
+            self.log(cr, uid, id, message)
         return True
 
     def button_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'done'}, context=context)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Sprint ') + " '" + name + "' "+ _("is Closed.")
+            self.log(cr, uid, id, message)
         return True
 
     def button_pending(self, cr, uid, ids, context={}):
@@ -205,12 +211,17 @@ class scrum_product_backlog(osv.osv):
 
     def button_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('Product Backlog ') + " '" + name + "' "+ _("is Open.")
+            self.log(cr, uid, id, message)
         return True
 
     def button_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'done'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
             self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
+            message = _('Product Backlog ') + " '" + backlog.name + "' "+ _("is Closed.")
+            self.log(cr, uid, backlog.id, message)
         return True
 
     def button_pending(self, cr, uid, ids, context={}):
diff --git a/addons/scrum/wizard/scrum_backlog_sprint.py b/addons/scrum/wizard/scrum_backlog_sprint.py
index 108e5a48cc3..308ac75795e 100644
--- a/addons/scrum/wizard/scrum_backlog_sprint.py
+++ b/addons/scrum/wizard/scrum_backlog_sprint.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 from osv import osv, fields
+from tools.translate import _
 
 class backlog_sprint_assign(osv.osv_memory):
     _name = 'backlog.assign.sprint'
@@ -35,6 +36,7 @@ class backlog_sprint_assign(osv.osv_memory):
 
     def assign_sprint(self, cr, uid, ids, context=None):
         backlog_obj = self.pool.get('scrum.product.backlog')
+        sprint_obj = self.pool.get('scrum.sprint')
         task = self.pool.get('project.task')
         backlog_ids = []
         if context is None:
@@ -43,7 +45,7 @@ class backlog_sprint_assign(osv.osv_memory):
         for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
             backlog_ids.append(backlog.id)
             if data['convert_to_task']:
-                task.create(cr, uid, {
+                task_id = task.create(cr, uid, {
                     'product_backlog_id': backlog.id,
                     'name': backlog.name,
                     'description': backlog.note,
@@ -52,11 +54,16 @@ class backlog_sprint_assign(osv.osv_memory):
                     'planned_hours':backlog.expected_hours,
                     'remaining_hours':backlog.expected_hours,
                 })
+                message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is converted into Task %d."%(task_id,))
+                self.log(cr, uid, backlog.id, message)
             if data['state_open'] and backlog.state == "draft":
                 backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
+            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context)
+            message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
+            self.log(cr, uid, backlog.id, message)
         backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
         return {}
 
 backlog_sprint_assign()
 
-# 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/stock/stock.py b/addons/stock/stock.py
index e0ab1101535..d44c327b699 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1843,7 +1843,9 @@ class stock_move(osv.osv):
                         'line_id': line,
                         'ref': move.picking_id and move.picking_id.name,
                         })
-
+            
+            message = _('Move line') + " '" + move.name + "' "+ _("is processed.")
+            self.log(cr, uid, move.id, message)
         # This can be removed
         #tracking_lot = False
         #if context:
@@ -1864,7 +1866,7 @@ class stock_move(osv.osv):
             wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
 
         for (id,name) in picking_obj.name_get(cr, uid, picking_ids):
-            message = _('Document') + " '" + name + "' "+ _("is processed")
+            message = _('Document') + " '" + name + "' "+ _("is processed.")
             self.log(cr, uid, id, message)
         return True
 
@@ -1938,6 +1940,8 @@ class stock_move(osv.osv):
             new_move = self.copy(cr, uid, move.id, default_val)
             #self.write(cr, uid, [new_move], {'move_history_ids':[(4,move.id)]}) #TODO : to track scrap moves
             res += [new_move]
+            message = _('Product ') + " '" + move.product_id.name + "' "+ _("is scraped with") + " '" + str(move.product_qty) + "' "+ _("quantity.")
+            self.log(cr, uid, move.id, message)
         self.action_done(cr, uid, res)
         return res
 
@@ -2064,6 +2068,8 @@ class stock_move(osv.osv):
                     }
 
                     self.write(cr, uid, [move.id], update_val)
+            message = _('Product ') + " '" + move.product_id.name + "' "+ _("is consumed with") + " '" + str(move.product_qty) + "' "+ _("quantity.")
+            self.log(cr, uid, move.id, message)
         self.action_done(cr, uid, res)
 
         return res
@@ -2261,6 +2267,8 @@ class stock_inventory(osv.osv):
                             'product_qty': line.product_qty
                         })
                     move_ids.append(self._inventory_line_hook(cr, uid, line, value))
+            message = _('Inventory') + " '" + inv.name + "' "+ _("is done.")
+            self.log(cr, uid, inv.id, message)
             self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
         return True
 

From 97da4468fccb9fcc5ff8a6bb85161512c4d10811 Mon Sep 17 00:00:00 2001
From: "ATUL (OpenERP)" <>
Date: Thu, 8 Jul 2010 15:50:32 +0530
Subject: [PATCH 25/57] [FIX] idea: yml issue

bzr revid: hmo@tinyerp.com-20100708102032-prqb40disa69gy97
---
 addons/idea/security/ir.model.access.csv |  1 +
 addons/idea/test/test_idea.yml           | 23 +++++------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index ba3b6fe4e3f..f9f665766e1 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -5,3 +5,4 @@
 "access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
 "access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
 "access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
+"access_idea_comment_user","idea.comment","model_idea_comment","base.group_user",1,1,1,0
diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index bcb764f8933..9646222cab4 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -44,9 +44,6 @@
   !record {model: res.users, id: res_users_user1}:
     company_id: base.main_company
     context_lang: en_US
-    groups_id:
-      - base.group_system
-      - base.group_user
     login: user2
     name: user2
     password: user2
@@ -54,16 +51,12 @@
 - |
   In order to post vote I connect as user1 and open the idea page
   I click on  "Submit Vote" wizard  button and vote the idea as "Normal"
--
-  !record {model: idea.post.vote, id: idea_post_vote_0}: 
-    vote: 50
     
-- |
-  Now I click on "Post" button of this wizard.     
 - 
   !python {model: idea.post.vote}: |
-    uid = ref('res_users_user0')    
-    self.do_vote(cr, uid, [ref("idea_post_vote_0")], {'active_ids': [ref('idea_idea_0')]})  
+    uid = ref('res_users_user0')
+    new_id = self.create(cr, uid, {'vote': 50}, {"active_ids": [ref("idea_idea_0")]})
+    self.do_vote(cr, uid, [new_id], {"active_ids": [ref("idea_idea_0")]})
     
 - |
   To add other vote I connect as user2 and open the idea page.
@@ -72,16 +65,11 @@
    
   and put comment "We can learn many things from technical presentation".
   
-- 
-  !record {model: idea.post.vote, id: idea_post_vote_1}: 
-    vote: 100
-    note: 'We can learn many things from technical presentation'
-- |
-  I click on "Post" button of this wizard.    
 -
   !python {model: idea.post.vote}: |
     uid = ref('res_users_user1')
-    self.do_vote(cr, uid, [ref("idea_post_vote_1")], {'active_ids': [ref('idea_idea_0')]})  
+    new_id = self.create(cr, uid, {'vote': 100, 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
+    self.do_vote(cr, uid, [new_id], {'active_ids': [ref('idea_idea_0')]})  
         
 - |
   I can see that the Average score changed in "Average score" field with value 75
@@ -99,4 +87,3 @@
 -
   !assert {model: idea.idea, id: idea_idea_0}: 
     - state == 'close'  
-    

From 3fefccfe51519d16c3ee460cbb75f356448e5687 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 15:59:52 +0530
Subject: [PATCH 26/57] [FIX] pos: yml issue

bzr revid: hmo@tinyerp.com-20100708102952-p891ytnsrukc24pa
---
 addons/point_of_sale/test/pos_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index a96a792c711..360c25b53a5 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -250,7 +250,7 @@
     country_id: base.in
     partner_id: res_partner_microlinktechnologies0
     street: Ash House, Ash Road
-    title: Ms.
+    title: base.res_partner_title_miss
 - 
   I create product category .
 - 

From 172cee237a705e8f1ad62d6961a157e25e6197a2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 8 Jul 2010 16:00:27 +0530
Subject: [PATCH 27/57] [REF]: claim_from_delivery: Code improvements

bzr revid: rpa@tinyerp.com-20100708103027-at59m943ytmnl5bq
---
 addons/claim_from_delivery/__init__.py         |  1 +
 addons/claim_from_delivery/__openerp__.py      |  3 ++-
 addons/claim_from_delivery/claim_delivery.py   |  6 +++++-
 .../claim_delivery_view.xml                    | 18 +++++-------------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
index b10828031a8..801c814fdf9 100644
--- a/addons/claim_from_delivery/__init__.py
+++ b/addons/claim_from_delivery/__init__.py
@@ -18,5 +18,6 @@
 #
 ##############################################################################
 import claim_delivery
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 86d357834ff..c530a5605fb 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Claim from delivery",
     "version" : "1.0",
     "author" : "Tiny",
-    "category" : "Enterprise Specific Modules/Food Industries",
+    "category" : "Generic Modules/Inventory Control",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
@@ -31,5 +31,6 @@
     "active": False,
     "installable": True
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/claim_from_delivery/claim_delivery.py b/addons/claim_from_delivery/claim_delivery.py
index 4e81a0a3067..67e6f0baae2 100644
--- a/addons/claim_from_delivery/claim_delivery.py
+++ b/addons/claim_from_delivery/claim_delivery.py
@@ -24,6 +24,10 @@ from osv import fields, osv
 class stock_picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
-        'partner_id': fields.related('address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
+        'partner_id': fields.related('address_id', 'partner_id', type='many2one', relation="res.partner", string="Partner"), 
         }
+
 stock_picking()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index 7fb68cc6348..d2fe510460d 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -14,19 +14,11 @@
             </field>
         </record>
 
-    <act_window
-      id="action_claim_from_delivery"
-            name="Claim"
-            domain="[]"
-            target="current"
-            view_mode="form"
-            res_model="crm.claim"
-            src_model="stock.picking"/>
-
-
-        <record id="action_claim_from_delivery" model="ir.actions.act_window">
-          <field name="context">{'default_partner_address_id': address_id, 'default_partner_id': partner_id}</field>
-        </record>
+        <act_window id="action_claim_from_delivery" name="Claim"
+            domain="[]" target="current"
+            context="{'default_partner_address_id': address_id, 'default_partner_id': partner_id}"
+            view_mode="form" res_model="crm.claim"
+            src_model="stock.picking" />
 
 	</data>
 </openerp>

From c7e161dcc5db9dfe4029c3314ba7fab8c555e4fb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 16:17:49 +0530
Subject: [PATCH 28/57] [FIX] mrp: small yml issue

bzr revid: hmo@tinyerp.com-20100708104749-qsqwr4ic10fjltwu
---
 addons/mrp/test/mrp_packs.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
index 309e3d2b200..ca3453f94e6 100644
--- a/addons/mrp/test/mrp_packs.yml
+++ b/addons/mrp/test/mrp_packs.yml
@@ -69,7 +69,7 @@
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: Pack of 24 Beers
-        product_id: mrp_bom_packofbeers0
+        product_id: product_product_packofbeers0
         product_qty: 2.0
         product_uom: product.product_uom_unit
     move_type: direct
@@ -83,12 +83,12 @@
         "active_id": ref("stock.menu_action_picking_tree"), }
     )
 - |
-  I check that my Picking of a "PAck of 24 beers" as been automatically
+  I check that my Picking of a "Pack of 24 beers" has 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: 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'))
-    - move_ids[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
+    - len(move_lines) == 2
+    - move_lines[0].product_id.id <> move_lines[1].product_id.id
+    - move_lines[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
+    - move_lines[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))

From 7c4179edd7b9c1ff47ddb6d1801941b5a296c8af Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 16:18:52 +0530
Subject: [PATCH 29/57] [FIX]:account:Invoice Analysis:residual amount problem

bzr revid: apa@tinyerp.com-20100708104852-hanh85h3znag8o01
---
 .../account/report/account_invoice_report.py  | 16 ++++++++-----
 .../report/account_invoice_report_view.xml    | 24 +++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index c15c2e670e3..b7fb9766bf1 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -122,17 +122,20 @@ class account_invoice_report(osv.osv):
                         left join account_invoice as a ON (a.move_id=aml.move_id)
                         left join account_invoice_line as l ON (a.id=l.invoice_id)
                         where a.id=ai.id)) as delay_to_pay,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ai.residual * -1
-                        else
-                         ai.residual
-                        end) as residual
+                    (case when ai.type in ('out_refund','in_invoice') then
+                      ai.residual * -1
+                    else
+                      ai.residual
+                    end)/(select count(l.*) from account_invoice_line as l
+                            left join account_invoice as a ON (a.id=l.invoice_id)
+                            where a.id=ai.id) as residual
                 from account_invoice_line as ail
                 left join account_invoice as ai ON (ai.id=ail.invoice_id)
                 left join product_template pt on (pt.id=ail.product_id)
                 left join product_uom u on (u.id=ail.uos_id)
                 group by ail.product_id,
                     ai.date_invoice,
+                    ai.id,
                     to_char(ai.date_invoice, 'YYYY'),
                     to_char(ai.date_invoice, 'MM'),
                     to_char(ai.date_invoice, 'YYYY-MM-DD'),
@@ -153,7 +156,8 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id,
                     ai.address_invoice_id,
                     ai.account_id,
-                    ai.partner_bank
+                    ai.partner_bank,
+                    ai.residual
             )
         """)
 account_invoice_report()
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b947f9d5f6a..ee9ee498365 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -32,7 +32,7 @@
                 <field name="reconciled"  sum="# Reconciled"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
-                <field name="residual"  sum="Total Residual"/>
+                <field name="residual"  sum="Total Residual" invisible="not context.get('residual_visible',False)"/>
                 <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
             </tree>
         </field>
@@ -93,24 +93,24 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id','residual_visible':True}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state','residual_visible':True}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type','residual_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id','residual_visible':True}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id','residual_visible':True}"/>
                     <separator orientation="vertical"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
-                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id','residual_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id','residual_visible':True}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day','residual_visible':True}"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month','residual_visible':True}"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year','residual_visible':True}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">

From 226922265836407792050b91ba196d41cb34a9a9 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 16:49:21 +0530
Subject: [PATCH 30/57] [REM]: remove unused class

bzr revid: mga@tinyerp.com-20100708111921-ljt97b156qyswfao
---
 .../account_voucher_payment.py                | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index a34a0859bfa..7bad021ba26 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -196,7 +196,8 @@ class account_voucher_line(osv.osv):
                 residual = currency_pool.compute(cr, uid, invoice.currency_id.id, currency_id, invoice.residual)
             
             res.update({
-                'amount': residual
+                'amount': residual,
+                'account_id': invoice.account_id.id
             })
             
         return {
@@ -231,21 +232,4 @@ class account_voucher_line(osv.osv):
         }
 account_voucher_line()
 
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-
-    def action_cancel(self, cr, uid, ids, *args):
-        res = super(account_invoice, self).action_cancel(cr, uid, ids, *args)
-        invoices = self.read(cr, uid, ids, ['move_id'])
-        voucher_db = self.pool.get('account.voucher')
-        voucher_ids = voucher_db.search(cr, uid, [])
-        voucher_obj = voucher_db.browse(cr, uid, voucher_ids)
-        move_db = self.pool.get('account.move')
-        move_ids = move_db.search(cr, uid, [])
-        move_obj = move_db.browse(cr, uid, move_ids)
-        return res
-
-account_invoice()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 522877859d6207de4f2a5a5c5187803bd28ed5d5 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 16:49:50 +0530
Subject: [PATCH 31/57] [IMP]: improve voucher unreconcile process

bzr revid: mga@tinyerp.com-20100708111950-6xj9bjjfh5428rt1
---
 .../wizard/account_voucher_unreconcile.py     | 20 +++++++++++++++++--
 .../account_voucher_unreconcile_view.xml      |  2 ++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
index f91ee20925f..2bfffb372b7 100644
--- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
@@ -18,19 +18,31 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+
+import netsvc
+from osv import osv
+from osv import fields
 
 class account_voucher_unreconcile(osv.osv_memory):
     _name = "account.voucher.unreconcile"
     _description = "Account voucher unreconcile"
     
+    _columns = {
+        'remove':fields.boolean('Want to remove accounting entries too ?', required=False),
+    }
+    
+    _defaults = {
+        'remove': lambda *a: True,
+    }
+    
     def trans_unrec(self, cr, uid, ids, context=None):
+        res = self.browse(cr, uid, ids[0])
         if context is None:
             context = {}
         voucher_pool = self.pool.get('account.voucher')
         reconcile_pool = self.pool.get('account.move.reconcile')
         if context.get('active_id'):
-            voucher = obj_voucher.browse(cr, uid, context.get('active_id'), context=context)
+            voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context)
             recs = []
             for line in voucher.move_ids:
                 if line.reconcile_id:
@@ -39,6 +51,10 @@ class account_voucher_unreconcile(osv.osv_memory):
             for rec in recs:
                 obj_reconcile.unlink(cr, uid, rec)
             
+            if res.remove:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
+            
         return {}
 
 account_voucher_unreconcile()
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
index 138aaec586f..3f8dd9c4e32 100644
--- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
@@ -11,6 +11,8 @@
                 <separator colspan="4" string="Unreconciliation transactions" />
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
                 <separator colspan="4"/>
+                <field name="remove"/>
+                <separator colspan="4"/>
                 <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                 <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
              </form>

From 4c5a6925499a6db20a662344878c6c6d6faac8eb Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 16:50:26 +0530
Subject: [PATCH 32/57] [IMP]: better view for the voucher

bzr revid: mga@tinyerp.com-20100708112026-260b1urwt19csacy
---
 addons/account_voucher/voucher_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 9f9ce13276c..1d9d1e6a8d0 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -58,7 +58,7 @@
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
                     </notebook>
-                    <group col="8" colspan="4">
+                    <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="open_voucher" string="Pro-forma" states="draft" icon="terp-check"/>
                         <button name="proforma_voucher" string="Create" states="proforma" icon="terp-document-new"/>

From e4b838f31add92e7ac53d299ce87ee4b6205f73f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 16:50:54 +0530
Subject: [PATCH 33/57] [IMP]: improve journal view

bzr revid: mga@tinyerp.com-20100708112054-pzrrn4x001c9nmdd
---
 addons/account/account_view.xml | 65 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c96fb9fe8c7..6ef38dde583 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -330,53 +330,50 @@
             <field name="arch" type="xml">
                 <form string="Account Journal">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="type" on_change="onchange_type(type)"/>
-                        <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <group colspan="2" col="2">
-                                <separator string="Journal View" colspan="4"/>
-                                <field name="view_id" widget="selection"/>
+                            <group col="2" colspan="2">
+                                <group colspan="2" col="2">
+                                    <separator string="Accounts" colspan="4"/>
+                                    <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Journal View" colspan="4"/>
+                                    <field name="view_id" widget="selection"/>
+                                </group>
                             </group>
-
-                            <group colspan="2" col="2">
-                                <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id"/>
-                            </group>
-
-                            <group colspan="2" col="2">
-                                <separator string="Accounts" colspan="4"/>
-                                <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            </group>
-
-                            <group colspan="2" col="2">
-                                <separator string="Invoicing Data" colspan="4"/>
-                                <field name="invoice_sequence_id"/>
-                                <field name="group_invoice_lines"/>
-                            </group>
-
+                            
                             <group colspan="2" col="2">
                                 <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <group colspan="2" col="2">
-                                    <separator string="Validations" colspan="4"/>
-                                    <field name="allow_date" groups="base.group_extended"/>
-                                </group>
+                            <group colspan="2" col="2">
+                                <separator string="Validations" colspan="4"/>
+                                <field name="allow_date" groups="base.group_extended"/>
+                            </group>
 
-                                <group colspan="2" col="2">
-                                    <separator string="Other Configuration" colspan="4"/>
-                                    <field name="centralisation" groups="base.group_extended"/>
-                                    <field name="entry_posted"/>
-                                    <!-- <field name="update_posted"/> -->
-                                </group>
+                            <group colspan="2" col="2">
+                                <separator string="Other Configuration" colspan="4"/>
+                                <field name="centralisation" groups="base.group_extended"/>
+                                <field name="entry_posted"/>
+                                 <field name="update_posted"/> 
+                            </group>
+                            
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing Data" colspan="4"/>
+                                <field name="invoice_sequence_id" groups="base.group_extended"/>
+                                <field name="group_invoice_lines"/>
+                            </group>
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Sequence" colspan="4"/>
+                                <field name="sequence_id"/>
                             </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">

From 01ddcf7cdfe1fe02dcf393ad050a7228562f6d70 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 16:51:14 +0530
Subject: [PATCH 34/57] [IMP]: automatically creates sequence for each new
 journal

bzr revid: mga@tinyerp.com-20100708112114-rtkecagtlh9h5n8o
---
 addons/account/account.py | 52 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 314e192e186..3947cf9d813 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -623,7 +623,7 @@ class account_journal(osv.osv):
         'centralisation': fields.boolean('Centralised counterpart', help="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."),
         'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
         'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
-        'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True),
+        'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=False),
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
@@ -646,8 +646,58 @@ class account_journal(osv.osv):
                 raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
+    def create_sequence(self, cr, uid, ids, context={}):
+        """
+        Create new entry sequence for every new Joural
+        @param cr: cursor to database
+        @param user: id of current user
+        @param ids: list of record ids to be process
+        @param context: context arguments, like lang, time zone
+        @return: return a result
+        """
+        
+        seq_pool = self.pool.get('ir.sequence')
+        seq_typ_pool = self.pool.get('ir.sequence.type')
+        
+        result = True
+        
+        journal = self.browse(cr, uid, ids[0], context)
+        code = journal.code.lower()     
+        types = {
+            'name':journal.name,
+            'code':code
+        }
+        type_id = seq_typ_pool.create(cr, uid, types)
+        
+        seq = {
+            'name':journal.name,
+            'code':code,
+            'active':True,
+            'prefix':journal.code + "/%(year)s/",
+            'padding':4,
+            'number_increment':1
+        }
+        seq_id = seq_pool.create(cr, uid, seq)
+        
+        res = {}
+        if not journal.sequence_id:
+            res.update({
+                'sequence_id':seq_id
+            })
+        
+        if not journal.invoice_sequence_id:
+            res.update({
+                'invoice_sequence_id':seq_id
+            })
+        
+        result = self.write(cr, uid, [journal.id], res)
+            
+        return result
+        
     def create(self, cr, uid, vals, context={}):
         journal_id = super(account_journal, self).create(cr, uid, vals, context)
+        self.create_sequence(cr, uid, [journal_id], context)
+
 #       journal_name = self.browse(cr, uid, [journal_id])[0].code
 #       periods = self.pool.get('account.period')
 #       ids = periods.search(cr, uid, [('date_stop','>=',time.strftime('%Y-%m-%d'))])

From 4ee3b259da58a53a587c06815a61a69d7a04ccaf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 13:26:24 +0200
Subject: [PATCH 35/57] [FIX] project: fixed project tree view with deadline
 date

bzr revid: odo@openerp.com-20100708112624-lbyv3dep5c5v063o
---
 addons/project/project_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1d5ade40e69..006d32b8b68 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -142,8 +142,9 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:date&lt;current_date and state in ('open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree colors="red:date and (date&lt;current_date) and (state in ('open'));blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
+                    <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>

From 0106489c8628503a962e94c66b1e0954572feca8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 17:05:45 +0530
Subject: [PATCH 36/57] [REM]: remove refund journal boolean (deprecated):
 check that this is working properly

bzr revid: mga@tinyerp.com-20100708113545-fyzffxm6c7x15bq3
---
 addons/account/demo/account_minimal.xml | 10 ++++------
 addons/l10n_ch/vaudtax_data.xml         |  3 +--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 308de35e316..0a271eb243b 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -170,8 +170,8 @@ your own chart of account.
 
 
         <!--
-		Account Journal
-		-->
+        Account Journal
+        -->
 
         <record id="sales_journal" model="account.journal">
             <field name="name">x Sales Journal</field>
@@ -188,7 +188,6 @@ your own chart of account.
             <field name="name">x Sales Credit Note Journal</field>
             <field name="code">SCNJ</field>
             <field name="type">sale_refund</field>
-            <field name="refund_journal">True</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
@@ -211,7 +210,6 @@ your own chart of account.
             <field name="name">x Expenses Credit Notes Journal</field>
             <field name="code">ECNJ</field>
             <field name="type">purchase_refund</field>
-            <field name="refund_journal">True</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
@@ -241,8 +239,8 @@ your own chart of account.
         </record>
 
         <!--
-		Product income and expense accounts, default parameters
-	-->
+        Product income and expense accounts, default parameters
+        -->
 
         <record id="property_account_expense_prd" model="ir.property">
             <field name="name">property_account_expense</field>
diff --git a/addons/l10n_ch/vaudtax_data.xml b/addons/l10n_ch/vaudtax_data.xml
index fd2b7bfe9c8..a10693b0ec2 100644
--- a/addons/l10n_ch/vaudtax_data.xml
+++ b/addons/l10n_ch/vaudtax_data.xml
@@ -71,7 +71,6 @@
             <field name="name">Journal d'extourne</field>
             <field name="code">JVE</field>
             <field name="type">sale</field>
-            <field name="refund_journal">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
@@ -101,4 +100,4 @@
             <field name="sequence_id" ref="account.sequence_journal"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 86d52f1a90f5570dd5f745476dd9a8031f6848a3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 17:09:13 +0530
Subject: [PATCH 37/57] [FIX]:account:Invoice Analysis:improved average price

bzr revid: apa@tinyerp.com-20100708113913-xjk08pc4zi5qoly3
---
 addons/account/report/account_invoice_report.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index b7fb9766bf1..efc3c6237bd 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -112,11 +112,7 @@ class account_invoice_report(osv.osv):
                         else
                          ail.quantity*ail.price_unit
                         end) as price_total,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity*ail.price_unit * -1
-                        else
-                         ail.quantity*ail.price_unit
-                        end) / sum(ail.quantity * u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
+                    sum(ail.quantity*ail.price_unit)/sum(ail.quantity*u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
                     sum((select extract(epoch from avg(aml.date_created-l.create_date))/(24*60*60)::decimal(16,2)
                         from account_move_line as aml
                         left join account_invoice as a ON (a.move_id=aml.move_id)

From 8750bdd20ddac670da8e517a402af8e508dd435c Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 17:16:33 +0530
Subject: [PATCH 38/57] [REM]: Convert TAB to SPACE

bzr revid: mga@tinyerp.com-20100708114633-sxmf8isa13oiom6y
---
 addons/account/account_demo.xml         |  8 ++++----
 addons/account/data/account_data2.xml   | 16 ++++++++--------
 addons/account/data/account_invoice.xml | 18 +++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 0b4ee8f097d..a8a1d1405cd 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -3,8 +3,8 @@
     <data noupdate="1">
         
         <!--
-	Fiscal year
-	-->	
+    Fiscal year
+    -->    
         
         <record id="data_fiscalyear" model="account.fiscalyear">
             <field eval="'Fiscal Year '+time.strftime('%Y')" name="name"/>
@@ -15,8 +15,8 @@
         </record>
         
         <!--
-	Fiscal Periods
-	-->	
+    Fiscal Periods
+    -->    
         
         <record id="period_1" model="account.period">
             <field eval="'Jan.'+time.strftime('%Y')" name="name"/>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index ba606287d6a..fafbb52a171 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -3,8 +3,8 @@
     <data noupdate="1">
 
         <!--
-		Payment term
-		-->
+        Payment term
+        -->
         <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days End of Month</field>
         </record>
@@ -17,8 +17,8 @@
         </record>
 
         <!--
-		Account Journal View
-		-->
+        Account Journal View
+        -->
         <record id="account_journal_bank_view" model="account.journal.view">
             <field name="name">Cash Journal View</field>
         </record>
@@ -274,8 +274,8 @@
 
 
         <!--
-		Account Journal Sequences
-		-->
+        Account Journal Sequences
+        -->
 
         <record id="sequence_journal_type" model="ir.sequence.type">
             <field name="name">Account Journal</field>
@@ -298,8 +298,8 @@
         </record>
 
         <!--
-		Account Statement Sequences
-		-->
+        Account Statement Sequences
+        -->
 
         <record id="sequence_reconcile" model="ir.sequence.type">
             <field name="name">Account reconcile sequence</field>
diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
index de2fff507f5..96407d926f2 100644
--- a/addons/account/data/account_invoice.xml
+++ b/addons/account/data/account_invoice.xml
@@ -5,10 +5,10 @@
             <field name="name">Invoice</field>
             <field name="object">account.invoice</field>
         </record>
-        
+
         <!--
-	Sequences types for invoices
-	-->
+    Sequences types for invoices
+    -->
         <record id="seq_type_out_invoice" model="ir.sequence.type">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
@@ -27,8 +27,8 @@
         </record>
         
         <!--
-	Sequences for invoices
-	-->
+    Sequences for invoices
+    -->
         <record id="seq_out_invoice" model="ir.sequence">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
@@ -55,16 +55,16 @@
         </record>
         
         <!--
-	Sequences types for analytic account 
-	-->
+    Sequences types for analytic account 
+    -->
         <record id="seq_type_analytic_account" model="ir.sequence.type">
             <field name="name">Analytic account</field>
             <field name="code">account.analytic.account</field>
         </record>
         
         <!-- 
-	Sequence for analytic account 
-	-->
+    Sequence for analytic account 
+    -->
         <record id="seq_analytic_account" model="ir.sequence">
             <field name="name">Analytic account sequence</field>
             <field name="code">account.analytic.account</field>

From a3a7ed0e1158d940e89bd9d6edc7f269228fa91c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 13:53:24 +0200
Subject: [PATCH 39/57] [IMP] crm/lead: removed date_deadline field from leads,
 it belongs to opportunities only

bzr revid: odo@openerp.com-20100708115324-8t9fu22deibgol7d
---
 addons/crm/crm_lead_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c429810e31f..ada4f7d29fe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -43,16 +43,15 @@
                 <group colspan="4" col="7">
                     <field name="name" required="1" string="Name"/>
                     <field name="priority"/>
-                    <field name="date_deadline"/>
                     <button
                          name="convert_opportunity"
                          string="Convert to Opportunity"
                          help="Convert to Opportunity"
                          icon="gtk-index"
+                         colspan="2"
                          type="object"/>
                     <newline />
-                    <field name="section_id" colspan="1"
-                        widget="selection" />
+                    <field name="section_id" widget="selection" />
                     <field name="user_id" />
                     <field name="stage_id" widget="selection"
                         domain="[('object_id.model', '=', 'crm.lead')]" />

From cfc4c0a21ad630c25790779437cbae9c8c83b278 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 13:53:53 +0200
Subject: [PATCH 40/57] [IMP] crm/opportunity: red highlighting in list only if
 deadline is set and in the past

bzr revid: odo@openerp.com-20100708115353-jvlcgqw8pvzgej4v
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ea959f7bd1a..b08ceaf898e 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -200,7 +200,7 @@
                 <field name="model">crm.lead</field>
                 <field name="type">tree</field>
                 <field name="arch" type="xml">
-                    <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                    <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                         <field name="date_deadline" invisible="1"/>
                         <field name="create_date"/>
                         <field name="name" string="Opportunity"/>

From 2e8f20a49cd4857bd011729b06297b6606117387 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 17:37:06 +0530
Subject: [PATCH 41/57] [FIX]:account:Invoice Analysis:improved avereage delay

bzr revid: apa@tinyerp.com-20100708120706-93lfy7hbbvhv9d40
---
 addons/account/report/account_invoice_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index efc3c6237bd..a06c59da06a 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -113,7 +113,7 @@ class account_invoice_report(osv.osv):
                          ail.quantity*ail.price_unit
                         end) as price_total,
                     sum(ail.quantity*ail.price_unit)/sum(ail.quantity*u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
-                    sum((select extract(epoch from avg(aml.date_created-l.create_date))/(24*60*60)::decimal(16,2)
+                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
                         from account_move_line as aml
                         left join account_invoice as a ON (a.move_id=aml.move_id)
                         left join account_invoice_line as l ON (a.id=l.invoice_id)

From bcbb0f5d1220af804bfb4c658f4df571e66a3f9a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 17:50:29 +0530
Subject: [PATCH 42/57] [ADD]: add new views for journals sales, purchase,
 refunds of sales and purchase

bzr revid: mga@tinyerp.com-20100708122029-gftnb7z0l5eldiog
---
 addons/account/data/account_data2.xml   | 233 ++++++++++++++++++++----
 addons/account/demo/account_minimal.xml |   8 +-
 2 files changed, 197 insertions(+), 44 deletions(-)

diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index fafbb52a171..10303dd8cbf 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -20,7 +20,7 @@
         Account Journal View
         -->
         <record id="account_journal_bank_view" model="account.journal.view">
-            <field name="name">Cash Journal View</field>
+            <field name="name">Bank/Cash Journal View</field>
         </record>
         <record id="bank_col1" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -74,12 +74,6 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="bank_col11" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="12" name="sequence"/>
-        </record>
         <record id="bank_col12" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Analytic Account</field>
@@ -100,7 +94,7 @@
         </record>
 
         <record id="account_journal_bank_view_multi" model="account.journal.view">
-            <field name="name">Multi-Currency Cash Journal View</field>
+            <field name="name">Bank/Cash Journal (Multi-Currency) View</field>
         </record>
         <record id="bank_col1_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
@@ -203,6 +197,12 @@
             <field name="field">ref</field>
             <field eval="3" name="sequence"/>
         </record>
+        <record id="journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
         <record id="journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Account</field>
@@ -210,12 +210,6 @@
             <field eval="True" name="required"/>
             <field eval="5" name="sequence"/>
         </record>
-        <record id="journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="4" name="sequence"/>
-        </record>
         <record id="journal_col6" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Name</field>
@@ -223,12 +217,6 @@
             <field eval="6" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
-        <record id="journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Maturity Date</field>
-            <field name="field">date_maturity</field>
-            <field eval="7" name="sequence"/>
-        </record>
         <record id="journal_col8" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Debit</field>
@@ -241,38 +229,203 @@
             <field name="field">credit</field>
             <field eval="9" name="sequence"/>
         </record>
-        <record id="journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="10" name="sequence"/>
-        </record>
         <record id="journal_col11" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Analytic Account</field>
             <field name="field">analytic_account_id</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="journal_col25" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Tax Acc.</field>
-            <field name="field">tax_code_id</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="journal_col26" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">tax_amount</field>
-            <field eval="13" name="sequence"/>
-        </record>
         <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
             <field eval="14" name="sequence"/>
         </record>
-
-
+        
+        
+        <record id="account_sp_journal_view" model="account.journal.view">
+            <field name="name">Sale/Purchase Journal View</field>
+        </record>
+        <record id="sp_journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">N. Piece</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="sp_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="sp_journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="sp_journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="sp_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="6" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="sp_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Maturity Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="7" name="sequence"/>
+        </record>
+        <record id="sp_journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="8" name="sequence"/>
+        </record>
+        <record id="sp_journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="9" name="sequence"/>
+        </record>
+        <record id="sp_journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="10" name="sequence"/>
+        </record>
+        <record id="sp_journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="sp_journal_col25" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax Acc.</field>
+            <field name="field">tax_code_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_journal_col26" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">tax_amount</field>
+            <field eval="13" name="sequence"/>
+        </record>
+        <record id="sp_journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="14" name="sequence"/>
+        </record>
+        
+        <record id="account_sp_refund_journal_view" model="account.journal.view">
+            <field name="name">Sale/Purchase Refund Journal View</field>
+        </record>
+        <record id="sp_refund_journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">N. Piece</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="6" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="sp_refund_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Maturity Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="7" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="8" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="9" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="10" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col25" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax Acc.</field>
+            <field name="field">tax_code_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col26" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">tax_amount</field>
+            <field eval="13" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="14" name="sequence"/>
+        </record>
         <!--
         Account Journal Sequences
         -->
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 0a271eb243b..a1f3204b7f0 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -177,7 +177,7 @@ your own chart of account.
             <field name="name">x Sales Journal</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
             <field name="invoice_sequence_id" ref="seq_type_out_invoice"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
@@ -188,7 +188,7 @@ your own chart of account.
             <field name="name">x Sales Credit Note Journal</field>
             <field name="code">SCNJ</field>
             <field name="type">sale_refund</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
@@ -199,7 +199,7 @@ your own chart of account.
             <field name="name">x Expenses Journal</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
             <field name="invoice_sequence_id" ref="seq_type_in_invoice"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
@@ -210,7 +210,7 @@ your own chart of account.
             <field name="name">x Expenses Credit Notes Journal</field>
             <field name="code">ECNJ</field>
             <field name="type">purchase_refund</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>

From 0228b87107b0105830738e209ac924c7bfcb23b6 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 8 Jul 2010 17:55:51 +0530
Subject: [PATCH 43/57] [FIX]:account:Invoice Analysis:improved average delay

bzr revid: apa@tinyerp.com-20100708122551-xf64ysjko06tu964
---
 addons/account/report/account_invoice_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index ee9ee498365..ca89cd10852 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -33,7 +33,7 @@
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="residual"  sum="Total Residual" invisible="not context.get('residual_visible',False)"/>
-                <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
+                <field name="delay_to_pay"  avg="Avg. Delay To Pay" invisible="not context.get('residual_visible',False)"/>
             </tree>
         </field>
     </record>

From 18831ae253552f503811a625ff1b65dd96ec24a9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 8 Jul 2010 18:16:18 +0530
Subject: [PATCH 44/57] [IMP] product,stock: if product type service then
 redonly some fields

bzr revid: sbh@tinyerp.com-20100708124618-8k3c6abuy1d57g1d
---
 addons/procurement/process/procurement_process.xml | 7 +------
 addons/product/product_view.xml                    | 6 +++---
 addons/stock/product_view.xml                      | 6 +++---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
index e5b94bb225d..e12c97b2070 100644
--- a/addons/procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!--
-            Process
+           Process Node from where the Procurement flow starts
         -->
 
         <record id="process_process_procurementprocess0" model="process.process">
@@ -11,11 +11,6 @@
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="1" name="active"/>
         </record>
-
-        <!--
-            Process Node
-        -->
-
         
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b5f48efd90a..e58987cf2c8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -127,9 +127,9 @@
                             </group>
                             <group colspan="2" col="2" name="store">
                                 <separator string="Storage Localisation" colspan="2"/>
-                                <field name="loc_rack"/>
-                                <field name="loc_row"/>
-                                <field name="loc_case"/>
+                                <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
                             </group>
 
                             <group colspan="2" col="2" name="misc" groups="base.group_extended">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1d8db4f0228..01214bad6a4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -116,9 +116,9 @@
                 <group name="store" position="after">
                     <group col="2" colspan="2" name="store" groups="base.group_extended">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production"  domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory"  domain="[('usage','=','inventory')]"/>
+                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
                     </group>
                 </group>
             </field>

From 5047a630455b3ef9f58f834396085f0881cae7bd Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 14:53:59 +0200
Subject: [PATCH 45/57] [FIX/REF] project_long_term: better way to obtain
 default uom unit

bzr revid: odo@openerp.com-20100708125359-ov7z0d8bjgtm4gxs
---
 addons/project_long_term/project_long_term.py      | 14 ++++++++------
 .../wizard/project_compute_phases.py               |  3 +--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a6fbcb22ab7..6cba9bc55d0 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -86,6 +86,11 @@ class project_phase(osv.osv):
              return False
          return True
 
+    def _get_default_uom_id(self, cr, uid):
+       model_data_obj = self.pool.get('ir.model.data')
+       model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
+       return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
+
     _columns = {
         'name': fields.char("Name", size=64, required=True),
         'date_start': fields.datetime('Start Date', help="Starting Date of the phase"),
@@ -137,7 +142,6 @@ class project_phase(osv.osv):
        """
        uom_obj = self.pool.get('product.uom')
        resource_obj = self.pool.get('resource.resource')
-       model_data_obj = self.pool.get('ir.model.data')
        cal_obj = self.pool.get('resource.calendar')
        calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
        resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)])
@@ -147,7 +151,7 @@ class project_phase(osv.osv):
             cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
             if cal_id:
                 calendar_id = cal_id
-       default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
+       default_uom_id = self._get_default_uom_id(cr, uid)
        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
        work_times = cal_obj.interval_min_get(cr, uid, calendar_id, date_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
        dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
@@ -160,7 +164,6 @@ class project_phase(osv.osv):
        Check And Compute date_end of phase if change in date_end > older time.
        """
        uom_obj = self.pool.get('product.uom')
-       model_data_obj = self.pool.get('ir.model.data')
        resource_obj = self.pool.get('resource.resource')
        cal_obj = self.pool.get('resource.calendar')
        calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
@@ -171,7 +174,7 @@ class project_phase(osv.osv):
             cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
             if cal_id:
                 calendar_id = cal_id
-       default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
+       default_uom_id = self._get_default_uom_id(cr, uid)
        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
        work_times = cal_obj.interval_get(cr, uid, calendar_id, date_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
        dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
@@ -181,7 +184,6 @@ class project_phase(osv.osv):
         resource_calendar_obj = self.pool.get('resource.calendar')
         resource_obj = self.pool.get('resource.resource')
         uom_obj = self.pool.get('product.uom')
-        model_data_obj = self.pool.get('ir.model.data')
         if context is None:
             context = {}
         if context.get('scheduler',False):
@@ -195,7 +197,7 @@ class project_phase(osv.osv):
                 cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
                 if cal_id:
                     calendar_id = cal_id
-        default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
+        default_uom_id = self._get_default_uom_id(cr, uid)
         avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
 
         # Change the date_start and date_end
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 3ee15bc6c5a..f4c5fbae443 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -60,7 +60,6 @@ class project_compute_phases(osv.osv_memory):
        phase_obj = self.pool.get('project.phase')
        resource_obj = self.pool.get('resource.resource')
        uom_obj = self.pool.get('product.uom')
-       model_data_obj = self.pool.get('ir.model.data')
        phase_resource_obj = False
 
        if context is None:
@@ -82,7 +81,7 @@ class project_compute_phases(osv.osv_memory):
                                                 'vacation': tuple(leaves),
                                                 'efficiency': time_efficiency
                                                 })
-            default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
+            default_uom_id = phase_obj._get_default_uom_id(cr, uid)
             avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
             duration = str(avg_hours) + 'H'
             # Create a new project for each phase

From 4ce21feabed3e7cbf3ac77fb1514d669bffe36aa Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 15:08:33 +0200
Subject: [PATCH 46/57] [BREAK] WARNING: base_calendar: had to disable the
 scheduler until the recursion problem is fixed, to release the CPU!!!

bzr revid: odo@openerp.com-20100708130833-hhunfcgm6n2dmq9w
---
 addons/base_calendar/base_calendar.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index f9f6567747f..7896dfae1ae 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -793,6 +793,7 @@ class calendar_alarm(osv.osv):
         @param use_new_cursor: False or the dbname
         @param context: A standard dictionary for contextual values
         """
+        return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!!
         if not context:
             context = {}
         current_datetime = datetime.now()

From fa56e44dcb40c24582045ca2d2f91ccab02eb241 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 18:47:55 +0530
Subject: [PATCH 47/57] [IMP]: improve onchange_tye for the journal

bzr revid: mga@tinyerp.com-20100708131755-vovhfnyt2i8u7y9o
---
 addons/account/account.py | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 3947cf9d813..4b86938854e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -638,6 +638,7 @@ class account_journal(osv.osv):
         'user_id': lambda self,cr,uid,context: uid,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+    
     def write(self, cr, uid, ids, vals, context=None):
         obj=[]
         if 'company_id' in vals:
@@ -720,13 +721,33 @@ class account_journal(osv.osv):
         return self.name_get(cr, user, ids, context=context)
 
     def onchange_type(self, cr, uid, ids, type):
-        res={}
-        for line in self.browse(cr, uid, ids):
-            if type == 'situation':
-                  res= {'value':{'centralisation': True}}
-            else:
-                  res= {'value':{'centralisation': False}}
-        return res
+        data_pool = self.pool.get('ir.model.data')
+        type_map = {
+            'sale':'account_sp_journal_view',
+            'sale_refund':'account_sp_refund_journal_view',
+            'purchase':'account_sp_journal_view',
+            'purchase_refund':'account_sp_refund_journal_view',
+            'expense':'account_sp_journal_view',
+            'cash':'account_journal_bank_view',
+            'bank':'account_journal_bank_view',
+            'general':'account_journal_view',
+            'situation':'account_journal_view'
+        }
+        
+        res = {}
+        
+        view_id = type_map.get(type, 'general')
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
+        data = data_pool.browse(cr, uid, data_id[0])
+    
+        res.update({
+            'centralisation':type == 'situation',
+            'view_id':data.res_id,
+        })
+        
+        return {
+            'value':res
+        }
 
 account_journal()
 

From 52509510855b663552e2453cf8f60d8678a29ef6 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 8 Jul 2010 18:51:16 +0530
Subject: [PATCH 48/57] [ADD] event : access rules for Even/Manager

bzr revid: vir@tinyerp.com-20100708132116-nv1j2xtogcug0p4p
---
 addons/event/security/ir.model.access.csv | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index c30a8b6aa3d..a59748aa534 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,6 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_event_type","event.type","model_event_type","event.group_event_subscriber",1,0,0,0
 "access_event_type_manager","event.type manager","model_event_type","event.group_event_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,1
-"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,1
+"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,0
 "access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_subscriber",1,0,0,0
+"access_event_event_manager","event.event manager","model_event_event","event.group_event_manager",1,1,1,1
+"access_event_registration_manager","event.registration manager","model_event_registration","event.group_event_manager",1,1,1,1
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","event.group_event_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","event.group_event_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_manager",1,1,1,1

From 8628eadf47fd11cad61754a2b08e6954c4107aa5 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 18:58:15 +0530
Subject: [PATCH 49/57] [IMP]: improvement in on_change type for multicurrency
 journals

bzr revid: mga@tinyerp.com-20100708132815-d21kma0rxzdfoq1m
---
 addons/account/account.py       | 9 ++++++++-
 addons/account/account_view.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 4b86938854e..7f01f60253d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -720,8 +720,10 @@ class account_journal(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
-    def onchange_type(self, cr, uid, ids, type):
+    def onchange_type(self, cr, uid, ids, type, currency):
         data_pool = self.pool.get('ir.model.data')
+        user_pool = self.pool.get('res.users')
+        
         type_map = {
             'sale':'account_sp_journal_view',
             'sale_refund':'account_sp_refund_journal_view',
@@ -737,6 +739,11 @@ class account_journal(osv.osv):
         res = {}
         
         view_id = type_map.get(type, 'general')
+        
+        user = user_pool.browse(cr, uid, uid)
+        if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
+            view_id = 'account_journal_bank_view_multi'
+        
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
         data = data_pool.browse(cr, uid, data_id[0])
     
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6ef38dde583..be77a4d30d5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -332,7 +332,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="type" on_change="onchange_type(type)"/>
+                        <field name="type" on_change="onchange_type(type, currency)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">

From f07518d0d397f96e5bd15d2c35b62121db568f9c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 8 Jul 2010 19:02:41 +0530
Subject: [PATCH 50/57] [FIX] account: fix problem in account chart
 configuration wizard

bzr revid: hmo@tinyerp.com-20100708133241-4t2jsm5ibj135mt4
---
 addons/account/account.py   | 4 ++--
 addons/account/installer.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 7f01f60253d..322d77eced9 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2560,8 +2560,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Bank Journals
-        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Cash Journal View')])[0]
-        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Multi-Currency Cash Journal View')])[0]
+        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: why put  fix name
+        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fix name
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 45ea43040a4..aec82032e9a 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -207,8 +207,8 @@ class account_installer(osv.osv_memory):
             new_account = obj_acc.create(cr, uid, vals)
             acc_template_ref[account_template.id] = new_account
             if account_template.name == 'Bank Current Account':
-                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0]
-                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0]
+                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
+                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
                 ref_acc_bank = obj_multi.bank_account_view_id
 
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
@@ -328,8 +328,8 @@ class account_installer(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Bank Journals
-        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Cash Journal View')])[0]
-        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Multi-Currency Cash Journal View')])[0]
+        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
+        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
         ref_acc_bank = obj_multi.bank_account_view_id
 
 

From dceac87f08ffc9707f0b3adcef59c3ded3a6c464 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 8 Jul 2010 19:03:42 +0530
Subject: [PATCH 51/57] [IMP] project_mrp: Add the user_id and project_id in
 product and add the task_id in procurement

bzr revid: sbh@tinyerp.com-20100708133342-105x6v60zwc26c98
---
 addons/project_mrp/__openerp__.py       |  1 +
 addons/project_mrp/mrp.py               | 14 +++++++----
 addons/project_mrp/project_mrp.py       |  8 +++++++
 addons/project_mrp/project_mrp_view.xml | 31 +++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 addons/project_mrp/project_mrp_view.xml

diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index a51a95c5d16..2ac983e67e4 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -51,6 +51,7 @@ automatically created via sale orders.
     'init_xml': [],
     'update_xml': ['project_mrp_workflow.xml', 
                    #'process/project_mrp_process.xml',
+                   'project_mrp_view.xml'
                    ],
     'demo_xml': [],
     'test': ['test/project_task_procurement.yml'],
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index dc5d52e241d..b8eff3c8fa8 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -26,12 +26,16 @@ import tools
 class procurement_order(osv.osv):
     _name = "procurement.order"
     _inherit = "procurement.order"
+    _columns = {
+        'task_id': fields.many2one('project.task', 'Task')
+    }
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         for procurement in self.browse(cr, uid, ids):
             sline = self.pool.get('sale.order.line')
+            product_obj=self.pool.get('product.product')
             content = ''
             sale_order = self.pool.get('sale.order')
             so_ref =  procurement.name.split(':')[0]
@@ -69,6 +73,7 @@ class procurement_order(osv.osv):
             self.write(cr, uid, [procurement.id], {'state': 'running'})
 
             name_task = ('','')
+            planned_hours=0.0
             if procurement.product_id.type == 'service':
                 proc_name = procurement.name
                 if procurement.origin == proc_name:
@@ -77,12 +82,12 @@ class procurement_order(osv.osv):
                 name_task = (procurement.origin, proc_name or '')
             else:
                 name_task = (procurement.product_id.name or procurement.origin, procurement.name or '')
-
+            planned_hours= procurement.product_id.sale_delay +procurement.product_id. produce_delay   
             task_id = self.pool.get('project.task').create(cr, uid, {
                 'name': '%s:%s' % name_task,
                 'date_deadline': procurement.date_planned,
-                'planned_hours': procurement.product_qty,
-                'remaining_hours': procurement.product_qty,
+                'planned_hours':planned_hours,
+                'remaining_hours': planned_hours,
                 'user_id': procurement.product_id.product_manager.id,
                 'notes': "b"+(l and l.order_id.note or ''),
                 'procurement_id': procurement.id,
@@ -93,7 +98,8 @@ class procurement_order(osv.osv):
                 'company_id': procurement.company_id.id,
                 'project_id': project_id,
             },context=context)
-
+            self.write(cr, uid, [procurement.id],{'task_id':task_id}) 
+            product_obj.write(cr,uid,[procurement.product_id.id],{'user_id':uid,'project_id':project_id})
         return task_id
 
 procurement_order()
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 09820d44c71..d946e2c2fd6 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -48,5 +48,13 @@ class project_task(osv.osv):
         return True
 
 project_task()
+class product_product(osv.osv):
+    _inherit = "product.product"
+    _columns = {
+        'user_id': fields.many2one('res.users', 'Responsible', ondelete='set null',help='Project Manager'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
+    }
+product_product()    
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
new file mode 100644
index 00000000000..5d0c1d71381
--- /dev/null
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_procurement_task_form" model="ir.ui.view">
+            <field name="name">procurement.procurement.form.view.inherit</field>
+            <field name="model">procurement.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="procurement.procurement_form_view"/>
+            <field name="arch" type="xml">
+                <field name="close_move" position="after">
+                    <field name="task_id"/>
+                </field>
+            </field>
+        </record>
+        
+  	<record id="view_product_task_form" model="ir.ui.view">
+            <field name="name">product.form.view.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="user_id" attrs="{'readonly':[('type','!=','service')]}"/>
+                    <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />
+                </field>
+            </field>
+        </record>
+    
+    </data>
+</openerp>
+        
\ No newline at end of file

From 8064b86d8db8e932b46335d92acb74c084c09593 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Jul 2010 16:03:52 +0200
Subject: [PATCH 52/57] [IMP] crm_lead: reopen cases upon receipt of new email
 in states pending, done, cancel

bzr revid: odo@openerp.com-20100708140352-tbb36pq8cqq0tqqm
---
 addons/crm/crm_lead.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6708f3e8f0e..01c597fcb97 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -31,6 +31,13 @@ import collections
 import binascii
 import tools
 
+
+CRM_LEAD_PENDING_STATES = (
+    crm.AVAILABLE_STATES[2][0], # Cancelled
+    crm.AVAILABLE_STATES[3][0], # Done
+    crm.AVAILABLE_STATES[4][0], # Pending
+)
+
 class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
     _name = "crm.lead"
@@ -95,6 +102,10 @@ class crm_lead(osv.osv, crm_case):
         return res
 
     _columns = {
+        # Overridden from res.partner.address:
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', 
+            select=True, help="Optional linked partner, usually after conversion of the lead"),
+        
         # From crm.case
         'name': fields.char('Name', size=64),
         'active': fields.boolean('Active', required=False),
@@ -334,8 +345,8 @@ and users"),
         # previous state, so we have to loop:
         for case in self.browse(cr, uid, ids, context=context):
             values = dict(vals)
-            if case.state == crm.AVAILABLE_STATES[4][0]: #pending
-                values.update(state=crm.AVAILABLE_STATES[1][0]) #open
+            if case.state in CRM_LEAD_PENDING_STATES:
+                values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
             res = self.write(cr, uid, [case.id], values, context=context)
 
         return res

From 977d51f5698dd19a4bc97fd30c33a7218322bc29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 8 Jul 2010 19:51:02 +0530
Subject: [PATCH 53/57] [IMP] purchase_requisition: if state is done the
 readonly some field and button

bzr revid: sbh@tinyerp.com-20100708142102-ctl0bozqkby8nh6b
---
 addons/purchase_requisition/purchase_requisition.py       | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 3bdc461917b..db05650354b 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -39,7 +39,7 @@ class purchase_requisition(osv.osv):
         'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Tender (exclusive):On the confirmation of a purchase order, it cancels the remaining purchase order.Multiple Requisitions:It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'),
+        'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
         'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
         'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
     }
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 93f4f111da0..76aa70aaf42 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -41,7 +41,6 @@
                     <field name="origin"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
-
                 <notebook colspan="4">
                     <page string="Products">
                         <field name="line_ids" colspan="4" nolabel="1">
@@ -83,7 +82,8 @@
                         <separator colspan="4" string=""/>
                          <group col="8" colspan="4">
                           <label colspan="6"  string=""/>
-                        <button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
+                        <button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" 
+                           attrs="{'readonly': [('state', '=', 'done')]}" />
                         </group>
                    </page>
                     <page string="Notes">

From ee2fabb2478048c806db598b6577a8be9c47cb2e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 8 Jul 2010 19:55:59 +0530
Subject: [PATCH 54/57] [IMP]: improvement in invoice [IMP]: improve in journal
 items menu [FIX]: fix a reconcile entries problems in voucher payment

bzr revid: mga@tinyerp.com-20100708142559-3yocywnf984fkcdj
---
 addons/account/account_invoice_view.xml             |  4 ++--
 addons/account/account_view.xml                     |  4 ++--
 addons/account/invoice.py                           |  8 ++++----
 .../account_voucher_payment.py                      | 13 +++++++------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7394fc54b7e..99d1181fb7b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -257,7 +257,7 @@
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change Currency"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change"/>
                     <newline/>
                     <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -490,7 +490,7 @@
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
-        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
+        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Entries" res_model="account.move.line" src_model="account.invoice"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index be77a4d30d5..daae3043a41 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1209,7 +1209,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
-            <field name="domain">[('journal_id.type', 'in', ['sale', 'sale_refund'])]</field>
+            <field name="domain">[('journal_id.type', 'in', ['sale', 'purchase_refund'])]</field>
         </record>
 
         <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
@@ -1221,7 +1221,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
-            <field name="domain">[('journal_id.type', 'in', ['purchase', 'purchase_refund'])]</field>
+            <field name="domain">[('journal_id.type', 'in', ['purchase', 'sale_refund'])]</field>
             <field name="context">{'journal_id':1}</field>
         </record>
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 62f998fa751..0030d36d896 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -234,7 +234,7 @@ class account_invoice(osv.osv):
         'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
         'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Reference Type',
-            required=True),
+            required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'comment': fields.text('Additional Information', translate=True),
 
         'state': fields.selection([
@@ -312,8 +312,8 @@ class account_invoice(osv.osv):
             },
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
-        'move_name': fields.char('Ledger Posting', size=64),
-        'user_id': fields.many2one('res.users', 'Salesman'),
+        'move_name': fields.char('Ledger Posting', size=64, readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
     }
     _defaults = {
@@ -1574,4 +1574,4 @@ class res_partner(osv.osv):
 
 res_partner()
 
-# 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/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 7bad021ba26..39c67787157 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -143,14 +143,15 @@ class account_voucher(osv.osv):
                     })
                     amount = line.amount
                 
-                if line.invoice_id:
-                    move_line.update({
-                        'invoice_id':line.invoice_id.id
-                    })
-                    invoice_pool.pay_and_reconcile(cr, uid, [line.invoice_id.id], amount, inv.account_id.id, inv.period_id.id, inv.journal_id.id, False, False, False)
-                    
                 move_line_id = move_line_pool.create(cr, uid, move_line)
                 line_ids += [move_line_id]
+                
+                if line.invoice_id:
+                    rec_ids = [move_line_id]
+                    for move_line in line.invoice_id.move_id.line_id:
+                        if line.account_id.id == move_line.account_id.id:
+                            rec_ids += [move_line.id]
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
             
             rec = {
                 'move_id': move_id,

From a1e503f869fe2f0b537c41b0633c2ac4b02693ee Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 8 Jul 2010 16:43:47 +0200
Subject: [PATCH 55/57] merge

bzr revid: fp@tinyerp.com-20100708144347-b9x0lx1ulfbjtli4
---
 .../wizard/account_pay_invoice_view.xml       | 58 +++++++++----------
 addons/base_setup/base_setup_installer.xml    |  2 +-
 addons/purchase/purchase_workflow.xml         |  1 -
 addons/purchase/security/ir.model.access.csv  |  6 ++
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index 0bae948100e..3601daaef06 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_invoice_pay" model="ir.ui.view">
+        <record id="view_account_invoice_pay" model="ir.ui.view">
             <field name="name">account.invoice.pay.form</field>
             <field name="model">account.invoice.pay</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pay invoice">
-                	<group colspan="4" >
-						<field name="amount"/>
-					    <newline/>
-					    <field name="name"/>
-					    <field name="date"/>
-					    <field name="journal_id"/>
-					    <field name="period_id"/>
-                	</group>
+                    <group colspan="4" >
+                        <field name="amount"/>
+                        <newline/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id" widget="selection"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
-                    	<button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
+                        <button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_invoice_pay" model="ir.actions.act_window">
+        <record id="action_account_invoice_pay" model="ir.actions.act_window">
             <field name="name">Pay Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.invoice.pay</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_invoice_pay"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 
-		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
+        <record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
             <field name="name">account.invoice.pay.writeoff.form</field>
             <field name="model">account.invoice.pay.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Information addendum">
-                	<group colspan="4" >
-					    <separator string="Write-Off Move" colspan="4"/>
-					    <field name="writeoff_journal_id"/>
-    					<field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-    					<field name="comment"/>
-    					<separator string="Analytic" colspan="4"/>
-    					<field name="analytic_id"/>
-                	</group>
+                    <group colspan="4" >
+                        <separator string="Write-Off Move" colspan="4"/>
+                        <field name="writeoff_journal_id"/>
+                        <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="comment"/>
+                        <separator string="Analytic" colspan="4"/>
+                        <field name="analytic_id"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index bb9f8d23bf7..009af3ffd55 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -28,7 +28,7 @@
             <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
             <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index d14530e5f48..a194cd16713 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -103,7 +103,6 @@
         <record id="trans_confirmed_router" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_router"/>
-            <field name="signal">purchase_approve</field>
         </record>
         <record id="trans_router_picking" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 674b01f66e7..7a3b35725d4 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -26,3 +26,9 @@
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
 "access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
 "access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
+"access_account_period","account.period","account.model_account_period","purchase.group_purchase_user",1,0,0,0
+"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","purchase.group_purchase_user",1,0,0,0
+"access_account_move","account.move","account.model_account_move","purchase.group_purchase_user",1,1,1,1
+"access_account_move_line","account.move.line","account.model_account_move_line","purchase.group_purchase_user",1,1,1,1
+"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","purchase.group_purchase_user",1,1,1,1
+"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","purchase.group_purchase_user",1,1,1,1

From 096b3ccbd6f0c3dcd0a1dc3fe047d05d5a3f7a5f Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 9 Jul 2010 04:56:42 +0100
Subject: [PATCH 56/57] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100709035642-ierokjp3l56tkts5
---
 addons/account/i18n/it.po                  |  12 +-
 addons/account/i18n/ru.po                  |   2 +-
 addons/account/i18n/zh_CN.po               |  44 +--
 addons/account_analytic_default/i18n/ru.po |  12 +-
 addons/account_analytic_plans/i18n/ru.po   |  44 +--
 addons/account_budget/i18n/ru.po           |  80 ++---
 addons/account_coda/i18n/ru.po             | 168 +++++++++
 addons/auction/i18n/ru.po                  | 247 ++++++++-----
 addons/base_contact/i18n/ru.po             |  65 ++--
 addons/base_iban/i18n/ru.po                |   2 +-
 addons/crm/i18n/ru.po                      | 388 +++++++++++----------
 addons/membership/i18n/ru.po               |   2 +-
 addons/multi_company/i18n/ru.po            |   2 +-
 addons/product/i18n/ru.po                  |   2 +-
 addons/product_visible_discount/i18n/et.po |  47 +++
 addons/sale/i18n/ru.po                     |   2 +-
 addons/wiki/i18n/ru.po                     |   2 +-
 17 files changed, 707 insertions(+), 414 deletions(-)
 create mode 100644 addons/account_coda/i18n/ru.po
 create mode 100644 addons/product_visible_discount/i18n/et.po

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 413cbb3ad35..62a2d826964 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-05 10:24+0000\n"
+"PO-Revision-Date: 2010-07-08 08:56+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.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-07 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3209,6 +3209,8 @@ msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
 msgstr ""
+"I movimenti contabili della fattura sono stati riconciliati con movimenti "
+"contabili del/i pagamento/i."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3631,7 +3633,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr ""
+msgstr "Il conto del partner utilizzato per questa fattura."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -3888,7 +3890,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Lasciare vuoto per utilizzare la data corrente"
 
 #. module: account
 #: rml:account.overdue:0
@@ -5278,7 +5280,7 @@ msgstr "Non pagati"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Importo rimanente dovuto"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index ea4307e5542..e5a7ff528f4 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 743c8ff302e..5effa7bf02b 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-06 10:39+0000\n"
+"PO-Revision-Date: 2010-07-08 05:22+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-07 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -24,7 +24,7 @@ msgstr "内部名称"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "税代码"
+msgstr "税事务科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -94,7 +94,7 @@ msgstr "未对账"
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "基础代码"
+msgstr "基础税事务代码"
 
 #. module: account
 #: view:account.account:0
@@ -128,7 +128,7 @@ msgstr "剩余的"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "税基代码符号"
+msgstr "基础税事务符号"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -503,7 +503,7 @@ msgstr "辅助核算分录统计"
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "税代码模板"
+msgstr "税事务模板"
 
 #. module: account
 #: view:account.invoice:0
@@ -546,7 +546,7 @@ msgstr "包含在基础金额里"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "退税基于"
+msgstr "退税事务代码"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -701,7 +701,7 @@ msgstr "选择辅助核算的会计期间"
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "税的借贷标志(1为借方)"
+msgstr "税事务的符号(1为正数)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -938,7 +938,7 @@ msgstr "结束日期"
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "基础代码金额"
+msgstr "基础税事务代码的金额"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -1506,7 +1506,7 @@ msgstr "电话:"
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "税代码金额"
+msgstr "税事务金额"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -1849,7 +1849,7 @@ msgstr "开始日期"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x 费用信用票据分录集合"
+msgstr "x 费用贷项单分录集合"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -2630,7 +2630,7 @@ msgstr "逾期付款信息"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "税代码模板"
+msgstr "税事务模板"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -2969,7 +2969,7 @@ msgstr "汇总"
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "税代码"
+msgstr "税事务"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -3286,7 +3286,7 @@ msgstr "每月30天"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "税根代码"
+msgstr "税事务的根"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3602,7 +3602,7 @@ msgstr "当前业务伙伴将替代为这默认的付款条款"
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr "分录名称"
+msgstr "名称"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -3644,7 +3644,7 @@ msgstr "明细"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr "贷方票据"
+msgstr "贷项单"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3798,7 +3798,7 @@ msgstr "付款分录"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr "可以选基于的税务代码或税务代码"
+msgstr "可以选基础税事务或税事务科目"
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -4170,7 +4170,7 @@ msgid ""
 "Allows you to change the sign of the balance amount displayed in the "
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
-msgstr "允许你修改报表显示的余额的符号,所以你能看见费用科目为正数"
+msgstr "允许你修改报表显示的余额的符号,所以你能看见正数来取代负数的费用科目"
 
 #. module: account
 #: help:account.config.wizard,code:0
@@ -4329,7 +4329,7 @@ msgstr "已登帐"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "贷方备注"
+msgstr "贷项单"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4933,7 +4933,7 @@ msgstr "创建"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "退税代码"
+msgstr "退税事务"
 
 #. module: account
 #: field:account.invoice.tax,name:0
@@ -5100,7 +5100,7 @@ msgstr "项信息"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "科目税代码模板"
+msgstr "税事务科目模板"
 
 #. module: account
 #: view:account.subscription:0
@@ -5352,7 +5352,7 @@ msgid ""
 "If the Tax account is tax code account, this field will contain the taxed "
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
-msgstr "如果这税科目是免税科目, 这字段将含税款. 如果这科目是基本税代码这字段将含基础金额(不含税)."
+msgstr "如果这税科目是税事务科目, 这字段将含税款. 如果这科目是基础税事务这字段将含基础金额(不含税)."
 
 #. module: account
 #: view:account.bank.statement:0
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index a66865fc194..05dc6a6d988 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-25 08:30+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"PO-Revision-Date: 2010-07-08 17:05+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -38,8 +38,8 @@ msgstr "Некорректный формат XML для структуры ви
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
+"Имя Объекта должно начинаться с x_ и не должно содержать специальных "
+"символов!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -64,7 +64,7 @@ msgstr "Последовательность"
 #. module: account_analytic_default
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr "Продукция"
+msgstr "Продукт"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index e2b6b150572..aca56357351 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:57+0000\n"
-"Last-Translator: Dmitry Klimanov <k-dmitry2@narod.ru>\n"
+"PO-Revision-Date: 2010-07-08 16:55+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "Счет 4 уровня"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
@@ -38,7 +38,7 @@ msgstr "Перекрестная аналитика"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "Счет 5 уровня"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
@@ -48,7 +48,7 @@ msgstr "Дата окончания"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "Ставка (%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -87,7 +87,7 @@ msgstr "№ плана"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "Шаблоны Аналитического Распределения"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -97,7 +97,7 @@ msgstr "Название счета"
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "Строка аналитического распределения"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
@@ -107,7 +107,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
@@ -117,7 +117,7 @@ msgstr "Название плана"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "Дата печати"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -137,7 +137,7 @@ msgstr "Выбор информаци"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "Счет 3 уровня"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
@@ -158,7 +158,7 @@ msgstr "Ссылка на счет аналитики"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Счет аналитики:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -196,7 +196,7 @@ msgstr "Мин. разрешено (%)"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "Счет 1 уровня"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -206,12 +206,12 @@ msgstr "Макс. разрешено (%)"
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid "Distribution Model Saved"
-msgstr ""
+msgstr "Распределительный шаблон сохранен"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "Образец аналитического плана счетов"
 
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
@@ -221,7 +221,7 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "Шаблоня распределения"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -261,7 +261,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "Управление несколькими планами аналитических счетов"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -282,7 +282,7 @@ msgstr "План модели"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "Счет 2 уровня"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -297,7 +297,7 @@ msgstr "Корневой счет для данного плана"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "счет 6 уровня"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -328,7 +328,7 @@ msgstr "Корневой счет"
 #: wizard_view:create.model,info:0
 msgid ""
 "This distribution model has been saved. You will be able to reuse it later."
-msgstr ""
+msgstr "Шаблон распределения сохранен. Теперь вы можете его использовать."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -347,12 +347,12 @@ msgstr "Счет аналитики"
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Аналитическое распределение"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
 msgid "Analytic Distribution's models"
-msgstr ""
+msgstr "Шаблон распределения аналитики"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,end:0
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index 9dab183e14f..84dcf0711c9 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 15:14+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-08 17:00+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Ответственный пользователь"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -30,28 +30,28 @@ msgstr "% эффективности"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr ""
+msgstr "Бюджетные статьи"
 
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Напечатано:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "Подтвердить"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Проверить пользователя"
 
 #. module: account_budget
 #: constraint:ir.model:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Подтверждено"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,period_id:0
@@ -87,7 +87,7 @@ msgstr "Дата вывода на печать"
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -99,7 +99,7 @@ msgstr "в"
 #. module: account_budget
 #: view:account.budget.post:0
 msgid "Dotations"
-msgstr ""
+msgstr "Дотации"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -121,7 +121,7 @@ msgstr "От"
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Проценты"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -131,7 +131,7 @@ msgstr "Результаты"
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr ""
+msgstr "Состояние"
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
@@ -173,12 +173,12 @@ msgstr "%"
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Счет аналитики:"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,report:0
@@ -205,20 +205,20 @@ msgstr "до"
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "Всего :"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "Запланированная сумма"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Проц.(%)"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -234,18 +234,18 @@ msgstr "Анализ бюджета"
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr ""
+msgstr "Выполнено"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Validate"
-msgstr ""
+msgstr "Проверить"
 
 #. module: account_budget
 #: wizard_view:wizard.crossovered.budget,init:0
 #: wizard_view:wizard.crossovered.budget.summary,init:0
 msgid "Select Options"
-msgstr ""
+msgstr "Выбрать опции"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -258,7 +258,7 @@ msgstr ""
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: account_budget
 #: constraint:ir.ui.view:0
@@ -318,30 +318,30 @@ msgstr "Сумма"
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Дата оплаты"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
 #: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
 #: model:ir.ui.menu,name:account_budget.next_id_31
 msgid "Budgets"
-msgstr ""
+msgstr "Бюджеты"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 #: model:ir.model,name:account_budget.model_account_budget_post_dotation
 msgid "Budget Dotation"
-msgstr ""
+msgstr "Бюджетная дотация"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 msgid "Budget Dotations"
-msgstr ""
+msgstr "Бюджетные дотации"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -353,7 +353,7 @@ msgstr ""
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "Бюджетная статья"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date1:0
@@ -369,7 +369,7 @@ msgstr "Начало периода"
 #: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
 msgid "Print Budgets"
-msgstr ""
+msgstr "Печать бюджетов"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -380,12 +380,12 @@ msgstr "Код"
 #. module: account_budget
 #: field:account.budget.post.dotation,tot_planned:0
 msgid "Total Planned Amount"
-msgstr ""
+msgstr "Запланировано всего"
 
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "Выберите даты периода"
 
 #. module: account_budget
 #: field:account.budget.post,dotation_ids:0
@@ -396,7 +396,7 @@ msgstr ""
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Теоретическая сумма"
 
 #. module: account_budget
 #: wizard_field:account.budget.spread,init,fiscalyear:0
@@ -406,12 +406,12 @@ msgstr "Учетный год"
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Счет аналитического учета"
 
 #. module: account_budget
 #: rml:crossovered.budget.report:0
 msgid "Budget :"
-msgstr ""
+msgstr "Бюджет:"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -430,7 +430,7 @@ msgstr "Счета"
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 msgid "Print Budget"
-msgstr ""
+msgstr "Печать бюджета"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -460,24 +460,24 @@ msgstr "Отмена"
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr ""
+msgstr "Управление бюджетом"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "Анализ с"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Проверено"
 
 #. module: account_budget
 #: wizard_view:account.budget.report,init:0
diff --git a/addons/account_coda/i18n/ru.po b/addons/account_coda/i18n/ru.po
new file mode 100644
index 00000000000..bc9d28b90ca
--- /dev/null
+++ b/addons/account_coda/i18n/ru.po
@@ -0,0 +1,168 @@
+# Russian 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-24 13:11+0000\n"
+"PO-Revision-Date: 2010-07-08 17:04+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
+"Language-Team: Russian <ru@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-09 03:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr "Журнал"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "_Закрыть"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Пользователь"
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра структуры!"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "_Далее"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 33407209b74..cc184cac539 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/i18n/ru.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* auction
+#	* auction
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 11:07+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-08 17:06+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -32,16 +32,19 @@ msgid "Set to draft"
 msgstr "Установить в 'Черновик'"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0 view:auction.lots:0
-#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0
+#: view:auction.lots:0
+#: xsl:report.auction.seller.list:0
+#: field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0
+#: field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Продавец"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -87,18 +90,23 @@ msgid "Deposit Form"
 msgstr "Форма депозита"
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0
+#: rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0
+#: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Покупатель"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0
+#: field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Кол-во объектов"
 
@@ -123,7 +131,8 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Антиквариат/ книги, манускрипты, и т.д"
 
 #. module: auction
-#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0
+#: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Граница депозита"
 
@@ -195,7 +204,8 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0
+#: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Номер списка"
 
@@ -230,7 +240,8 @@ msgid "Contemporary Art"
 msgstr "Современное искусство"
 
 #. module: auction
-#: view:auction.lots:0 view:report.unclassified.objects:0
+#: view:auction.lots:0
+#: view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ссылка"
 
@@ -250,7 +261,8 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0 field:report.buyer.auction,total_price:0
+#: view:auction.lots:0
+#: field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Общий рез-т"
 
@@ -260,7 +272,8 @@ msgid "Net margin (%)"
 msgstr "Чистая маржа (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -288,7 +301,9 @@ msgid "Seller Costs"
 msgstr "Стоимости продавца"
 
 #. module: auction
-#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -311,7 +326,8 @@ msgid "Contact"
 msgstr "Контакт"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0
+#: field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -352,7 +368,8 @@ msgid "Sold Objects"
 msgstr "Проданные объекты"
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Суммарная чистая маржа"
 
@@ -362,7 +379,9 @@ msgid "Deposit Border Form"
 msgstr "Форма границы депозита"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
+#: field:auction.bid,bid_lines:0
+#: rml:auction.bids:0
+#: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Заявка"
@@ -373,8 +392,10 @@ msgid "Langage"
 msgstr "Язык"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
-#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+#: view:auction.lots:0
+#: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Объект"
 
@@ -407,9 +428,11 @@ msgid "Auction buyer reporting form view"
 msgstr "Вид вормы отчета покупателя аукцциона"
 
 #. module: auction
-#: field:auction.dates,state:0 field:auction.lots,state:0
+#: field:auction.dates,state:0
+#: field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0
+#: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Статус"
@@ -425,7 +448,8 @@ msgid "Antique/Cartoons"
 msgstr "Antique/ Эскизы"
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -510,7 +534,8 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Покупатели"
 
@@ -732,7 +757,8 @@ msgid "Antique/Toys"
 msgstr "Антиквариат/ Игрушки"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Создано"
 
@@ -860,7 +886,8 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -895,7 +922,8 @@ msgid "API ID"
 msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "ID заявки"
 
@@ -948,13 +976,16 @@ msgid "Antique/Carpet and textilles"
 msgstr "Антиквариат/ ковры и текстиль"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0
+#: field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Рез-т"
 
 #. module: auction
-#: field:auction.lot.history,name:0 field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0
+#: field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0
+#: xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Дата"
@@ -995,12 +1026,14 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0 view:report.auction.view2:0
+#: view:auction.dates:0
+#: view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Аукционы"
 
@@ -1035,7 +1068,8 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0
+#: rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1083,7 +1117,8 @@ msgid "Detailed lots"
 msgstr "Подробные лоты"
 
 #. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Статистика объектов"
 
@@ -1098,7 +1133,8 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Отправить результаты на Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "№ по кат."
 
@@ -1142,7 +1178,8 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Подитог"
 
@@ -1158,7 +1195,8 @@ msgid "Invoice Number"
 msgstr "Номер счета"
 
 #. module: auction
-#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0
+#: field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1181,7 +1219,8 @@ msgid "Name"
 msgstr "Название"
 
 #. module: auction
-#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1209,7 +1248,8 @@ msgid "Login"
 msgstr "Учетная запись"
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
+#: xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "К оплате"
 
@@ -1229,7 +1269,8 @@ msgid "Seller Form"
 msgstr "Форма продавца"
 
 #. module: auction
-#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0
+#: field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Категория объекта"
 
@@ -1298,7 +1339,8 @@ msgid "Payment's history"
 msgstr "Журнал платежей"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Документ"
 
@@ -1370,7 +1412,8 @@ msgid "Cont. Art/Curiosa"
 msgstr "Совр. искусство/ Редкости"
 
 #. module: auction
-#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0
+#: field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1418,7 +1461,8 @@ msgid "Cont. Art/Jewelry"
 msgstr "Совр. искусство/ Ювелирные изделия"
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1428,7 +1472,8 @@ msgid "Next Auctions"
 msgstr "След. аукционы"
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
+#: xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "№"
 
@@ -1558,14 +1603,16 @@ msgid "Buyer Journal"
 msgstr "Книга покупателя"
 
 #. module: auction
-#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0
+#: xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Оплачено"
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Телефон"
 
@@ -1596,8 +1643,10 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Антиквариат/ Скульптура, бронза и т.п."
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Итого:"
 
@@ -1743,7 +1792,8 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,lot_id:0
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Объекты"
@@ -1765,9 +1815,12 @@ msgid "Allow Negative Amount"
 msgstr "Разрешить отрицательные суммы"
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Аукцион"
 
@@ -1777,12 +1830,17 @@ msgid "Cont. Art/Shows"
 msgstr "Совр. искусство/ Выставки"
 
 #. module: auction
-#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0
+#: field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0
+#: field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0
+#: field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0
+#: field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0
+#: field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Дата аукциона"
@@ -1934,7 +1992,8 @@ msgstr "Первый день экпозиции"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid "Warning, this will erase the object adjudication price and its buyer !"
+msgid ""
+"Warning, this will erase the object adjudication price and its buyer !"
 msgstr "Внимание, это удалит результат цены объекта и покупателя!"
 
 #. module: auction
@@ -1958,14 +2017,16 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0
+#: field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Чистая выручка"
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Лимит"
 
@@ -2037,7 +2098,8 @@ msgid "Closed"
 msgstr "Закрыто"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0
+#: field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Комиссия"
 
@@ -2057,7 +2119,8 @@ msgid "Employee"
 msgstr "Сотрудник"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Рез-т(EUR)"
 
@@ -2134,7 +2197,8 @@ msgid "Invoiced"
 msgstr "Выставлен счет"
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Забрано"
 
@@ -2171,7 +2235,8 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0 selection:auction.lots,state:0
+#: selection:auction.dates,state:0
+#: selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2200,7 +2265,8 @@ msgid "Adj"
 msgstr "Рез-т"
 
 #. module: auction
-#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0
+#: model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Даты аукциона"
 
@@ -2346,11 +2412,16 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0 xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0
+#: xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Описание"
 
@@ -2360,7 +2431,8 @@ msgid "Cont. Art/Arts"
 msgstr "Совр. искусство/ Ремесла"
 
 #. module: auction
-#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0
+#: field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Цена результата"
@@ -2422,7 +2494,8 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "Кол-во объектов"
 
@@ -2490,12 +2563,12 @@ msgstr "Заказы"
 #. module: auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr "Объекты по дням"
+msgstr ""
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_manager
 msgid "Auction Manager"
-msgstr "Менеджер аукциона"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
@@ -2505,7 +2578,7 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
 msgid "Auction Member"
-msgstr "Участник аукциона"
+msgstr ""
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
@@ -2515,7 +2588,7 @@ msgstr ""
 #. module: auction
 #: view:board.board:0
 msgid "Auction manager "
-msgstr "Менелжер аукциона "
+msgstr ""
 
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
@@ -2525,49 +2598,49 @@ msgstr ""
 #. module: auction
 #: view:board.board:0
 msgid "Estimations/Adjudication"
-msgstr "Оценка / Результат"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Total Adjudications"
-msgstr "Итоговые результаты"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Latest objects"
-msgstr "Новейшие объекты"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Latest deposits"
-msgstr "Новейшие депозиты"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Menu"
-msgstr "Меню"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "My objects By Day"
-msgstr "Мои объекты по дням"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "My board"
-msgstr "Моя панель"
+msgstr ""
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction_manager
 msgid "Auction manager board"
-msgstr "Панель менеджера аукциона"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "Min/Adj/Max"
-msgstr "Ми/Рез-т/Макс"
+msgstr ""
 
 #. module: auction
 #: view:board.board:0
 msgid "My Latest Objects"
-msgstr "Мои новейшие объекты"
+msgstr ""
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index f63312c6cb9..426fb570629 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-13 07:22+0000\n"
-"Last-Translator: grisha <Unknown>\n"
+"PO-Revision-Date: 2010-07-08 15:37+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Последовательность контакта"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "Контакт партнера"
 
 #. module: base_contact
 #: constraint:ir.model:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Функции партнера"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -52,12 +52,12 @@ msgstr "Контакты"
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Последовательность партнеров"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -72,32 +72,32 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Другое"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Функции контакта"
 
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Адрес партнера"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "Кол-во контактных лиц"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Дополнительное поле телефона"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
@@ -107,7 +107,7 @@ msgstr "Функция"
 #. module: base_contact
 #: field:res.partner.job,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Факс"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
@@ -137,7 +137,7 @@ msgstr "Функции контакта"
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 msgid "Base Contact"
-msgstr ""
+msgstr "Основной контакт"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_partner:0
@@ -145,6 +145,7 @@ msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
 msgstr ""
+"С учетом важности этой работы названия в списке Должность связанного партнера"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -155,7 +156,7 @@ msgstr "Эл. почта"
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Дата Остановки"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -167,7 +168,7 @@ msgstr "Адрес"
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Должность контакта"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
@@ -185,7 +186,7 @@ msgstr ""
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Основная должность"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -200,7 +201,7 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Определить партнеров и их адреса."
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
@@ -220,7 +221,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Расширение"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -230,12 +231,12 @@ msgstr "Моб. тел."
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Внутренний / внешний расширение телефонного номера"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Люди с которыми вы работает"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -246,7 +247,7 @@ msgstr "Доп. информация"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Функции и Адреса"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -261,7 +262,7 @@ msgstr "Контакт"
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Организации с которыми вы работаете"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -276,7 +277,7 @@ msgstr ""
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Контакты партнера"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -297,7 +298,7 @@ msgstr "Адреса"
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Рабочие и дополнительные адреса."
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -307,18 +308,18 @@ msgstr "Фамилия"
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr ""
+msgstr "Основной"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Прошлые"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -338,12 +339,12 @@ msgstr "Партнер"
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Определить функции и адреса"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 7b75130d154..fa5a414fe57 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 9ae7174550e..f93dd7758fe 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-04-14 03:53+0000\n"
-"Last-Translator: grisha <Unknown>\n"
+"PO-Revision-Date: 2010-07-08 16:42+0000\n"
+"Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Отправить"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Заголовок"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
@@ -55,7 +55,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 дней    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Название стадии"
 
 #. module: crm
 #: view:crm.case:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Количество"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -135,7 +135,7 @@ msgstr "Обычное или селекторное совещание по п
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Фиксированное"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -150,17 +150,17 @@ msgstr "Внимание!"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Пожалуйста, укажите адрес электронной почты пользователя!"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Кампания"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Поиск возможностей"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
@@ -238,7 +238,7 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Звонок"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
@@ -248,7 +248,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
 msgid "Mail to these emails"
-msgstr ""
+msgstr "Отправить этим адресатам"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -268,12 +268,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Отправить новое ел.-письмо"
 
 #. module: crm
 #: view:crm.case.history:0
 msgid "My Histories"
-msgstr ""
+msgstr "Мои истории"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -294,7 +294,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Исключения (даты)"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -314,7 +314,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Подписаться на удаленный календарь"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -326,7 +326,7 @@ msgstr "Категории"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: crm
 #: view:crm.case:0
@@ -352,12 +352,12 @@ msgstr ""
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Описание"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Имя контакта"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -378,7 +378,7 @@ msgstr "Тип задержки"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #. module: crm
 #: view:crm.job:0
@@ -434,7 +434,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr ""
+msgstr "Общение"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -444,7 +444,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Умер[ла]"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -460,7 +460,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Главная"
 
 #. module: crm
 #: field:crm.case,categ_id:0
@@ -491,7 +491,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Конфиденциальность"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -534,7 +534,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr ""
+msgstr "Открытые вопросы"
 
 #. module: crm
 #: field:crm.case.log,name:0
@@ -559,12 +559,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Диаграмма встреч"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -581,7 +581,7 @@ msgstr "Эскалировать"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Все встречи"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -600,7 +600,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -628,7 +628,7 @@ msgstr "Разрешить удаление"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
@@ -661,7 +661,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Сегодня   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -672,7 +672,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Категория вопроса"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -698,7 +698,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Назначено на"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -729,7 +729,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: crm
 #: view:crm.case:0
@@ -780,12 +780,12 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Все кандидаты"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Форма кандидатов"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -852,12 +852,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Эл.письма"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Телевидение"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -878,7 +878,7 @@ msgstr ""
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Продолжить"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -893,13 +893,13 @@ msgstr "Значение"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Сохранить в .ics вормате"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Сообщение"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -912,7 +912,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "Эксклюзивный"
 
 #. module: crm
 #: help:crm.case,categ_id:0
@@ -930,12 +930,12 @@ msgstr "Установить состояние в"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Эл.сообщения!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Радио"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
@@ -955,7 +955,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr ""
+msgstr "Поиск истории"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -994,7 +994,7 @@ msgstr "Закупаемое количество"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Направление"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1010,7 +1010,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1027,7 +1027,7 @@ msgstr "Правила"
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "План встреч"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
@@ -1038,7 +1038,7 @@ msgstr ""
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Нет ел. почты чтобы ответить!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1048,7 +1048,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Создать партнера"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1068,7 +1068,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Моб. тел."
 
 #. module: crm
 #: field:crm.case.rule,name:0
@@ -1084,7 +1084,7 @@ msgstr "Планируемые затраты"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_history
 msgid "Case history"
-msgstr ""
+msgstr "История вопроса"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
@@ -1094,12 +1094,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Мои встречи"
 
 #. module: crm
 #: field:crm.case.categ,name:0
 msgid "Case Category Name"
-msgstr ""
+msgstr "Имя Категории Вопросов"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
@@ -1140,7 +1140,7 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Встречи"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1165,12 +1165,12 @@ msgstr "Срок"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отмена"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Название категории"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1185,7 +1185,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of case"
-msgstr ""
+msgstr "Категория вопроса"
 
 #. module: crm
 #: field:crm.email.add.cc,subject:0
@@ -1194,7 +1194,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Тема"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
@@ -1253,7 +1253,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Печать"
 
 #. module: crm
 #: field:crm.case,som:0
@@ -1268,7 +1268,7 @@ msgstr "Мнение"
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: crm
 #: view:crm.job:0
@@ -1303,7 +1303,7 @@ msgstr "Дата создания"
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Встреча"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1338,7 +1338,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
 #: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
 msgid "Open cases"
-msgstr ""
+msgstr "Открытые вопросы"
 
 #. module: crm
 #: field:crm.case,stage_id:0
@@ -1348,7 +1348,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Стадия"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1378,7 +1378,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Стадии"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
@@ -1390,7 +1390,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Дата встречи"
 
 #. module: crm
 #: view:crm.job:0
@@ -1402,7 +1402,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Следующие встречи"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1418,17 +1418,17 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Подписаться"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
 msgid "Minimum Priority"
-msgstr ""
+msgstr "Минимальный приоритет"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
 msgid "Meeting Generic Wizard"
-msgstr ""
+msgstr "Мастер встреч"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
@@ -1438,7 +1438,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Сообщение..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@@ -1454,13 +1454,13 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr ""
+msgstr "выполнено"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Напоминание"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1473,7 +1473,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr ""
+msgstr "открыть"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
@@ -1484,7 +1484,7 @@ msgstr "Напомнить с вложением"
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Сайт"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
@@ -1506,13 +1506,13 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Фонды"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr ""
+msgstr "черновик"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
@@ -1602,7 +1602,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Область/штат"
 
 #. module: crm
 #: view:crm.case:0
@@ -1678,7 +1678,7 @@ msgstr "Общее описание"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Прочая информация"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1709,7 +1709,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "Электронная почта"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
@@ -1767,12 +1767,12 @@ msgstr "Название"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Стадия продаж"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Сигнал"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
@@ -1783,7 +1783,7 @@ msgstr ""
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Следующая встреча"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1796,7 +1796,7 @@ msgstr ""
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "Разрешить удалять вопросы не из черновиков"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
@@ -1806,7 +1806,7 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Учет ошибок"
 
 #. module: crm
 #: view:crm.case:0
@@ -1825,7 +1825,7 @@ msgstr "Действия"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
-msgstr ""
+msgstr "Высокая"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1855,12 +1855,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Веб"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Тип кампании"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1872,7 +1872,7 @@ msgstr "Вычисление мнения"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
@@ -1882,7 +1882,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "Истории"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
@@ -1900,7 +1900,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "Дерево кандидатов"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
@@ -1910,13 +1910,13 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Участник"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Ошибка ел. сообщения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1929,7 +1929,7 @@ msgstr ""
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные секции."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -1949,7 +1949,7 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Этот год"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -1982,7 +1982,7 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Общий календарь"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1992,7 +1992,7 @@ msgstr "Обратный адрес"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Вопросы по кандидату и типу"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2003,7 +2003,7 @@ msgstr "Минуты"
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Оценка доходов"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
@@ -2013,7 +2013,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
 msgid "Maximim Priority"
-msgstr ""
+msgstr "Максимальный приоритет"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
@@ -2042,7 +2042,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "Приостановлено"
 
 #. module: crm
 #: view:crm.case:0
@@ -2058,7 +2058,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Не изменен"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2072,7 +2072,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
 msgid "Case State"
-msgstr ""
+msgstr "Состояние вопроса"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2093,17 +2093,17 @@ msgstr "Приоритет"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Источник"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Расположение"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Режим оплаты"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2176,7 +2176,7 @@ msgstr ""
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Планируемая Дата"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2211,7 +2211,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
@@ -2221,7 +2221,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Эл.почта сотрудника"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
@@ -2231,17 +2231,17 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Описание работ"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Отмена встречи"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Вакансии"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2290,7 +2290,7 @@ msgstr "Шаблон письма для отправки"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2300,13 +2300,13 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Кандидаты"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Отправить эл. письмо"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
@@ -2316,7 +2316,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Кредитная карта"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2360,7 +2360,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Заметка"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,delay_close:0
@@ -2400,7 +2400,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr ""
+msgstr "отмена"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2414,7 +2414,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "События"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2470,7 +2470,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Телефонные звонки"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2487,17 +2487,17 @@ msgstr ""
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case History"
-msgstr ""
+msgstr "История вопроса"
 
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Телефон"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Чек"
 
 #. module: crm
 #: field:crm.case,active:0
@@ -2531,7 +2531,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2602,7 +2602,7 @@ msgstr ""
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "Кому"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2612,7 +2612,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Продажи"
 
 #. module: crm
 #: view:crm.case:0
@@ -2623,18 +2623,18 @@ msgstr "Общий"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Назначен"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Повторно используется"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Другое"
 
 #. module: crm
 #: view:crm.case:0
@@ -2644,7 +2644,7 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2654,7 +2654,7 @@ msgstr "Макс. интервал"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "Все возможные сделки"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2725,18 +2725,18 @@ msgstr "Ответственный"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Неверное значение"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Выбрать совещание"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Календарь встреч"
 
 #. module: crm
 #: view:crm.case:0
@@ -2750,6 +2750,8 @@ msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
 msgstr ""
+"Вы не можете эскалировать этот вопрос.\n"
+"Вы уже на верхнем уровне."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2775,7 +2777,7 @@ msgstr ""
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "Вы уверены, что хотите создать партнера на основе этого кандидата?"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
@@ -2798,12 +2800,12 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Этот месяц"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Доступность (недели)"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -2830,7 +2832,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Эл. адрес (e-mail):"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2847,7 +2849,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Действие сервера"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
@@ -2863,7 +2865,7 @@ msgstr "Ответственный пользователь"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "Ел. письмо не отправлено!"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
@@ -2920,17 +2922,17 @@ msgstr ""
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Назначить на"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Последнее действие"
 
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Продолжительность"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
@@ -2950,7 +2952,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
-msgstr ""
+msgstr "Все вопросы"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
@@ -2961,7 +2963,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "Источник кандидата"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -2990,7 +2992,7 @@ msgstr "Сегментация"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Источник финансирования"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3006,12 +3008,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Организация"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "В процессе"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3046,12 +3048,12 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Хорошо"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Имя файла"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3081,7 +3083,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Все запросы на выполнение работ"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3093,7 +3095,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: crm
 #: view:crm.job:0
@@ -3125,7 +3127,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Импорт ICS"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3189,12 +3191,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Создать"
 
 #. module: crm
 #: field:crm.case,description:0
 msgid "Your action"
-msgstr ""
+msgstr "Ваши действия"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
@@ -3223,12 +3225,12 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Reminders (includes the content of the case)"
-msgstr ""
+msgstr "Напоминания по электронной почте (включают содержание вропроса)"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "Вопросы по кандидату и этапу"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
@@ -3248,7 +3250,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Отчетность"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3279,7 +3281,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Ожидаемая зарплата"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3289,12 +3291,12 @@ msgstr "Настройки"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "Послать новое ел.письмо"
 
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Недопустимые аргументы"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
@@ -3304,7 +3306,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "Мои дела"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
@@ -3326,7 +3328,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Запланировано"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
@@ -3374,7 +3376,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -3394,7 +3396,7 @@ msgstr "Отправить письмо партнеру"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Диаграмма финансирования"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3411,12 +3413,12 @@ msgstr ""
 #: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
-msgstr ""
+msgstr "Календарь"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Менеджер продаж"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
@@ -3438,7 +3440,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Запланировать встречу"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
@@ -3462,7 +3464,7 @@ msgstr "Занести в журнал"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Подтверждено"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3549,7 +3551,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
@@ -3564,7 +3566,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
@@ -3585,7 +3587,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Запланировать телефонный звонок"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3600,12 +3602,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Договор"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -3634,7 +3636,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "Назначить"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
@@ -3644,7 +3646,7 @@ msgstr "Контакт партнера"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Офис"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
@@ -3694,12 +3696,12 @@ msgstr "Код секции"
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "Дата проведения встречи"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "КОНФИДЕНЦИАЛЬНО"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
@@ -3715,7 +3717,7 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "Сотрудник"
 
 #. module: crm
 #: field:crm.case,email_from:0
@@ -3746,12 +3748,12 @@ msgstr "Описание"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние примечания"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
@@ -3769,7 +3771,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "Копия"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3779,7 +3781,7 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "_Импортировать"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3796,7 +3798,7 @@ msgstr ""
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
 msgid "Case"
-msgstr ""
+msgstr "Вопрос"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3812,14 +3814,14 @@ msgstr "Самый низкий"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Запланировать встречу"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3837,7 +3839,7 @@ msgstr ""
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Массовая рассылка"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3850,17 +3852,17 @@ msgstr ""
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Наличные"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Фонды по категориям"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -3873,12 +3875,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "Будущие"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index c1bd706724c..9806d77140a 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index cb7d582f540..8b9ce974399 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 5d6ae3dee46..6c87d0f6fa1 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product_visible_discount/i18n/et.po b/addons/product_visible_discount/i18n/et.po
new file mode 100644
index 00000000000..70b8597c8c6
--- /dev/null
+++ b/addons/product_visible_discount/i18n/et.po
@@ -0,0 +1,47 @@
+# Estonian 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-08 08:45+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"Language-Team: Estonian <et@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-09 03:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. 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 "Nähtavad soodus"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 899e627982c..e64f33b58f8 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index 10329e8d4b9..ff219776722 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki

From e216fa70544d1ebdcd020c28d656385932c0625a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 9 Jul 2010 10:24:54 +0530
Subject: [PATCH 57/57] [IMP]: accounting and related improvements

bzr revid: mga@tinyerp.com-20100709045454-oex2wcpshaecp85r
---
 addons/account/account.py                     |  17 +-
 addons/account/account_menuitem.xml           |   2 +-
 addons/account/account_view.xml               |  65 +-
 .../crossovered_budget_demo.xml               | 652 +++++++++---------
 .../account_followup_view.xml                 |   2 +-
 addons/account_voucher/voucher.py             |  19 +-
 addons/account_voucher/voucher_view.xml       |  18 +-
 addons/account_voucher/voucher_workflow.xml   |   8 +-
 .../account_voucher_payment.py                |  10 +-
 addons/l10n_ch/demo/vaudtax_data_demo.xml     | 158 +++--
 10 files changed, 491 insertions(+), 460 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 322d77eced9..73e1fdd0b7e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2413,6 +2413,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_acc_template = self.pool.get('account.account.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
+        data_pool = self.pool.get('ir.model.data')
 
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
@@ -2523,7 +2524,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Creating Journals
         vals_journal={}
-        view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0]
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data = data_pool.browse(cr, uid, data_id[0])
+        view_id = data.res_id
+        
         seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
 
         if obj_multi.seq_journal:
@@ -2560,8 +2564,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Bank Journals
-        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: why put  fix name
-        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fix name
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
+        data = data_pool.browse(cr, uid, data_id[0])
+        view_id_cash = data.res_id
+        #view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: why put  fix name
+        
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
+        data = data_pool.browse(cr, uid, data_id[0])
+        ref_acc_bank = data.res_id
+        #ref_acc_bank = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fix name
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 56d83debe4c..e0ac10abb50 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -8,7 +8,7 @@
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
-            <menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
+            <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
             <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
             <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index daae3043a41..80fb20e1fad 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -358,14 +358,11 @@
                                 <separator string="Validations" colspan="4"/>
                                 <field name="allow_date" groups="base.group_extended"/>
                             </group>
-
                             <group colspan="2" col="2">
                                 <separator string="Other Configuration" colspan="4"/>
                                 <field name="centralisation" groups="base.group_extended"/>
                                 <field name="entry_posted"/>
-                                 <field name="update_posted"/> 
                             </group>
-                            
                             <group colspan="2" col="2">
                                 <separator string="Invoicing Data" colspan="4"/>
                                 <field name="invoice_sequence_id" groups="base.group_extended"/>
@@ -1130,10 +1127,6 @@
                         <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
-                    <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
-                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
-                    </group>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
@@ -1179,15 +1172,21 @@
             src_model="account.move"/>
 
         <record id="action_move_to_review" model="ir.actions.act_window">
-            <field name="name">Journal Entries to Review</field>
+            <field name="name">Journal Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
-            <field name="domain">[('to_check','=',True)]</field>
+            <field name="domain">[('to_check','=',True), ('state','=','draft')]</field>
         </record>
-        <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
+        
+        <menuitem 
+            action="action_move_to_review" 
+            id="menu_action_move_to_review" 
+            parent="periodical_processing_journal_entries_validation"
+        />
+        
 <!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
 <!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
@@ -1553,7 +1552,7 @@
 <!--                        <field name="date" select='1'/>-->
 <!--                        <field name="account_id" select='1'/>-->
 <!--                        <field name="partner_id" select='1'>-->
-<!--                        	<filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>-->
+<!--                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>-->
 <!--                        </field>-->
 <!--                        <field name="balance" string="Debit/Credit" select='1'/>-->
 <!--                    </group>-->
@@ -1842,17 +1841,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
-                	<group>
-                		<filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
-                     	<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                     	<separator orientation="vertical"/>
-                     	<field name="code"/>
+                    <group>
+                        <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                         <separator orientation="vertical"/>
+                         <field name="code"/>
                         <field name="parent_id"/>
                         <field name="type"/>
                         <field name="user_type"/>
-                	</group>
-                	<newline/>
-                	<group expand="0" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Internal Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
                    </group>
@@ -1878,7 +1877,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Chart of Accounts Template">
-                	<group>
+                    <group>
                     <field name="name"/>
                     <field name="account_root_id"/>
                     <field name="bank_account_view_id"/>
@@ -1903,19 +1902,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                	  <group>
-                	  	<field name="name"/>
-    	                <field name="account_root_id"/>
-	                    <field name="bank_account_view_id"/>
-                	  </group>
-                	  <newline/>
+                      <group>
+                          <field name="name"/>
+                        <field name="account_root_id"/>
+                        <field name="bank_account_view_id"/>
+                      </group>
+                      <newline/>
                       <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-blue" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
                         <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
-						<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
                         <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
                       </group>
@@ -2060,20 +2059,20 @@
             </field>
         </record>
 
-		<record id="view_tax_code_template_search" model="ir.ui.view">
+        <record id="view_tax_code_template_search" model="ir.ui.view">
             <field name="name">account.tax.code.template.search</field>
             <field name="model">account.tax.code.template</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search tax template">
-                	<group>
-	                	<field name="name"/>
-	                    <field name="code"/>
-	                    <field name="parent_id"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="parent_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    	<filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account_budget/crossovered_budget_demo.xml b/addons/account_budget/crossovered_budget_demo.xml
index 8e9ba6a9493..7c4c6e3ea15 100644
--- a/addons/account_budget/crossovered_budget_demo.xml
+++ b/addons/account_budget/crossovered_budget_demo.xml
@@ -2,337 +2,337 @@
 <openerp>
 
     <!-- Budgetary Positions -->
-	<data noupdate="1">
-		<record id="account_budget_post_sales0" model="account.budget.post">
-			<field eval="&quot;&quot;&quot;Sales&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;SAL&quot;&quot;&quot;" name="code"/>
-			<field eval="[(6,0,[ref('account.a_sale')])]" name="account_ids"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="account_budget_post_purchase0" model="account.budget.post">
-			<field eval="&quot;&quot;&quot;Purchases&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;PUR&quot;&quot;&quot;" name="code"/>
-			<field eval="[(6,0,[ref('account.a_expense')])]" name="account_ids"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="account_budget_post_sales0" model="account.budget.post">
+            <field eval="&quot;&quot;&quot;Sales&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;SAL&quot;&quot;&quot;" name="code"/>
+            <field eval="[(6,0,[ref('account.a_sale')])]" name="account_ids"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="account_budget_post_purchase0" model="account.budget.post">
+            <field eval="&quot;&quot;&quot;Purchases&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;PUR&quot;&quot;&quot;" name="code"/>
+            <field eval="[(6,0,[ref('account.a_expense')])]" name="account_ids"/>
+        </record>
+    </data>
 
     <!-- Budgetary Dotations -->
-	<data noupdate="1">
-		<record id="account_budget_post_dot1" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_1"/>
-		</record>
-		<record id="account_budget_post_dot2" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_2"/>
-		</record>
-		<record id="account_budget_post_dot3" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_3"/>
-		</record>
-		<record id="account_budget_post_dot4" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_4"/>
-		</record>
-		<record id="account_budget_post_dot5" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_5"/>
-		</record>
-		<record id="account_budget_post_dot6" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_6"/>
-		</record>
-		<record id="account_budget_post_dot7" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_7"/>
-		</record>
-		<record id="account_budget_post_dot8" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_8"/>
-		</record>
-		<record id="account_budget_post_dot9" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_9"/>
-		</record>
-		<record id="account_budget_post_dot10" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_10"/>
-		</record>
-		<record id="account_budget_post_dot11" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_11"/>
-		</record>
-		<record id="account_budget_post_dot12" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="5000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_sales0"/>
-			<field name="period_id" ref="account.period_12"/>
-		</record>
+    <data noupdate="1">
+        <record id="account_budget_post_dot1" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_1"/>
+        </record>
+        <record id="account_budget_post_dot2" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_2"/>
+        </record>
+        <record id="account_budget_post_dot3" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_3"/>
+        </record>
+        <record id="account_budget_post_dot4" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_4"/>
+        </record>
+        <record id="account_budget_post_dot5" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_5"/>
+        </record>
+        <record id="account_budget_post_dot6" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_6"/>
+        </record>
+        <record id="account_budget_post_dot7" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_7"/>
+        </record>
+        <record id="account_budget_post_dot8" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_8"/>
+        </record>
+        <record id="account_budget_post_dot9" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_9"/>
+        </record>
+        <record id="account_budget_post_dot10" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_10"/>
+        </record>
+        <record id="account_budget_post_dot11" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_11"/>
+        </record>
+        <record id="account_budget_post_dot12" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="5000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_sales0"/>
+            <field name="period_id" ref="account.period_12"/>
+        </record>
 
-		<record id="account_budget_post_dot_pur1" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_1"/>
-		</record>
-		<record id="account_budget_post_dot_pur2" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_2"/>
-		</record>
-		<record id="account_budget_post_dot_pur3" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_3"/>
-		</record>
-		<record id="account_budget_post_dot_pur4" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_4"/>
-		</record>
-		<record id="account_budget_post_dot_pur5" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_5"/>
-		</record>
-		<record id="account_budget_post_dot_pur6" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_6"/>
-		</record>
-		<record id="account_budget_post_dot_pur7" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_7"/>
-		</record>
-		<record id="account_budget_post_dot_pur8" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_8"/>
-		</record>
-		<record id="account_budget_post_dot_pur9" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_9"/>
-		</record>
-		<record id="account_budget_post_dot_pur10" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_10"/>
-		</record>
-		<record id="account_budget_post_dot_pur11" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_11"/>
-		</record>
-		<record id="account_budget_post_dot_pur12" model="account.budget.post.dotation">
-			<field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
-			<field eval="-2000" name="amount"/>
-			<field name="post_id" ref="account_budget_post_purchase0"/>
-			<field name="period_id" ref="account.period_12"/>
-		</record>
-	</data>
+        <record id="account_budget_post_dot_pur1" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_1"/>
+        </record>
+        <record id="account_budget_post_dot_pur2" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_2"/>
+        </record>
+        <record id="account_budget_post_dot_pur3" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_3"/>
+        </record>
+        <record id="account_budget_post_dot_pur4" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_4"/>
+        </record>
+        <record id="account_budget_post_dot_pur5" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_5"/>
+        </record>
+        <record id="account_budget_post_dot_pur6" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_6"/>
+        </record>
+        <record id="account_budget_post_dot_pur7" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_7"/>
+        </record>
+        <record id="account_budget_post_dot_pur8" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_8"/>
+        </record>
+        <record id="account_budget_post_dot_pur9" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_9"/>
+        </record>
+        <record id="account_budget_post_dot_pur10" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_10"/>
+        </record>
+        <record id="account_budget_post_dot_pur11" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_11"/>
+        </record>
+        <record id="account_budget_post_dot_pur12" model="account.budget.post.dotation">
+            <field eval="&quot;&quot;&quot;/&quot;&quot;&quot;" name="name"/>
+            <field eval="-2000" name="amount"/>
+            <field name="post_id" ref="account_budget_post_purchase0"/>
+            <field name="period_id" ref="account.period_12"/>
+        </record>
+    </data>
 
     <!-- Budgets -->
-	<data noupdate="1">
-		<record id="crossovered_budget_budgetoptimistic0" model="crossovered.budget">
-			<field eval="&quot;&quot;&quot;+2008&quot;&quot;&quot;" name="code"/>
-			<field eval="&quot;&quot;&quot;Budget 2008: Optimistic&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-			<field name="creating_user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crossovered_budget_budgetpessimistic0" model="crossovered.budget">
-			<field eval="&quot;&quot;&quot;-2008&quot;&quot;&quot;" name="code"/>
-			<field eval="&quot;&quot;&quot;Budget 2008: Pessimistic&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-			<field name="creating_user_id" ref="base.user_root"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="crossovered_budget_budgetoptimistic0" model="crossovered.budget">
+            <field eval="&quot;&quot;&quot;+2011&quot;&quot;&quot;" name="code"/>
+            <field eval="&quot;&quot;&quot;Budget 2011: Optimistic&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field name="creating_user_id" ref="base.user_root"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crossovered_budget_budgetpessimistic0" model="crossovered.budget">
+            <field eval="&quot;&quot;&quot;-2011&quot;&quot;&quot;" name="code"/>
+            <field eval="&quot;&quot;&quot;Budget 2011: Pessimistic&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+            <field name="creating_user_id" ref="base.user_root"/>
+        </record>
+    </data>
 
     <!-- Budget lines -->
-	<data noupdate="1">
-		<record id="crossovered_budget_lines_0" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_consultancy"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-500.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_1" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_consultancy"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-250.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_2" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_consultancy"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="500.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_3" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_consultancy"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-07&quot;&quot;&quot;" name="date_from"/>
-			<field eval="900.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_4" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_consultancy"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="300.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-06&quot;&quot;&quot;" name="date_to"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crossovered_budget_lines_5" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-09-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="375.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-03&quot;&quot;&quot;" name="paid_date"/>
-			<field eval="&quot;&quot;&quot;2208-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_6" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-09-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-150.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_7" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-09-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="375.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-03&quot;&quot;&quot;" name="paid_date"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crossovered_budget_lines_8" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2009-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-7500.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_9" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-5000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_10" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-2000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_11" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="20000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2010-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_12" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="20000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crossovered_budget_lines_13" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-3000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_14" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
-			<field name="general_budget_id" ref="account_budget_post_purchase0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="-1000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_15" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="10000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-		<record id="crossovered_budget_lines_16" model="crossovered.budget.lines">
-			<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
-			<field name="general_budget_id" ref="account_budget_post_sales0"/>
-			<field eval="&quot;&quot;&quot;2008-01-01&quot;&quot;&quot;" name="date_from"/>
-			<field eval="10000.0" name="planned_amount"/>
-			<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-			<field eval="&quot;&quot;&quot;2008-12-31&quot;&quot;&quot;" name="date_to"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="crossovered_budget_lines_0" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-500.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_1" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-250.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_2" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="500.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_3" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-07&quot;&quot;&quot;" name="date_from"/>
+            <field eval="900.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_4" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="300.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-06&quot;&quot;&quot;" name="date_to"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crossovered_budget_lines_5" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-09-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="375.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-03&quot;&quot;&quot;" name="paid_date"/>
+            <field eval="&quot;&quot;&quot;2208-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_6" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-09-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-150.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_7" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-09-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="375.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-03&quot;&quot;&quot;" name="paid_date"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crossovered_budget_lines_8" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2009-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-7500.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_9" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-5000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_10" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-2000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_11" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="20000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2010-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_12" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="20000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2009-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crossovered_budget_lines_13" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-3000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_14" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="general_budget_id" ref="account_budget_post_purchase0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="-1000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_15" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="10000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+        <record id="crossovered_budget_lines_16" model="crossovered.budget.lines">
+            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="general_budget_id" ref="account_budget_post_sales0"/>
+            <field eval="&quot;&quot;&quot;2011-01-01&quot;&quot;&quot;" name="date_from"/>
+            <field eval="10000.0" name="planned_amount"/>
+            <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
+            <field eval="&quot;&quot;&quot;2011-12-31&quot;&quot;&quot;" name="date_to"/>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 50c1cb5df34..82e3450163a 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -153,8 +153,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="overdue_msg" nolabel="1" colspan ="4" position="after">
-                    <separator string="Follow-up Message" colspan="4"/>
                     <field name="follow_up_msg" nolabel="1" colspan ="4"/>
+                    <separator string="Follow-up Message" colspan="4"/>
                 </field>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 00d12f8063b..13df5a496fc 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -212,9 +212,21 @@ class account_voucher(osv.osv):
         self.write(cr, uid, ids, {'state':'posted'})
         return True
     
-    def action_cancel_draft(self, cr, uid, ids, *args):
+    def action_cancel_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
+    
+    def audit_pass(self, cr, uid, ids, context={}):
+        move_pool = self.pool.get('account.move')
+        result = True
+        audit_pass = []
+        for voucher in self.browse(cr, uid, ids):
+            if voucher.move_id and voucher.move_id.state == 'draft':
+                result = result and move_pool.button_validate(cr, uid, [voucher.move_id.id])
+            audit_pass += [voucher.id]
+        
+        self.write(cr, uid, audit_pass, {'state':'audit'})
+        return result
         
     def cancel_voucher(self, cr, uid, ids, context={}):
         move_pool = self.pool.get('account.move')
@@ -258,7 +270,6 @@ class account_voucher(osv.osv):
             
             company_currency = inv.company_id.currency_id.id
             diff_currency_p = inv.currency_id.id <> company_currency
-            ref = inv.reference
             
             journal = journal_pool.browse(cr, uid, inv.journal_id.id)
             if journal.sequence_id:
@@ -289,7 +300,7 @@ class account_voucher(osv.osv):
                 'journal_id': inv.journal_id.id,
                 'period_id': inv.period_id.id,
                 'partner_id': False,
-                'ref': ref,
+                'ref': inv.reference,
                 'date': inv.date
             }
             if diff_currency_p:
@@ -318,7 +329,7 @@ class account_voucher(osv.osv):
                      'journal_id': inv.journal_id.id,
                      'period_id': inv.period_id.id,
                      'partner_id': line.partner_id.id or False,
-                     'ref': ref,
+                     'ref': line.ref,
                      'date': inv.date,
                      'analytic_account_id': False
                 }
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 1d9d1e6a8d0..658b8f8429b 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -199,12 +199,28 @@
         </record>
 
         <act_window
-            domain="[('journal_id', '=', active_id)]"
+            domain="[('journal_id','=',active_id)]"
             id="act_journal_voucher_open"
             name="Voucher Entries"
             context="{'journal_id': active_id, 'type':type}"
             res_model="account.voucher"
             src_model="account.journal"/>
+        
+        <record model="ir.actions.act_window" id="action_review_voucher_list">
+            <field name="name">Vouchers Entries</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('state','=','posted')]</field>
+            <field name="context">{'state':'posted'}</field>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
+        </record>
 
+        <menuitem 
+            id="menu_action_review_voucher_list"
+            action="action_review_voucher_list" 
+            parent="account.periodical_processing_journal_entries_validation" sequence="2"/>
+        
         </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index 091e84cfd88..f1444761c48 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -18,16 +18,14 @@
         <record id="act_proforma" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">proforma</field>
-            <field name="action">write({'state':'proforma'})
-            open_voucher()</field>
+            <field name="action">open_voucher()</field>
             <field name="kind">function</field>
         </record>
         
         <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">done</field>
-            <field name="action">write({'state':'posted'})
-            proforma_voucher()</field>
+            <field name="action">proforma_voucher()</field>
             <field name="kind">function</field>
         </record>
         
@@ -48,7 +46,7 @@
         <record id="act_audit" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">audit</field>
-            <field name="action">write({'state':'audit'})</field>
+            <field name="action">audit_pass()</field>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
         </record>
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 39c67787157..f2c6507181c 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -53,8 +53,7 @@ class account_voucher(osv.osv):
             
             company_currency = inv.company_id.currency_id.id
             diff_currency_p = inv.currency_id.id <> company_currency
-            ref = inv.reference
-            
+
             journal = journal_pool.browse(cr, uid, inv.journal_id.id)
             if journal.sequence_id:
                 name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
@@ -84,7 +83,7 @@ class account_voucher(osv.osv):
                 'journal_id': inv.journal_id.id,
                 'period_id': inv.period_id.id,
                 'partner_id': False,
-                'ref': ref,
+                'ref': inv.reference,
                 'date': inv.date
             }
             if diff_currency_p:
@@ -113,7 +112,7 @@ class account_voucher(osv.osv):
                      'journal_id': inv.journal_id.id,
                      'period_id': inv.period_id.id,
                      'partner_id': line.partner_id.id or False,
-                     'ref': ref,
+                     'ref': line.ref,
                      'date': inv.date,
                      'analytic_account_id': False
                 }
@@ -198,7 +197,8 @@ class account_voucher_line(osv.osv):
             
             res.update({
                 'amount': residual,
-                'account_id': invoice.account_id.id
+                'account_id': invoice.account_id.id,
+                'ref':invoice.number
             })
             
         return {
diff --git a/addons/l10n_ch/demo/vaudtax_data_demo.xml b/addons/l10n_ch/demo/vaudtax_data_demo.xml
index 1da57c59ff4..cf00001a81b 100644
--- a/addons/l10n_ch/demo/vaudtax_data_demo.xml
+++ b/addons/l10n_ch/demo/vaudtax_data_demo.xml
@@ -1,88 +1,84 @@
 <openerp>
 <data noupdate="1">
 
-		<record id="bank" model="res.partner">
-				<field name="comment">My bank !</field>
-				<field name="ref">banq</field>
-				<field name="name">Banque</field>
-				<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-		</record>
-			<record id="res_partner_address_bank1" model="res.partner.address">
-				<field name="fax">+41 31 622 13 00</field>
-				<field name="name">Marc Dufour</field>
-				<field name="zip">1015</field>
-				<field name="city">Lausanne</field>
-				<field name="partner_id" ref="bank"/>
-				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
-				<field name="title">M.</field>
-				<field name="email">tinyerp@bank.com</field>
-				<field name="phone">+41 24 620 10 12</field>
-				<field name="street">PSE-C</field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
+        <record id="bank" model="res.partner">
+                <field name="comment">My bank !</field>
+                <field name="ref">banq</field>
+                <field name="name">Banque</field>
+                <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
+        </record>
+        <record id="res_partner_address_bank1" model="res.partner.address">
+            <field name="fax">+41 31 622 13 00</field>
+            <field name="name">Marc Dufour</field>
+            <field name="zip">1015</field>
+            <field name="city">Lausanne</field>
+            <field name="partner_id" ref="bank"/>
+            <field name="country_id" model="res.country" search="[('code','=','ch')]"/>
+            <field name="email">tinyerp@bank.com</field>
+            <field name="phone">+41 24 620 10 12</field>
+            <field name="street">PSE-C</field>
+            <field name="active">1</field>
+            <field name="type">default</field>
+        </record>
 
-		<record id="prolibre" model="res.partner">
-			<field name="comment">Very good company!
-			They provides a very high quality service.</field>
-			<field name="ref">ProL</field>
-			<field name="website">http://camptocamp.com</field>
-			<field name="name">ProLibre</field>
-			<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-		</record>
+        <record id="prolibre" model="res.partner">
+            <field name="comment">Very good company!
+            They provides a very high quality service.</field>
+            <field name="ref">ProL</field>
+            <field name="website">http://camptocamp.com</field>
+            <field name="name">ProLibre</field>
+            <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
+        </record>
 
-		<record id="camptocamp" model="res.partner">
-			<field name="comment">Very good company!
-			They provides a very high quality service.</field>
-			<field name="ref">c2c</field>
-			<field name="website">http://camptocamp.com</field>
-			<field name="name">camptocamp SA</field>
-			<field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-		</record>
-				<!--
-				Resource: res.partner.address
-				-->
+        <record id="camptocamp" model="res.partner">
+            <field name="comment">Very good company!
+            They provides a very high quality service.</field>
+            <field name="ref">c2c</field>
+            <field name="website">http://camptocamp.com</field>
+            <field name="name">camptocamp SA</field>
+            <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
+        </record>
+                <!--
+                Resource: res.partner.address
+                -->
 
-			<record id="res_partner_address_1" model="res.partner.address">
-				<field name="fax">+41 21 619 10 00</field>
-				<field name="name">Luc Maurer</field>
-				<field name="zip">1015</field>
-				<field name="city">Lausanne</field>
-				<field name="partner_id" ref="camptocamp"/>
-				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
-				<field name="title">M.</field>
-				<field name="email">tinyerp@camptocamp.com</field>
-				<field name="phone">+41 21 619 10 12</field>
-				<field name="street">PSE-A, EPFL</field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
-			<record id="res_partner_address_2" model="res.partner.address">
-				<field name="name">Gilbert Robert</field>
-				<field name="zip">1227</field>
-				<field name="city">Carouge</field>
-				<field name="partner_id" ref="prolibre"/>
-				<field name="country_id" model="res.country" search="[('code','=','ch')]"/>
-				<field name="title">M.</field>
-				<field name="email">info@prolibre.com</field>
-				<field name="phone">+41 22 3015383</field>
-				<field name="street">18, rue des Moraines </field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
-			<record id="res_partner_address_3" model="res.partner.address">
-				<field name="fax">+41 21 619 10 00</field>
-				<field name="name">Claude Philipona</field>
-				<field name="zip">1015</field>
-				<field name="city">Lausanne</field>
-				<field name="partner_id" ref="camptocamp"/>
-				<field name="country_id" model="res.country" search="[('name','=','Switzerland')]"/>
-				<field name="title">M.</field>
-				<field name="email">tinyerp@camptocamp.com</field>
-				<field name="phone">+41 21 619 10 12 </field>
-				<field name="street">PSE-A, EPFL</field>
-				<field name="active">1</field>
-				<field name="type">default</field>
-			</record>
-</data>
+        <record id="res_partner_address_1" model="res.partner.address">
+            <field name="fax">+41 21 619 10 00</field>
+            <field name="name">Luc Maurer</field>
+            <field name="zip">1015</field>
+            <field name="city">Lausanne</field>
+            <field name="partner_id" ref="camptocamp"/>
+            <field name="country_id" model="res.country" search="[('code','=','ch')]"/>
+            <field name="email">tinyerp@camptocamp.com</field>
+            <field name="phone">+41 21 619 10 12</field>
+            <field name="street">PSE-A, EPFL</field>
+            <field name="active">1</field>
+            <field name="type">default</field>
+        </record>
+        <record id="res_partner_address_2" model="res.partner.address">
+            <field name="name">Gilbert Robert</field>
+            <field name="zip">1227</field>
+            <field name="city">Carouge</field>
+            <field name="partner_id" ref="prolibre"/>
+            <field name="country_id" model="res.country" search="[('code','=','ch')]"/>
+            <field name="email">info@prolibre.com</field>
+            <field name="phone">+41 22 3015383</field>
+            <field name="street">18, rue des Moraines </field>
+            <field name="active">1</field>
+            <field name="type">default</field>
+        </record>
+        <record id="res_partner_address_3" model="res.partner.address">
+            <field name="fax">+41 21 619 10 00</field>
+            <field name="name">Claude Philipona</field>
+            <field name="zip">1015</field>
+            <field name="city">Lausanne</field>
+            <field name="partner_id" ref="camptocamp"/>
+            <field name="country_id" model="res.country" search="[('name','=','Switzerland')]"/>
+            <field name="email">tinyerp@camptocamp.com</field>
+            <field name="phone">+41 21 619 10 12 </field>
+            <field name="street">PSE-A, EPFL</field>
+            <field name="active">1</field>
+            <field name="type">default</field>
+        </record>
+    </data>
 </openerp>