From 91e1d6b44548673d8649ce768ba9a0768d4b04a2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 14 Sep 2010 11:27:48 +0530
Subject: [PATCH 001/118] =?UTF-8?q?[IMP]:=20account:=20Chart=20of=20accoun?=
 =?UTF-8?q?t=20is=20linked=20to=20the=20country=20user=20set=20in=20main?=
 =?UTF-8?q?=20company=20setup.=20If=20user=20put=20Belgium,=20the=20chart?=
 =?UTF-8?q?=20of=20account=20is=20belgium=20plan=20compatble=20normalis?=
 =?UTF-8?q?=C3=A9.=20If=20user=20set=20a=20country=20for=20which=20there?=
 =?UTF-8?q?=20is=20not=20chart=20of=20account,=20it=20is=20Generic=20chart?=
 =?UTF-8?q?=20of=20account=20by=20default.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: rpa@tinyerp.com-20100914055748-ku2ybuu9hat3bh4j
---
 addons/account/installer.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index ef3ac72a261..6290dae7875 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -73,6 +73,21 @@ class account_installer(osv.osv_memory):
             return user.company_id.id
         return False
 
+    def _get_default_charts(self, cr, uid, context={}):
+        module_name = False
+        company_id = self._default_company(cr, uid, context=context)
+        company = self.pool.get('res.company').browse(cr, uid, company_id)
+        address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id])
+        if address_id['default']:
+            address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'])
+            code = address.country_id.code
+            module_name = (code and 'l10n_' + code.lower()) or False
+        if module_name:
+            module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)])
+            if module_id:
+                return module_name
+        return 'configurable'
+
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
@@ -80,7 +95,8 @@ class account_installer(osv.osv_memory):
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
         'company_id': _default_company,
-        'bank_accounts_id':_get_default_accounts
+        'bank_accounts_id':_get_default_accounts, 
+        'charts': _get_default_charts
     }
 
     def on_change_tax(self, cr, uid, id, tax):

From 4d57c49b0129d6fc0c951796dfdb3c45e7764fec Mon Sep 17 00:00:00 2001
From: "qdp (OpenERP)" <>
Date: Tue, 14 Sep 2010 17:15:55 +0530
Subject: [PATCH 002/118] [IMP]: crm: Improvement in listing sales teams in
 selection as properly sorted by hierarchy

bzr revid: rpa@tinyerp.com-20100914114555-gpme5douyiuoy8to
---
 addons/crm/crm.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 84e884043ba..a16f749323d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -499,10 +499,14 @@ class crm_case_section(osv.osv):
 
     _name = "crm.case.section"
     _description = "Sales Teams"
-    _order = "name"
+    _order = "complete_name"
+
+    def get_full_name(self, cr, uid, ids, field_name, arg, context={}):
+        return  dict(self.name_get(cr, uid, ids, context))
 
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
+        'complete_name': fields.function(get_full_name, method=True, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
         'active': fields.boolean('Active', help="If the active field is set to "\
                         "true, it will allow you to hide the sales team without removing it."),

From 05d730f7bd79eca579f5e239c78611aacc564d95 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 14 Sep 2010 19:29:12 +0530
Subject: [PATCH 003/118] [IMP] configuration wizard

bzr revid: hmo@tinyerp.com-20100914135912-ol6d5fxj1q7oq2t2
---
 addons/account/account_installer.xml          |  4 +--
 addons/association/profile_association.xml    |  2 +-
 .../base_contact_installer_view.xml           |  3 +--
 addons/base_setup/base_setup_installer.xml    | 27 +++++++++----------
 addons/base_setup/base_setup_todo.xml         | 10 +++----
 addons/base_setup/installer.py                | 11 ++++----
 addons/crm/crm_installer_view.xml             |  2 +-
 .../wizard/document_configuration_view.xml    |  4 +--
 .../wizard/ftp_configuration_view.xml         |  6 ++---
 addons/knowledge/knowledge_installer.xml      |  2 +-
 addons/marketing/marketing_view.xml           |  2 +-
 addons/mrp/mrp_installer.xml                  |  2 +-
 addons/profile_tools/misc_tools_installer.xml |  6 ++---
 addons/purchase/wizard/purchase_installer.xml |  2 +-
 addons/sale/sale_installer.xml                |  2 +-
 addons/sale/sale_view.xml                     |  3 ++-
 16 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index e71dc6f09c8..a9de51c3afb 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -14,7 +14,7 @@
                     <attribute name="string">Configure Your Accounting Chart</attribute>
                 </separator>
                 <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">Configure your accounting system. By default, Chart of Account is matching to your country. If there are not chart of account certified for your county, you can install the generic chart of account.</attribute>
+                    <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
                 </xpath>
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
@@ -73,7 +73,7 @@
 
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">From this screen, you can install Other Addons in your accounting Application. Select the Addons to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
+                        <attribute name="string">Add extra Accounting Addons to the ones already installed. Remember you can always install them at a later stage.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="attributes">
                         <attribute name="string">Configure</attribute>
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 4a5fb90cbd9..8460cfa6cc9 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -16,7 +16,7 @@
                   </xpath>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
-                  <attribute name="string">Install more applications. A few applications are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>
+                  <attribute name="string">Here are specific applications related to the Association Profile you selected.</attribute>
                 </xpath>
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index e7575ebd44f..672c43745fb 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -31,8 +31,7 @@
                             <label string="Otherwise these details will not be visible from address/contact."  colspan="4"/>
                             <label string="Do you want to migrate your Address data in Contact Data?" colspan="4" />
                             <group colspan="6">
-                                <label string="Migrate:" colspan="1"/>
-                                <field name="migrate" string="Yes" colspan="1"/>
+                                <field name="migrate" string="Migrate" colspan="1"/>
                             </group>
                         </group>
                     </group>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 0b5a508390c..4245f3da206 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -10,9 +10,8 @@
           <form position="attributes">
             <attribute name="string">Install Applications</attribute>
           </form>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Select applications you want to install. If you don't think you need any of these right now, you can easily install them later.</attribute>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
@@ -26,17 +25,17 @@
           </separator>
             
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <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,profile_tools,report_designer,association,auction)"/>
-            <separator string="Install Specific Business Applications" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <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,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <separator string="Install Specific Industry Sector Applications" colspan="4"/>
+            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 59543200076..8151442855b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,20 +1,20 @@
 <openerp>
   <data>
     <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="model">base.setup.company</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Main Company Setup</attribute>
+            <attribute name="string">Company Configuration</attribute>
           </form>
           <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Information of your company will be used to customize your documents like Invoices, Sale Orders and many more.</attribute>
+                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
           </xpath>
           <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company</attribute>
+                    <attribute name='string'>Configure Your Company Information</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='rowspan'>25</attribute>
@@ -55,7 +55,7 @@
     </record>
 
     <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.company</field>
       <field name="view_id" ref="view_base_setup_company"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 5da836d7f80..77303336ab7 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -66,13 +66,12 @@ class base_setup_installer(osv.osv_memory):
                  "automatic picking lists generation and more."),
         'marketing':fields.boolean('Marketing',
             help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Miscellaneous Tools',
+        'profile_tools':fields.boolean('Extra Tools',
             help="Lets you install various interesting but non-essential tools "
                 "like Survey, Lunch and Ideas box."),
         'report_designer':fields.boolean('Advanced Reporting',
             help="Lets you install various tools to simplify and enhance "
                  "OpenERP's report creation."),
-        'thunderbird' :fields.boolean('Thunderbird'),
         # Vertical modules
         'product_expiry':fields.boolean('Food Industry',
             help="Installs a preselected set of OpenERP applications "
@@ -108,11 +107,13 @@ class base_setup_installer(osv.osv_memory):
             return ['account_voucher']
         return None
 
-    def onchange_moduleselection(self, cr, uid, ids, *args):
+    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
+        value = {}
+        # Calculate progress
         closed, total = self.get_current_progress(cr, uid)
-
         progress = round(100. * closed / (total + len(filter(None, args))))
+        value.update({'progress':progress})
         if progress < 10.:
             progress = 10.
-        return {'value':{'progress':progress}}
+        return {'value':value}
 base_setup_installer()
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 6f276fc2afc..5fad3f41a3d 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -16,7 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP modules</attribute>
+            <attribute name="string">Enhance your CRM basic Application with additional Addons.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>13</attribute>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index c6f40deb429..d922a4bcc1c 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -8,10 +8,10 @@
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">Auto Configure</attribute>
+              <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
              <separator string="title" position="attributes">
-            	<attribute name="string">Resource Directory Configuration </attribute>
+            	<attribute name="string">Configure Resource Directory</attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index df3aee360af..27df92ff515 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -15,10 +15,10 @@
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">FTP Server Configuration</attribute>
+              <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
              <separator string="title" position="attributes">
-            	<attribute name="string">FTP Server Configuration</attribute>
+            	<attribute name="string">Configure FTP Server</attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
@@ -30,7 +30,7 @@
             <group string="res_config_contents" position="replace">
                 <field name="host"/>
             </group>
-            <xpath expr="//button[@name='action_skip']" position="replace"/>
+           <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
         </field>
     </record>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index e184c8b8933..681bf2253d5 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -20,7 +20,7 @@
                   </xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can select various OpenERP applications which will help you and your employees to store and share information.</attribute>
+            <attribute name="string">Share information within the company with these specific Addons.</attribute>
           </xpath>
           <group colspan="8" position="replace">
           <group colspan="4">
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 3c5950b355f..b96ba8fb7e3 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -19,7 +19,7 @@
                   </separator>
                   <xpath expr="//label[@string='description']"
                          position="attributes">
-                    <attribute name="string">OpenERP provides tools to automate your leads process, design marketing campaigns and profile efficiently your customers.</attribute>
+                    <attribute name="string">OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in.</attribute>
                   </xpath>
                  <xpath expr='//separator[@string="vsep"]' position='attributes'>
                        <attribute name='rowspan'>13</attribute>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 4ba15e03f0e..d317cf6face 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -16,7 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">After having installed the core manufacturing application, you can extend it depending on the needs of your MRP's organization</attribute>
+            <attribute name="string">Add more functionalities to the core Manufacturing Application with the following addons.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index a99319cb6ce..c9b5f744b77 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -8,18 +8,18 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Tools Configuration</attribute>
+            <attribute name="string">Extra Tools Configuration</attribute>
           </form>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
           </xpath>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Configure Tools</attribute>
+            <attribute name="string">Configure Extra Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">Here are applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
+            <attribute name="string">Here are applications that can help you improve your organization without being key in its management.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index f1a19c58c27..539edb3ec2f 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -20,7 +20,7 @@
               </separator>
               <xpath expr="//label[@string='description']"
                      position="attributes">
-                <attribute name="string">In this page, you can extend your purchases Application with purchase requisition facility and analytic distribution of purchase orders.</attribute>
+                <attribute name="string">Extend your Purchases Management Application with purchase requisition facility and analytic distribution of purchase orders.</attribute>
               </xpath>
               <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 5231e5e0fc5..9aab465573d 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -16,7 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">After having installed the core sales application, you can extend it depending on the needs of your sale's organization.</attribute>
+            <attribute name="string">Add more functionalities to the core Sales Application with the following addons.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 56fcfc64d7f..327a10aa6d8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -524,7 +524,7 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Sales Configuration</attribute>
+                  <attribute name="string">Sales Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
                 <attribute name="string"
@@ -545,6 +545,7 @@ to your configuration: from the sales order, from the pickings, etc.
                   <field name="step"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
+               
               </data>
             </field>
         </record>

From 6ccc0c702766796a1d49606a1faf2fd027a0725b Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Wed, 15 Sep 2010 17:45:34 +0530
Subject: [PATCH 004/118] [IMP] account : testing for yml report added

bzr revid: ach@tinyerp.com-20100915121534-xo7hpvzfluu2rrse
---
 addons/account/__openerp__.py          |  1 +
 addons/account/test/account_report.yml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 addons/account/test/account_report.yml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index c432689de44..9bbddb1e050 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -134,6 +134,7 @@ module named account_voucher.
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
         'test/account_fiscalyear_close.yml',
+        'test/account_report.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
new file mode 100644
index 00000000000..ae7424dc968
--- /dev/null
+++ b/addons/account/test/account_report.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the PDF reports defined on an invoice, we will print an invoice
+- 
+  !python {model: account.invoice}: |
+    print "aavoyuygugvyuvyug	"
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'invoice.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a partner, we will print a overdue report
+- 
+  !python {model: res.partner}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c'),ref('base.res_partner_sednacom'),ref('base.res_partner_thymbra'),ref('base.res_partner_desertic_hispafuentes'),ref('base.res_partner_tinyatwork'),ref('base.res_partner_2'),ref('base.res_partner_3'),ref('base.res_partner_4'),ref('base.res_partner_5'),ref('base.res_partner_6'),ref('base.res_partner_maxtor'),ref('base.res_partner_seagate'),ref('base.res_partner_8'),ref('base.res_partner_9'),ref('base.res_partner_10'),ref('base.res_partner_11'),ref('base.res_partner_14'),ref('base.res_partner_15'),ref('base.res_partner_accent')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'overdue.'+format), 'wb+').write(data)    
\ No newline at end of file

From 5e8755475498efbdaf8f9b48f6a14c121bf7f2a9 Mon Sep 17 00:00:00 2001
From: RME <rme@rme-desktop>
Date: Wed, 15 Sep 2010 17:49:56 +0530
Subject: [PATCH 005/118] [IMP] hr_payroll : yml report test added

bzr revid: rme@rme-desktop-20100915121956-un2ft2e7e8nvuqbj
---
 addons/base_module_doc_rst/__terp__.py       | 41 --------------------
 addons/hr_payroll/__openerp__.py             |  1 +
 addons/hr_payroll/test/hr_payroll_report.yml | 19 +++++++++
 3 files changed, 20 insertions(+), 41 deletions(-)
 delete mode 100644 addons/base_module_doc_rst/__terp__.py
 create mode 100644 addons/hr_payroll/test/hr_payroll_report.yml

diff --git a/addons/base_module_doc_rst/__terp__.py b/addons/base_module_doc_rst/__terp__.py
deleted file mode 100644
index 8a7fe96b6bd..00000000000
--- a/addons/base_module_doc_rst/__terp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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/>.
-#
-##############################################################################
-
-{
-    'name': 'Module Technical Guide in Restructured Text ',
-    'version': '1.0',
-    'category': 'Generic Modules/Base',
-    'description': """
-    * This module generate the Technical Guides of selected modules in Restructured Text format (RST)
-    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST
-    * It creates a tarball (.tgz file suffix) containing an index file and one file per module
-    * Generate Relationship Graph
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'init_xml': [],
-    'update_xml': ['base_module_doc_rst_view.xml', 'base_module_doc_rst_wizard.xml', 'module_report.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'certificate': '',
-}
-
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index b7886da2df0..ab814ed80c2 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -60,6 +60,7 @@
          'test/payslip.yml',
          'test/payment_advice.yml',
          'test/payroll_register.yml',
+         'test/hr_payroll_report.yml',
     ],
     'demo_xml': [
         'hr_payroll_demo.xml'
diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
new file mode 100644
index 00000000000..4d3fda41de7
--- /dev/null
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -0,0 +1,19 @@
+-
+  In order to test the PDF reports defined on a HR Employee Salary, we will print a HR Employee Salary
+- 
+  !python {model: hr.employee}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.salary.structure').create(cr, uid, [ref('hr_payroll.hr_employee_bonamy0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_emp_salary_report.'+format), 'wb+').write(data)
+          
+-
+  In order to test the PDF reports defined on a HR Payslip, we will print a HR Payslip
+- 
+  !python {model: hr.payslip}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payslip.pdf').create(cr, uid, [ref('hr_payroll.hr_payslip_salaryslipofbonamyforjune0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_payslip_report.'+format), 'wb+').write(data)
+    (data, format) = netsvc.LocalService('report.payslip.pdf').create(cr, uid, [ref('hr_payroll.hr_payslip_salaryslipofbonamyforjune0')], {}, {})
+

From 342d27536f000628e768c5f529fe08b02213d612 Mon Sep 17 00:00:00 2001
From: RME <rme@rme-desktop>
Date: Wed, 15 Sep 2010 17:51:50 +0530
Subject: [PATCH 006/118] [FIX] base_module_doc_rst : __openerp__ file added

bzr revid: rme@rme-desktop-20100915122150-24iglp5i0rd2kc7l
---
 addons/base_module_doc_rst/__openerp__.py | 41 +++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 addons/base_module_doc_rst/__openerp__.py

diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
new file mode 100644
index 00000000000..8a7fe96b6bd
--- /dev/null
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Module Technical Guide in Restructured Text ',
+    'version': '1.0',
+    'category': 'Generic Modules/Base',
+    'description': """
+    * This module generate the Technical Guides of selected modules in Restructured Text format (RST)
+    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST
+    * It creates a tarball (.tgz file suffix) containing an index file and one file per module
+    * Generate Relationship Graph
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'init_xml': [],
+    'update_xml': ['base_module_doc_rst_view.xml', 'base_module_doc_rst_wizard.xml', 'module_report.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'certificate': '',
+}
+

From 59d97f99ff944536217ac2ffa93d754e0754941a Mon Sep 17 00:00:00 2001
From: RME <rme@rme-desktop>
Date: Wed, 15 Sep 2010 17:59:58 +0530
Subject: [PATCH 007/118] [IMP] hr_expense : yml report test added

bzr revid: rme@rme-desktop-20100915122958-99dz5gqeqppcq6as
---
 addons/hr_expense/__openerp__.py             | 4 +++-
 addons/hr_expense/test/hr_expense_report.yml | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 addons/hr_expense/test/hr_expense_report.yml

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index aa45f4aa888..fe06b0110c2 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -55,7 +55,9 @@
     'demo_xml': [
         'hr_expense_demo.xml',
         ],
-    'test': ['test/test_hr_expense.yml'],
+    'test': ['test/test_hr_expense.yml',
+             'test/hr_expense_report.yml',
+             ],
     'installable': True,
     'active': False,
     'certificate': '0062479841789',
diff --git a/addons/hr_expense/test/hr_expense_report.yml b/addons/hr_expense/test/hr_expense_report.yml
new file mode 100644
index 00000000000..52a44e0dafb
--- /dev/null
+++ b/addons/hr_expense/test/hr_expense_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a HR Expense, we will print a HR Expense
+- 
+  !python {model: hr.expense.expense}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.hr_expense_expense_septemberexpenses0'),ref('hr_expense.hr_expense_expense_septemberexpenses1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_expense_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 67fe69cc61a622996d30b34d8a28508ec4071703 Mon Sep 17 00:00:00 2001
From: "DHS (OpenERP)" <dhs@tinyerp.com>
Date: Wed, 15 Sep 2010 18:04:52 +0530
Subject: [PATCH 008/118] [IMP] lunch,mrp,mrp_operations,mrp_repair : yml
 report test added

bzr revid: dhs@tinyerp.com-20100915123452-odrbked6wcx0wg60
---
 addons/lunch/__openerp__.py                   |  5 ++--
 addons/lunch/test/lunch_report.yml            |  8 ++++++
 addons/mrp/__openerp__.py                     |  3 ++-
 addons/mrp/test/mrp_report.yml                | 26 +++++++++++++++++++
 addons/mrp_operations/__openerp__.py          |  2 +-
 .../test/mrp_operations_report.yml            | 17 ++++++++++++
 addons/mrp_repair/__openerp__.py              | 10 +++----
 addons/mrp_repair/test/mrp_repair_report.yml  |  8 ++++++
 8 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 addons/lunch/test/lunch_report.yml
 create mode 100644 addons/mrp/test/mrp_report.yml
 create mode 100644 addons/mrp_operations/test/mrp_operations_report.yml
 create mode 100644 addons/mrp_repair/test/mrp_repair_report.yml

diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index ab540ad10d3..2e5c2489339 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -49,9 +49,8 @@
         'report/report_lunch_order_view.xml',
     ],
     "demo_xml": ['lunch_demo.xml'],
-    "test": ['test/test_lunch.yml'],
+    "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
     "installable": True,
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/lunch/test/lunch_report.yml b/addons/lunch/test/lunch_report.yml
new file mode 100644
index 00000000000..76214dfb599
--- /dev/null
+++ b/addons/lunch/test/lunch_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a lunch, we will print a lunch order
+-
+  !python {model: lunch.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lunch.order').create(cr, uid, [ref('lunch.lunch_order_0'),ref('lunch.lunch_order_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'lunch-lunch_order.'+format), 'wb+').write(data)
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index f8630065598..c56466501e0 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -92,7 +92,8 @@
          'test/mrp_packs.yml',
          'test/mrp_phantom_bom.yml',
          'test/mrp_production_order.yml',
-         
+         'test/mrp_report.yml',
+
     ],
     'installable': True,
     'active': False,
diff --git a/addons/mrp/test/mrp_report.yml b/addons/mrp/test/mrp_report.yml
new file mode 100644
index 00000000000..5c619e0b09d
--- /dev/null
+++ b/addons/mrp/test/mrp_report.yml
@@ -0,0 +1,26 @@
+-
+  In order to test the PDF reports defined on a mrp, we will print a bom order
+-
+  !python {model: mrp.bom}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.bom.structure').create(cr, uid, [ref('mrp.mrp_bom_0'),ref('mrp.mrp_bom_1'),ref('mrp.mrp_bom_2'),ref('mrp.mrp_bom_23'),ref('mrp.mrp_bom_1901'),ref('mrp.mrp_bom_assemblysection0'),ref('mrp.mrp_bom_sidepanel0'),ref('mrp.mrp_bom_defaultbomforshelfofcm1'),ref('mrp.mrp_bom_sidepanel3')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_order.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a mrp, we will print a order
+-
+  !python {model: mrp.production}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.mrp.production.order').create(cr, uid, [ref('mrp.mrp_production_mo1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a mrp, we will print a (mrp)Product-price order
+-
+  !python {model: product.product}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.product.price').create(cr, uid, [ref('product.product_product_0'), ref('product.product_product_pc2'), ref('product.product_product_cpu1'), ref('product.product_product_hdd1'), ref('product.product_product_fan'), ref('product.product_product_cpu1'), ref('product.product_product_ram512')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-production-price_order.'+format), 'wb+').write(data)
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index d4d5cf98d08..5170cc4c627 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -61,7 +61,7 @@
         'process/mrp_operation_process.xml'
     ],
     'demo_xml': ['mrp_operation_data.xml'],
-    'test': ['test/mrp_operations.yml'],
+    'test': ['test/mrp_operations.yml', 'test/mrp_operations_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0056233813133',
diff --git a/addons/mrp_operations/test/mrp_operations_report.yml b/addons/mrp_operations/test/mrp_operations_report.yml
new file mode 100644
index 00000000000..c83d077acde
--- /dev/null
+++ b/addons/mrp_operations/test/mrp_operations_report.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the PDF reports defined on a mrp operations, we  will print a barcode
+-
+  !python {model: mrp_operations.operation.code}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.mrp.code.barcode').create(cr, uid, [ref('mrp_operations.mrp_op_1'),ref('mrp_operations.mrp_op_2'),ref('mrp_operations.mrp_op_3'),ref('mrp_operations.mrp_op_4'),ref('mrp_operations.mrp_op_5')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcoder.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a mrp operations, we  will print a workcenters
+-
+  !python {model: mrp.workcenter}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.mrp.wc.barcode').create(cr, uid, [ref('mrp.mrp_workcenter_0'),ref('mrp.mrp_workcenter_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_ workcenter.'+format), 'wb+').write(data)
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index c9a4068f925..4313ae1a062 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,13 +31,13 @@
            * Invoicing (products and/or services)
            * Warranty concept
            * Repair quotation report
-           * Notes for the technician and for the final customer           
+           * Notes for the technician and for the final customer
 """,
     'author': 'OpenERP SA',
     'depends': ['mrp', 'sale', 'account'],
     'update_xml': [
         'security/ir.model.access.csv',
-        'mrp_repair_sequence.xml',        
+        'mrp_repair_sequence.xml',
         'wizard/mrp_repair_cancel_view.xml',
         'wizard/mrp_repair_make_invoice_view.xml',
         'mrp_repair_view.xml',
@@ -45,7 +45,7 @@
         'mrp_repair_report.xml',
     ],
     'demo_xml': [],
-    'test': ['test/test_mrp_repair.yml'],
+    'test': ['test/test_mrp_repair.yml', 'test/mrp_repair_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0060814381277',
diff --git a/addons/mrp_repair/test/mrp_repair_report.yml b/addons/mrp_repair/test/mrp_repair_report.yml
new file mode 100644
index 00000000000..b6eb782dcfe
--- /dev/null
+++ b/addons/mrp_repair/test/mrp_repair_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a mrp-repair, we will print a order
+-
+  !python {model: mrp.repair}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.repair.order').create(cr, uid, [ref('mrp_repair.mrp_repair_rma0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-repair_order.'+format), 'wb+').write(data)

From f27fd64c9bd6e68b2a43d6fdea4db17f93a50933 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Wed, 15 Sep 2010 18:07:15 +0530
Subject: [PATCH 009/118] [IMP] sale : yml test for report added

bzr revid: jma@tinyerp.com-20100915123715-trcmdqutp9i34tcw
---
 addons/sale/__openerp__.py       | 1 +
 addons/sale/test/sale_report.yml | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 addons/sale/test/sale_report.yml

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 2bcb2f2d88f..eb108373201 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -80,6 +80,7 @@
         'test/invoice_on_ordered_qty.yml',
         'test/invoice_on_shipped_qty.yml',
         'test/sale_order_print.yml',
+        'test/sale_report.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/sale/test/sale_report.yml b/addons/sale/test/sale_report.yml
new file mode 100644
index 00000000000..6453d52f658
--- /dev/null
+++ b/addons/sale/test/sale_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a sale order, we will print a report for sale prepare allot
+- 
+  !python {model: sale.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.sale.order.prepare.allot').create(cr, uid, [ref('sale.order'),ref('sale.order2'),ref('sale.order3')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'sale-sale_prepare_allot.'+format), 'wb+').write(data)
\ No newline at end of file

From 346dcab5edce3e3f365b936dbbb0d3b841915e10 Mon Sep 17 00:00:00 2001
From: RME <rme@rme-desktop>
Date: Wed, 15 Sep 2010 18:22:20 +0530
Subject: [PATCH 010/118] [IMP] acution : yml report test added

bzr revid: rme@rme-desktop-20100915125220-7yvku6txipfi9xlo
---
 addons/auction/__openerp__.py          |  4 +++-
 addons/auction/test/auction_report.yml | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 addons/auction/test/auction_report.yml

diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 69fef0748c4..7105102b385 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -59,7 +59,9 @@
 
     ],
     'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
-    'test': ['test/auction.yml'],
+    'test': ['test/auction.yml',
+             'test/auction_report.yml',
+             ],
 
     'installable': True,
     'active': False,
diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
new file mode 100644
index 00000000000..6b4a4fe97ed
--- /dev/null
+++ b/addons/auction/test/auction_report.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the PDF reports defined on a Action Artist, we will print a Action Artist
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.auction.artists').create(cr, uid, [ref('auction.auction_deposit_1_lot_1'),ref('auction.auction_deposit_1_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_artist_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a Action Bid, we will print a Action Bid
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.auction.bids').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_bid_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 49787ee415ee57a82a114e63184511021f3c03ac Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Wed, 15 Sep 2010 18:29:09 +0530
Subject: [PATCH 011/118] [IMP] stock : yml test for report added

bzr revid: jma@tinyerp.com-20100915125909-73pmcxjgii1nhr00
---
 addons/stock/__openerp__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index e33e347d612..e961c49333a 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -74,7 +74,12 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "security/ir.model.access.csv",
         "board_warehouse_view.xml"
     ],
-    'test': ['test/stock_test.yml'],
+    'test': ['test/stock_test.yml',
+             'test/stock_inventory_move_report.yml',
+             'test/stock_lot_location_report.yml',
+             'test/stock_overview_report.yml',
+             'test/stock_overviewall_report.yml'
+             ],
     'installable': True,
     'active': False,
     'certificate': '0055421559965',

From 47a8c0f1bb4f285a6cb2179d57c95940ceb57d2c Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Wed, 15 Sep 2010 18:35:05 +0530
Subject: [PATCH 012/118] [IMP] stock : yml test for report added

bzr revid: jma@tinyerp.com-20100915130505-j3ye9qdvvrjje6ec
---
 addons/stock/test/stock_inventory_move_report.yml | 8 ++++++++
 addons/stock/test/stock_lot_location_report.yml   | 8 ++++++++
 addons/stock/test/stock_overview_report.yml       | 8 ++++++++
 addons/stock/test/stock_overviewall_report.yml    | 8 ++++++++
 4 files changed, 32 insertions(+)
 create mode 100644 addons/stock/test/stock_inventory_move_report.yml
 create mode 100644 addons/stock/test/stock_lot_location_report.yml
 create mode 100644 addons/stock/test/stock_overview_report.yml
 create mode 100644 addons/stock/test/stock_overviewall_report.yml

diff --git a/addons/stock/test/stock_inventory_move_report.yml b/addons/stock/test/stock_inventory_move_report.yml
new file mode 100644
index 00000000000..a92db995427
--- /dev/null
+++ b/addons/stock/test/stock_inventory_move_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on stock inventory, we will print a Stock Inventory Move report
+- 
+  !python {model: stock.inventory}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock.stock_inventory_0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_inventory_move.'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_lot_location_report.yml b/addons/stock/test/stock_lot_location_report.yml
new file mode 100644
index 00000000000..d31bdf620d4
--- /dev/null
+++ b/addons/stock/test/stock_lot_location_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on stock location, we will print a lot location report
+- 
+  !python {model: stock.location}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lot.location').create(cr, uid, [ref('stock.stock_location_components')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_lot_location.'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_overview_report.yml b/addons/stock/test/stock_overview_report.yml
new file mode 100644
index 00000000000..22d75625a63
--- /dev/null
+++ b/addons/stock/test/stock_overview_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a stock, we will print a Stock Overview report
+- 
+  !python {model: stock.location}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('stock.stock_location_14')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-overview'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_overviewall_report.yml b/addons/stock/test/stock_overviewall_report.yml
new file mode 100644
index 00000000000..8f3bb61d044
--- /dev/null
+++ b/addons/stock/test/stock_overviewall_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
+- 
+  !python {model: stock.location}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)

From 1009a23e720829c97dfe2647207a224e7db7663a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 15 Sep 2010 19:06:47 +0530
Subject: [PATCH 013/118] [IMP]: hr_recruitment: Removed button of Forward to
 partner

bzr revid: rpa@tinyerp.com-20100915133647-rglcewf5g9bmp7k9
---
 addons/hr_recruitment/hr_recruitment_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 6138bf42b99..ee2221b58c2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -194,9 +194,6 @@
                            name="%(crm.action_crm_send_mail)d"
                            context="{'mail':'new', 'model': 'hr.applicant'}"
                            icon="terp-mail-message-new" type="action" />
-                        <button string="Forward"
-                           name="%(crm.crm_lead_forward_to_partner_act)d"
-                           icon="terp-mail-forward" type="action" />
                  </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>

From b0dfb8e3adc5c36df025970d8e25ff62fa580bc4 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Wed, 15 Sep 2010 19:55:39 +0530
Subject: [PATCH 014/118] [IMP] auction: added yml for report test

bzr revid: ach@tinyerp.com-20100915142539-0ypa4adhrkpi91dz
---
 addons/account/test/account_report.yml |  1 -
 addons/auction/test/auction_report.yml | 90 ++++++++++++++++++++++++--
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index ae7424dc968..a883af0506c 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -2,7 +2,6 @@
   In order to test the PDF reports defined on an invoice, we will print an invoice
 - 
   !python {model: account.invoice}: |
-    print "aavoyuygugvyuvyug	"
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index 6b4a4fe97ed..4adbbae5fe9 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a Action Artist, we will print a Action Artist
+  In order to test the PDF reports defined on auction, we will print a Action Artist
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
@@ -8,10 +8,92 @@
         file(os.path.join(tools.config['test_report_directory'], 'action_artist_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a Action Bid, we will print a Action Bid
+  In order to test the PDF reports defined on auction, we will print a Action Bid
 - 
-  !python {model: auction.lots}: |
+  !python {model: auction.bid}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.bids').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_bid_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'action_bid_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print a Seller Form Report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.seller_form_report').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'seller_form_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print a lots list Report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'lots_list_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print a lots inventory Report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'lots_inventory_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print a deposit seller Report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'deposit_seller_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print a catalog
+-
+  !python {model: auction.dates}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-catalog_list.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print buyer form report
+-
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_date_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_form.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on auction, we will print bids phones report
+-
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_date_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-bids_phones_details.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Total
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.auction.total.rml').create(cr, uid, [ref('auction.auction_deposit_2_lot_1'),ref('auction.auction_deposit_2_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_total_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Result
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.auction.result').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_result_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Lot
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.bids.lots').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)  
\ No newline at end of file

From e566a9d4a8cfe2e45f3f7aef4cb823f05db28b54 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Wed, 15 Sep 2010 20:34:37 +0530
Subject: [PATCH 015/118] [IMP] purchase : yml test for purchase & demo data
 added

bzr revid: jma@tinyerp.com-20100915150437-qd4aaem5kkscselt
---
 addons/purchase/purchase_demo.xml        | 58 ++++++++++++++++++++++++
 addons/purchase/test/purchase_report.yml |  8 ++++
 2 files changed, 66 insertions(+)
 create mode 100644 addons/purchase/test/purchase_report.yml

diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 1168fd29679..f6c2931a626 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -1,6 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
+    <!--Resource: purchase.order-->
+    	
+		<record id="order_purchase1" model="purchase.order">
+            <field model="stock.location" name="location_id" search="[]"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field model="res.partner.address" name="partner_address_id" search="[]"/>
+		</record>
+		
+		<record id="order_purchase2" model="purchase.order">
+            <field model="stock.location" name="location_id" search="[]"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field model="res.partner.address" name="partner_address_id" search="[]"/>
+        </record>
+        
+        <!--Resource: purchase.order.line-->
+        
+        <record id="line1_purchase" model="purchase.order.line">
+            <field name="order_id" ref="order_purchase1"/>
+            <field name="date_planned">2010/09/15</field>
+            <field name="name">New server config + material</field>
+            <field model="product.product" name="product_id" search="[]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field name="price_unit">150</field>
+            <field name="product_qty">5</field>
+            <field name="type">make_to_stock</field>
+        </record>
+        
+        <record id="line2_purchase" model="purchase.order.line">
+            <field name="order_id" ref="order_purchase1"/>
+            <field name="date_planned">2010/09/15</field>
+            <field name="name">[PC1] Basic PC</field>
+            <field name="product_id" ref="product.product_product_pc1"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">450</field>
+            <field name="product_qty">2</field>
+            <field name="product_uom_qty">3</field>
+            <field name="product_uos_qty">3</field>
+            <field name="type">make_to_stock</field>
+        </record>
+        
+        <record id="line3_purchase" model="purchase.order.line">
+            <field name="order_id" ref="order_purchase2"/>
+            <field name="date_planned">2010/09/15</field>
+            <field name="name">[PC3] Medium PC</field>
+            <field name="product_id" ref="product.product_product_pc1"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">900</field>
+            <field name="product_qty">1</field>
+            <field name="type">make_to_stock</field>
+        </record>
+        
+        <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
         
     </data>
 </openerp>
+    
\ No newline at end of file
diff --git a/addons/purchase/test/purchase_report.yml b/addons/purchase/test/purchase_report.yml
new file mode 100644
index 00000000000..b98d1f212ac
--- /dev/null
+++ b/addons/purchase/test/purchase_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a Purchase Order, we will print a Request Quotation report
+- 
+  !python {model: purchase.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.purchase.quotation').create(cr, uid, [ref('purchase.order_purchase1'),ref('purchase.order_purchase2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'purchase-request_quotation'+format), 'wb+').write(data)

From 95e87db51d6fa35365fe69f09b46604af30f044a Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 16 Sep 2010 10:32:08 +0530
Subject: [PATCH 016/118] [IMP]: In report 'Print Salary Structure' put
 currency symbol for appropriate amount type.

bzr revid: rch_open_erp-20100916050208-cazwngr05kk0easc
---
 addons/hr_payroll/report/report_emp_salary_structure.py  | 7 ++++++-
 addons/hr_payroll/report/report_emp_salary_structure.rml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 0c63f446c38..d4365a8423b 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -36,7 +36,8 @@ class salary_structure_report(report_sxw.rml_parse):
             'get_type':self.get_type,
             'get_contract':self.get_contract,
             'get_line_amount_type':self.get_line_amount_type,
-            'get_line_type':self.get_line_type
+            'get_line_type':self.get_line_type,
+            'get_line_amount_symbol':self.get_line_amount_symbol
           })
 
     def get_contract(self,emp):
@@ -69,6 +70,10 @@ class salary_structure_report(report_sxw.rml_parse):
         else:
             return 'Fixed'
 
+    def get_line_amount_symbol(self,amount_type):
+        if amount_type != 'per':
+            return self.pool.get('res.users').browse(self.cr, self.uid,self.uid).company_id.currency_id.symbol
+
     def get_line_type(self,type):
         if type == 'allounce':
             return 'Allowance'
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 11bfee609f0..ee564052af3 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -441,7 +441,7 @@
                 <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ employee.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]</para>
               </td>
               <td>
                 <para style="terp_default_9">[[ get_line_type(line.type) ]]</para>

From e983503c6653585154a7beeba39d90cbc33363a4 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 11:10:15 +0530
Subject: [PATCH 017/118] [IMP] Account : Added yml test for aged partner
 balance report

bzr revid: jvo@tinyerp.com-20100916054015-vqg00y3oa2uqglsx
---
 addons/account/test/account_report.yml | 32 +++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index a883af0506c..639e571f674 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -5,12 +5,38 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'invoice.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
+
 -
-  In order to test the PDF reports defined on a partner, we will print a overdue report
+  In order to test the PDF reports defined on a partner, we will print the Overdue Report
 - 
   !python {model: res.partner}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c'),ref('base.res_partner_sednacom'),ref('base.res_partner_thymbra'),ref('base.res_partner_desertic_hispafuentes'),ref('base.res_partner_tinyatwork'),ref('base.res_partner_2'),ref('base.res_partner_3'),ref('base.res_partner_4'),ref('base.res_partner_5'),ref('base.res_partner_6'),ref('base.res_partner_maxtor'),ref('base.res_partner_seagate'),ref('base.res_partner_8'),ref('base.res_partner_9'),ref('base.res_partner_10'),ref('base.res_partner_11'),ref('base.res_partner_14'),ref('base.res_partner_15'),ref('base.res_partner_accent')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'overdue.'+format), 'wb+').write(data)    
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
+
+-
+  Print the Aged Partner Balance Report
+-
+  !python {model: res.partner}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    res = {}
+    for i in range(5)[::-1]:
+        stop = start - RelativeDateTime(days=30)
+        res[str(i)] = {
+            'name': (i!=0 and (str((5-(i+1)) * 30) + '-' + str((5-i) * 30)) or ('+'+str(4 * 30))),
+            'stop': start.strftime('%Y-%m-%d'),
+            'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
+        }
+        start = stop - RelativeDateTime(days=1)
+    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_balance': 1, 'periods': [], 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : 'True', 'id': 1,'result_selection': 'customer','direction_selection': 'past'}}
+    data_dict['form'].update(res)
+    (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-aged_partner_balance.'+format), 'wb+').write(data)
+    
\ No newline at end of file

From a9c3dbcd3d1cea38e62737deb8c85bd5e347a334 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 16 Sep 2010 11:18:00 +0530
Subject: [PATCH 018/118] [IMP] acution : yml report test added

bzr revid: rme@tinyerp.com-20100916054800-jgtvkzc560qiu3eu
---
 addons/auction/test/auction_report.yml | 33 ++++++++++----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index 4adbbae5fe9..4d5110c03a1 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on auction, we will print a Action Artist
+  In order to test the PDF reports defined on auction, we will print a auction artist
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
@@ -8,27 +8,20 @@
         file(os.path.join(tools.config['test_report_directory'], 'action_artist_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on auction, we will print a Action Bid
+  In order to test the PDF reports defined on auction, we will print a auction Bid
 - 
   !python {model: auction.bid}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.bids').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'action_bid_report.'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on auction, we will print a Seller Form Report
-- 
-  !python {model: auction.lots}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.seller_form_report').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'seller_form_report.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print a lots list Report
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'lots_list_report.'+format), 'wb+').write(data)
 -
@@ -36,7 +29,7 @@
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'lots_inventory_report.'+format), 'wb+').write(data)
 -
@@ -44,7 +37,7 @@
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
+    (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_deposit_5_lot_1'),ref('auction.auction_deposit_5_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'deposit_seller_report.'+format), 'wb+').write(data)
 -
@@ -52,7 +45,7 @@
 -
   !python {model: auction.dates}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_2')], {}, {})
+    (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_1'),ref('auction.auction_date_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'auction-catalog_list.'+format), 'wb+').write(data)
 -
@@ -60,7 +53,7 @@
 -
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_date_2')], {}, {})
+    (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_deposit_6_lot_1'),ref('auction.auction_deposit_6_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_form.'+format), 'wb+').write(data)
 -
@@ -68,7 +61,7 @@
 -
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_date_2')], {}, {})
+    (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_deposit_7_lot_1'),ref('auction.auction_deposit_7_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'auction-bids_phones_details.'+format), 'wb+').write(data)
 -
@@ -76,7 +69,7 @@
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.auction.total.rml').create(cr, uid, [ref('auction.auction_deposit_2_lot_1'),ref('auction.auction_deposit_2_lot_2')], {}, {})
+    (data, format) = netsvc.LocalService('report.auction.total.rml').create(cr, uid, [ref('auction.auction_deposit_8_lot_1'),ref('auction.auction_deposit_8_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'action_total_report.'+format), 'wb+').write(data)
 
@@ -85,7 +78,7 @@
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.auction.result').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {})
+    (data, format) = netsvc.LocalService('report.auction.result').create(cr, uid, [ref('auction.auction_deposit_9_lot_1'),ref('auction.auction_deposit_9_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'action_result_report.'+format), 'wb+').write(data)
 
@@ -94,6 +87,6 @@
 - 
   !python {model: auction.lots}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.bids.lots').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {})
+    (data, format) = netsvc.LocalService('report.bids.lots').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)  
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 7abe353b400d11aa82f15b887779f60b0f68e17a Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 12:39:34 +0530
Subject: [PATCH 019/118] Repair Order

bzr revid: apa@tinyerp.com-20100916070934-cu8c2bls454bkwbr
---
 addons/mrp_repair/report/order.rml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index dae2a25ec0e..d624eae4833 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -277,7 +277,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id. name ]])</para>
+          <para style="terp_tblheader_Details_Right">Price<font size="8.0">([[ o.pricelist_id.currency_id. name ]])</font></para>
         </td>
       </tr>
     </blockTable>
@@ -307,9 +307,6 @@
         </tr>
       </blockTable>
     </section>
-	 <para style="P12">
-      <font color="white"> </font>
-    </para>
     <para style="P29">Fees Line(s) [[ (o.fees_lines ==[] and  removeParentNode('para') )  ]]</para>
     <section>
     <para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>

From 66d97c275595919d6185d007c87422299f8116fc Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 12:52:40 +0530
Subject: [PATCH 020/118] planning

bzr revid: apa@tinyerp.com-20100916072240-xp48j6fs03ueq0c0
---
 addons/project_planning/report/report_planning.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 8a6fe372661..43dab8eb5b4 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -142,7 +142,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ formatLang(u.user_id.name ]]</para>
+          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]</para>
         </td>
         <td>
           <para style="P6">[[ formatLang(u.plan_tasks) ]]</para>

From 2f273455e3d666fffd52eed28aa0b3dc93bbc685 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 14:00:44 +0530
Subject: [PATCH 021/118] account tqax code

bzr revid: apa@tinyerp.com-20100916083044-kiino11qtsawkf2c
---
 addons/account/report/account_tax_code.rml | 179 ++++++++++-----------
 1 file changed, 85 insertions(+), 94 deletions(-)

diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index 35205440993..9c495dd4834 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -1,32 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Tax Code" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="700"/>
-       <header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Accounting Entries-[[ company.currency_id.name ]]</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-
-			</pageGraphics>
-		</header>
+      <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -34,28 +10,20 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Title_Table">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Line_Title">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="6,0" stop="6,0"/>
-
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,1" stop="2,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,1" stop="3,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,1" stop="4,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,1" stop="5,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Line_Content_Detail">
       <blockAlignment value="LEFT"/>
@@ -71,19 +39,19 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -95,59 +63,82 @@
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-  	<para style="P8">[[ repeatIn(objects, 'o') ]]</para>
-  	<para style="terp_tblheader_Details">
-    <font color="white"></font>
-    </para>
-    <blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table">
+    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="539.0" repeatRows="1" style="Table2">
       <tr>
-        <td><para style="terp_header">[[ o.company_id.name ]]</para></td>
-        <td><para style="terp_header"><font face="Times-Roman" size="11.0"/></para></td>
-        <td><para style="terp_header">Accounting Entries-[[ o.company_id.currency_id.name ]]</para></td>
+        <td>
+          <para style="terp_header_Centre">Accounting Entries-[[ company.currency_id.name ]]</para>
+        </td>
       </tr>
     </blockTable>
-    <para style="terp_tblheader_Details">
-    <font color="white"></font>
-    </para>
-    <para style="terp_tblheader_Details">[[ o.name ]]</para>
-    <para style="terp_tblheader_Details">
-    <font color="white"></font>
-    </para>
-    <section>
-    <blockTable colWidths="55.0,43.0,57.0,125.0,127.0,65.0,67.0" repeatRows="1" style="Table_Line_Title">
-      <tr>
-        <td><para style="terp_tblheader_Details_Centre">Date</para></td>
-        <td><para style="terp_tblheader_Details">Voucher Nb</para></td>
-        <td><para style="terp_tblheader_Details">Account Number</para></td>
-        <td><para style="terp_tblheader_Details">Third party (Country)</para></td>
-        <td><para style="terp_tblheader_Details">Entry label</para></td>
-        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
-        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
-      </tr>
-	   <tr>
-	      <td><para style="terp_default_9">[[ repeatIn(get_line(o),'line') ]]<font>[[ not line and removeParentNode('tr') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
-	      <td><para style="terp_default_9">[[ line['ref'] ]]</para></td>
-	      <td><para style="terp_default_9">[[ line['acode'] ]]</para></td>
-	      <td><para style="terp_default_9">[[ line['pname'] ]]<font>([[ line['country'] ]] )</font></para></td>
-	      <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
-	      <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
-	      <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
-	   </tr>
-    </blockTable>
-    </section>
-    <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="52.0,68.0,55.0,110.0,130.0,64.0,60.0" repeatRows="1" style="Table_Line_Title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Voucher No</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Third Party (Country)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_line(o),'line') ]]</para>
+      <blockTable colWidths="52.0,68.0,54.0,110.0,131.0,63.0,60.0" style="Table_Line_Content_Detail">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ not line and removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['ref'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['acode'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['pname'] ]] ([[ line['country'] ]] )</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
   </story>
-</document>
-
+</document>
\ No newline at end of file

From e268102b8d5c4b1e7d8e6dc39d8c77b0b04743bb Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 14:03:41 +0530
Subject: [PATCH 022/118] [IMP] Account : Added yml report test for account
 balance landscape report

bzr revid: jvo@tinyerp.com-20100916083341-lsf0o0tar99zn3rb
---
 addons/account/test/account_report.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 639e571f674..b2429628b7c 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -39,4 +39,24 @@
     (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-aged_partner_balance.'+format), 'wb+').write(data)
-    
\ No newline at end of file
+
+-
+  Print the Account Balance Report in Landscape mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.account', 'form': {'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.account_fiscalyear_fiscalyear0')] ,'target_move': 'all'}}
+    (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [], data_dict, {'periods': [1, 83, 2, 3, 4, 5, 6, 7, 8, 9]})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance.'+format), 'wb+').write(data)
+
+-
+  Print the Account Balance Report in Landscape mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.account', 'form': {'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.account_fiscalyear_fiscalyear0')] ,'target_move': 'all'}}
+    (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [], data_dict, {'periods': [1, 83, 2, 3, 4, 5, 6, 7, 8, 9]})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance.'+format), 'wb+').write(data)
+  
\ No newline at end of file

From ecce13766871e9180bfd88e34deca1e6470bb52d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 14:18:16 +0530
Subject: [PATCH 023/118] Picking List

bzr revid: apa@tinyerp.com-20100916084816-xcmumrde4oyqx65y
---
 addons/stock/report/picking.rml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 0cf3111781a..317180c7209 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -124,6 +124,7 @@
     <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
       <tr>
         <td>
+          <para style="terp_default_Bold_9">Shipping Address :</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
@@ -132,6 +133,7 @@
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
         <td>
+          <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.title or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
@@ -147,9 +149,6 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_5cm_Above_Space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="538.0" style="Table_Title_String">
       <tr>
         <td>
@@ -160,9 +159,6 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_5cm_Above_Space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>

From 4a0e8149cbfac01e1d360cbbddf3548d2414fb1b Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 16 Sep 2010 14:27:42 +0530
Subject: [PATCH 024/118] [IMP]: Solve date formate problem in report 'Human
 Resource / Reporting /Holidays/Leaves By Department'.

bzr revid: rch_open_erp-20100916085742-89wsk1fvo1ypl74q
---
 addons/hr_holidays/report/holidays_summary_report.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a551e3a0a5d..a14970b31e5 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -87,7 +87,8 @@ class report_custom(report_rml):
         depts=[]
         emp_id={}
 #        done={}
-
+        rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays')
+        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
         cr.execute("SELECT name FROM res_company")
         res=cr.fetchone()[0]
         date_xml=[]
@@ -113,8 +114,8 @@ class report_custom(report_rml):
         else:
             type="Confirmed and Validated"
             holiday_type=('confirm','validate')
-        date_xml.append('<from>%s</from>\n'% (som))
-        date_xml.append('<to>%s</to>\n' %(eom))
+        date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
+        date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<type>%s</type>'%(type))
 
 #        date_xml=[]
@@ -229,8 +230,6 @@ class report_custom(report_rml):
                     emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
                     row_id = row_id +1
 
-        rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays')
-        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
         header_xml = '''
         <header>
         <date>%s</date>

From a084c489671adc9e7f143540183e491be4afcd1a Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 16 Sep 2010 14:33:39 +0530
Subject: [PATCH 025/118] [IMP] point_of_sale : yml test for point_of_sale &
 demo data added

bzr revid: jma@tinyerp.com-20100916090339-v7765dg7rgs1nd1s
---
 addons/point_of_sale/__openerp__.py      |  3 +-
 addons/point_of_sale/pos_demo.xml        | 61 +++++++++++++++++++++++-
 addons/point_of_sale/test/pos_report.yml | 53 ++++++++++++++++++++
 3 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 addons/point_of_sale/test/pos_report.yml

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index cab0fb40dc0..351fc7ef733 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -73,7 +73,8 @@ Main features :
         'statement_report.xml',
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
-    'test':['test/pos_test.yml',],
+    'test':['test/pos_test.yml',
+            'test/pos_report.yml'],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 14710cf8f37..80ba3d24397 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,6 +1,65 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+    
+     <!--Resource: pos.order-->
+     
+    	<record id="order_pos1" model="pos.order">
+            <field model="sale.shop" name="shop_id" search="[]"/>
+            <field model="res.users" name="user_salesman_id" search="[]"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field name="price_type">tax_excluded</field>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+		</record>
+		
+		<record id="order_pos2" model="pos.order">
+            <field model="sale.shop" name="shop_id" search="[]"/>
+            <field model="res.users" name="user_salesman_id" search="[]"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field name="price_type">tax_excluded</field>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+		</record>
+		
+	<!--Resource: pos.order.line-->
+		
+		<record id="line1_pos" model="pos.order.line">
+            <field name="order_id" ref="order_pos1"/>
+            <field name="date_planned">2010/09/15</field>
+            <field name="name">[PC3] Medium PC</field>
+            <field name="product_id" ref="product.product_product_pc3"/>
+            <field model="res.company" name="company_id" search="[]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field name="price_unit">450</field>
+            <field name="qty">2</field>
+            <field name="notice">No Discount</field>
+        </record>
+        
+        <record id="line12_pos" model="pos.order.line">
+            <field name="order_id" ref="order_pos1"/>
+            <field name="date_planned">2010/09/15</field>
+            <field name="name">[PC2] Basic+ PC (assembly on order)</field>
+            <field name="product_id" ref="product.product_product_pc2"/>
+            <field model="res.company" name="company_id" search="[]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field name="price_unit">450</field>
+            <field name="qty">2</field>
+            <field name="notice">No Discount</field>
+        </record>
+        
+        <record id="line2_pos" model="pos.order.line">
+            <field name="order_id" ref="order_pos2"/>
+            <field name="date_planned">2010/09/15</field>
+            <field name="name">[PC1] Basic PC</field>
+            <field name="product_id" ref="product.product_product_pc1"/>
+            <field model="res.company" name="company_id" search="[]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field name="price_unit">450</field>
+            <field name="qty">5</field>
+            <field name="discount">0.10</field>
+            <field name="notice">Discount Applied</field>
+        </record>
+		
     </data>
 </openerp>
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
new file mode 100644
index 00000000000..bd89ca2015d
--- /dev/null
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -0,0 +1,53 @@
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Detail Summary report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.pos.details_summary').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Lines report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.pos.lines').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-lines report'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.pos.receipt').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt report'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.pos.receipt.with.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt with reimbursement report'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.pos.receipt.without.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
\ No newline at end of file

From 7922c3b73f5b418a475189e5ae447421fcb80135 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 16 Sep 2010 14:57:52 +0530
Subject: [PATCH 026/118] [IMP]: Solve date format problem in report 'Human
 Resource / Reporting /Timesheet /Timesheet Profit'.

bzr revid: rch_open_erp-20100916092752-8x6lcpfgbe5m2f2x
---
 .../hr_timesheet_invoice/report/account_analytic_profit.rml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index 0e6a12030f2..3cb4b150395 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
@@ -157,10 +157,12 @@
     <blockTable colWidths="175.0,175.0,175.0" style="Table_Content_Date">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_from'],date=True)
+]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_to'],date=True)
+ ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>

From 9a239296dda89cc0b312384904830e7a5009ee0e Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 16 Sep 2010 15:03:29 +0530
Subject: [PATCH 027/118] [IMP] product : yml report test for product added

bzr revid: jma@tinyerp.com-20100916093329-zwqovzfx671mdcdy
---
 addons/product/__openerp__.py          |  1 +
 addons/product/test/product_report.yml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 addons/product/test/product_report.yml

diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 0a0cfceff20..5d099489859 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -58,6 +58,7 @@
         'company_view.xml',
         'process/product_process.xml'
     ],
+    'test':['test/product_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0068861431437',
diff --git a/addons/product/test/product_report.yml b/addons/product/test/product_report.yml
new file mode 100644
index 00000000000..9ff387278aa
--- /dev/null
+++ b/addons/product/test/product_report.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the PDF reports defined on Products, we will print a Products Pricelists report
+- 
+  !python {model: product.product}: |
+    import netsvc, tools, os
+    data_dict = {'model': 'product.price_list'}
+    data_dict['form'] = {
+        'qty1': 1,
+        'qty2': 5,
+        'qty3': 10,
+        'qty4': 0,
+        'qty5': 0,
+        'price_list':ref('product.list0')
+    }
+    (data, format) = netsvc.LocalService('report.product.pricelist').create(cr, uid, [ref('product.product_product_pc1'), ref('product.product_product_pc3')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'product-product pricelist'+format), 'wb+').write(data)

From 9deb5b1ca995534fcc171939afa3a3c928d8a580 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 16:19:35 +0530
Subject: [PATCH 028/118] [IMP/FIX] Account : More yml test for reports

bzr revid: jvo@tinyerp.com-20100916104935-xe97uoo2f3n5cwlt
---
 .../account/report/account_balance_sheet.py   |  2 +-
 addons/account/test/account_report.yml        | 37 +++++++++++++++----
 .../account_report_balance_sheet_view.xml     |  1 +
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index ce02d7938f9..e4d624af5d8 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -78,7 +78,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         #Getting Profit or Loss Balance from profit and Loss report
-        result_pl=self.obj_pl.get_data(data)
+        result_pl = self.obj_pl.get_data(data)
         self.res_bl = self.obj_pl.final_result()
 
         type_pool = db_pool.get('account.account.type')
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index b2429628b7c..903a80dc805 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -34,7 +34,7 @@
             'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
         }
         start = stop - RelativeDateTime(days=1)
-    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_balance': 1, 'periods': [], 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : 'True', 'id': 1,'result_selection': 'customer','direction_selection': 'past'}}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': [], 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : 'True', 'id': 1,'result_selection': 'customer','direction_selection': 'past'}}
     data_dict['form'].update(res)
     (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
@@ -45,18 +45,39 @@
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.account', 'form': {'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.account_fiscalyear_fiscalyear0')] ,'target_move': 'all'}}
-    (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [], data_dict, {'periods': [1, 83, 2, 3, 4, 5, 6, 7, 8, 9]})
+    data_dict = {'model': 'account.account', 'form': {'id':ref('account.bal'),'chart_account_id':ref('account.chart0'),'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.account_fiscalyear_fiscalyear0')] ,'target_move': 'all','periods': [],'context':{'state':'all'}}}
+    (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-landscape.'+format), 'wb+').write(data)
 
 -
-  Print the Account Balance Report in Landscape mode
+  Print the Account Balance Sheet in Hotizontal mode
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.account', 'form': {'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.account_fiscalyear_fiscalyear0')] ,'target_move': 'all'}}
-    (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [], data_dict, {'periods': [1, 83, 2, 3, 4, 5, 6, 7, 8, 9]})
+    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 1,'journal_ids':[],'fiscalyear': ref('account.account_fiscalyear_fiscalyear0') ,'target_move': 'all'}}
+    (data, format) = netsvc.LocalService('report.account.balancesheet.horizontal').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet_horizontal.'+format), 'wb+').write(data)
+
+-
+  Print the Account Balance Sheet in Normal mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':[],'fiscalyear': ref('account.account_fiscalyear_fiscalyear0') ,'target_move': 'all'}}
+    (data, format) = netsvc.LocalService('report.account.balancesheet').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet.'+format), 'wb+').write(data)
+
+-
+  Print the Account Balance Report in Normal mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.account', 'form': {'chart_account_id':ref('account.chart0'),'select_account': False,'display_account':'bal_all','format_perc':0,'filter': 'filter_no','show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': ref('account.account_fiscalyear_fiscalyear0') ,'target_move': 'all','periods': [],'id':ref('account.bal'),'context':{'state':'all'}}}
+    (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
+
   
\ No newline at end of file
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 1f337ca6bb9..113521604ae 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -11,6 +11,7 @@
                <field name="fiscalyear_id" position="after">
                     <field name="display_account"/>
                     <field name="display_type"/>
+                    <field name="reserve_account_id"/>
                     <newline/>
                </field>
             </field>

From 4afe3947c4edca7781a18a3765e92c4f439d495f Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 16 Sep 2010 16:46:02 +0530
Subject: [PATCH 029/118] [IMP] purchase_requisition : yml test report & demo
 data added

bzr revid: jma@tinyerp.com-20100916111602-5gl2ik7zbfhozr17
---
 addons/purchase_requisition/__openerp__.py    |  4 +--
 .../purchase_requisition_demo.xml             | 27 +++++++++++++++++++
 .../test/purchase_requisition_report.yml      |  8 ++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 addons/purchase_requisition/purchase_requisition_demo.xml
 create mode 100644 addons/purchase_requisition/test/purchase_requisition_report.yml

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 27be1f3ce64..7594fdcb96b 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -30,7 +30,7 @@
 """,
     "depends" : ["purchase","mrp"],
     "init_xml" : [],
-    "demo_xml" : [],
+    "demo_xml" : ['purchase_requisition_demo.xml'],
     "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
                     "purchase_requisition_data.xml",
                     "purchase_requisition_view.xml",
@@ -38,7 +38,7 @@
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"
     ],
     "active": False,
-    "test":[],
+    "test":['purchase_requisition_report.yml'],
     "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
new file mode 100644
index 00000000000..ff9bba7c700
--- /dev/null
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    
+    <!--Resource: purchase.requisition-->
+    	
+		<record id="order_purchase_requisition1" model="purchase.requisition">
+            <field name="name">TE0001</field>
+            <field name="user_id" model="res.users"/>
+            <field name="exclusive">multiple</field>
+            <field name="date_start">2010/09/16 15:56:14</field>
+            <field name="warehouse_id" model="stock.warehouse"/>
+		</record>
+        
+        <!--Resource: purchase.requisition.line-->
+        
+        <record id="line_purchase_requisition1" model="purchase.requisition.line">
+            <field name="requisition_id" ref="order_purchase_requisition1"/>
+            <field name="product_id" ref="product.product_product_pc3"/> 
+            <field name="product_uom_id" model="product.uom" search="[]"/>
+            <field name="product_qty">5</field>
+        </record>
+        
+        
+    </data>
+</openerp>
+    
\ No newline at end of file
diff --git a/addons/purchase_requisition/test/purchase_requisition_report.yml b/addons/purchase_requisition/test/purchase_requisition_report.yml
new file mode 100644
index 00000000000..73edfe18054
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on Purchase Requisition, we will print a Requisition report
+- 
+  !python {model: purchase.requisition}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.order_purchase_requisition1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition- purchase requisition report.'+format), 'wb+').write(data)

From ef537daedcb09e70ac4ae12fc5308206c02a6410 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 16 Sep 2010 17:09:52 +0530
Subject: [PATCH 030/118] [IMP] report_instratat : yml test report added

bzr revid: jma@tinyerp.com-20100916113952-50dtf0kv7ce9g66r
---
 addons/report_intrastat/__openerp__.py                   | 1 +
 addons/report_intrastat/test/report_instratat_report.yml | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 addons/report_intrastat/test/report_instratat_report.yml

diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 16860ef9b70..ca421627ff5 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -37,6 +37,7 @@
         'intrastat_report.xml'
     ],
     'demo_xml': [],
+    'test': ['report_instratat_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0056982189085',
diff --git a/addons/report_intrastat/test/report_instratat_report.yml b/addons/report_intrastat/test/report_instratat_report.yml
new file mode 100644
index 00000000000..821ce528cfd
--- /dev/null
+++ b/addons/report_intrastat/test/report_instratat_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined using report_instratat module, we print a Instratat Report
+- 
+  !python {model: account.invoice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.invoice.intrastat').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'report_instratat-instrastat report.'+format), 'wb+').write(data)

From 05898a20d4ed921b0cc79f3a4ca55729e37592f7 Mon Sep 17 00:00:00 2001
From: "saz(OpenERP)" <>
Date: Thu, 16 Sep 2010 17:18:35 +0530
Subject: [PATCH 031/118] Accounting/Balance Sheet Report/ Print Balance Sheet
 Report  * need to change report format. like Account Balance  * wrong date
 format

bzr revid: apa@tinyerp.com-20100916114835-fxnoewvsdheta90s
---
 .../report/account_report_bs.rml              | 141 ++++++++++++------
 1 file changed, 96 insertions(+), 45 deletions(-)

diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml
index 59caba5ab76..b33ebb4bcc8 100644
--- a/addons/account_reporting/report/account_report_bs.rml
+++ b/addons/account_reporting/report/account_report_bs.rml
@@ -10,14 +10,52 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table_Company_Name">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+ 	<blockTableStyle id="Table2a">
+      <blockValign value="TOP"/>
+      <blockAlignment value="RIGHT"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -25,7 +63,7 @@
 	   <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
 	   <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
 	   <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	   <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
+	   <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -41,26 +79,32 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P7" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT"/>
     <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica" fontSize="12.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P15" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P16" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P19" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -69,63 +113,49 @@
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="Table Contents"><font color='blue'>[[ company.name ]]</font></para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P4"><font color='blue'>Currency: [[ company.currency_id.name ]]</font></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P8"><font color='blue'>Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</font></para>
     <para style="P7">[[repeatIn(objects,'o') ]]</para>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table2">
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_header_Centre">Account Balance</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="131.0,280.0,131.0" style="Table7">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table2">
       <tr>
         <td>
-          <para style="P12a" ><font color='blue'>Code</font></para>
+          <para style="terp_tblheader_General_Centre">Company Name</para>
         </td>
         <td>
-          <para style="P12a"><font color='blue'>Account Name</font></para>
+          <para style="terp_tblheader_General_Centre">Printing date</para>
         </td>
         <td>
-          <para style="P13"><font color='blue'>Balance</font></para>
+          <para style="terp_tblheader_General_Centre">Currency</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Name</para>
         </td>
       </tr>
-    </blockTable>
-    <blockTable colWidths="131.0,280.0,131.0" style="Table4">
+  </blockTable>
+    <blockTable colWidths="132.0,134.0,135.0,135.0"  style="Table3">
       <tr>
         <td>
-          <para style="P10"><font>[[ repeatIn(lines(data['form'],object=o), 'a') ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['code'] ]]</font></para>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
-          <para style="P17"><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]]</font></para>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]]</para>
         </td>
         <td>
-          <para style="P18"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]]</font></para>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -135,6 +165,27 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="80.0,382.0,80.0" style="Table2a" repeatRows="1">
+      <tr noRowsplits="1">
+        <td>
+          <para style="P12a">Code</para>
+        </td>
+        <td>
+          <para style="P12a">Account Name</para>
+        </td>
+        <td>
+          <para style="P12b">Balance([[company.currency_id.code]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['level']&gt;4 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;4 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;4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font >[[ formatLang(a['balance']) ]] [[company.currency_id.symbol]]</font></para>
+        </td>
+      </tr>
+    </blockTable>
   </story>
 </document>
-

From 15549773ea573d5ddc04aac9a8d277844cc982f1 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 17:35:21 +0530
Subject: [PATCH 032/118] [IMP/FIX] Account : More yml test for reports

bzr revid: jvo@tinyerp.com-20100916120521-oddmrks30kdvbqfe
---
 addons/account/test/account_report.yml | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 903a80dc805..67db2dc628f 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -45,7 +45,7 @@
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.account', 'form': {'id':ref('account.bal'),'chart_account_id':ref('account.chart0'),'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.account_fiscalyear_fiscalyear0')] ,'target_move': 'all','periods': [],'context':{'state':'all'}}}
+    data_dict = {'model': 'account.account', 'form': {'id':ref('account.bal'),'chart_account_id':ref('account.chart0'),'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.data_fiscalyear')] ,'target_move': 'all','periods': [],'context':{'state':'all'}}}
     (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-landscape.'+format), 'wb+').write(data)
@@ -55,7 +55,7 @@
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 1,'journal_ids':[],'fiscalyear': ref('account.account_fiscalyear_fiscalyear0') ,'target_move': 'all'}}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 1,'journal_ids':[],'fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all'}}
     (data, format) = netsvc.LocalService('report.account.balancesheet.horizontal').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet_horizontal.'+format), 'wb+').write(data)
@@ -65,7 +65,7 @@
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':[],'fiscalyear': ref('account.account_fiscalyear_fiscalyear0') ,'target_move': 'all'}}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':[],'fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all'}}
     (data, format) = netsvc.LocalService('report.account.balancesheet').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet.'+format), 'wb+').write(data)
@@ -75,9 +75,26 @@
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.account', 'form': {'chart_account_id':ref('account.chart0'),'select_account': False,'display_account':'bal_all','format_perc':0,'filter': 'filter_no','show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': ref('account.account_fiscalyear_fiscalyear0') ,'target_move': 'all','periods': [],'id':ref('account.bal'),'context':{'state':'all'}}}
+    data_dict = {'model': 'account.account', 'form': {'chart_account_id':ref('account.chart0'),'select_account': False,'display_account':'bal_all','format_perc':0,'filter': 'filter_no','show_columns' :0, 'account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': ref('account.data_fiscalyear') ,'target_move': 'all','periods': [],'id':ref('account.bal'),'context':{'state':'all'}}}
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
 
-  
\ No newline at end of file
+-
+  Print the Central Journal Report
+-
+  !python {model: account.journal.period}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
+
+    data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True','target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
+    (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
+
+
+
+ 
\ No newline at end of file

From 96b3dc9cb7ec4b90af44a057659aa2512f8ff64d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 17:35:21 +0530
Subject: [PATCH 033/118] [mrp]:Product Cost Structure:use formatLang function
 for changes date and amount according to lang.

bzr revid: apa@tinyerp.com-20100916120521-215fcw96iz7f1zqt
---
 addons/mrp/report/price.py | 82 +++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 45 deletions(-)

diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 762d1e4b2a6..38e65e0446f 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -23,7 +23,9 @@ import ir
 import pooler
 from report.interface import report_rml
 from report.interface import toxml
-
+from tools import to_xml
+from report import report_sxw
+from datetime import datetime
 from tools.translate import _
 
 
@@ -38,6 +40,9 @@ class report_custom(report_rml):
         workcenter_pool = pool.get('mrp.workcenter')
         user_pool = pool.get('res.users')
         bom_pool = pool.get('mrp.bom')
+        rml_obj=report_sxw.rml_parse(cr, uid, product_pool._name,context)
+        rml_obj.localcontext.update({'lang':context.get('lang',False)})
+        company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id
         def process_bom(bom, currency_id, factor=1):
             xml = '<row>'
             sum = 0
@@ -55,7 +60,7 @@ class report_custom(report_rml):
                 main_sp_name = "<b>%s</b>\r\n" %(prod.seller_id.name)
                 price = supplier_info_pool.price_get(cr, uid, prod.seller_id.id, prod.id, number*prod_qtty)[prod.seller_id.id]
                 price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
-                main_sp_price = '<b>%.2f</b>\r\n' %(price)
+                main_sp_price = """<b>"""+rml_obj.formatLang(price)+' '+ company_currency.symbol+"""</b>\r\n"""
                 sum += prod_qtty*price
             std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
             main_strd_price = str(std_price) + '\r\n'
@@ -64,13 +69,12 @@ class report_custom(report_rml):
                 sellers +=  '- <i>'+ seller_id.name.name +'</i>\r\n'
                 price = supplier_info_pool.price_get(cr, uid, seller_id.name.id, prod.id, number*prod_qtty)[seller_id.name.id]
                 price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
-                sellers_price += """<i>%.2f</i>\r\n"""%(price)
-            xml += """<col para='yes'> %s </col>
-                    <col para='yes'> %s </col>
-                    <col f='yes'>%.2f</col>
-                    <col f='yes'>%s</col>
-                    <col f='yes'>%.2f</col>
-                    <col f='yes'>%s</col>'"""%(prod_name,main_sp_name +  sellers ,prod_qtty, product_uom.name,float(main_strd_price),main_sp_price + sellers_price)
+                sellers_price += """<i>"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""</i>\r\n"""
+            xml += """<col para='yes'> """+ prod_name +""" </col>
+                    <col para='yes'> """+ main_sp_name + sellers + """ </col>
+                    <col f='yes'>"""+ rml_obj.formatLang(prod_qtty) +' '+ product_uom.name +"""</col>
+                    <col f='yes'>"""+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +"""</col>
+                    <col f='yes'>""" + main_sp_price + sellers_price + """</col>'"""
 
             xml += '</row>'
             return xml, sum, sum_strd
@@ -83,10 +87,9 @@ class report_custom(report_rml):
             xml = '<row>'
             xml += "<col para='yes'>" + workcenter.name + '</col>'
             xml += "<col/>"
-            xml += "<col/>"
-            xml += """<col f='yes'>%.2f</col>"""%(cost_cycle)
-            xml += """<col f='yes'>%.2f</col>"""%(cost_hour)
-            xml += """<col f='yes'>%.2f</col>"""%(cost_hour + cost_cycle)
+            xml += """<col f='yes'>"""+rml_obj.formatLang(cost_cycle)+' '+ company_currency.symbol + """</col>"""
+            xml += """<col f='yes'>"""+rml_obj.formatLang(cost_hour)+' '+ company_currency.symbol + """</col>"""
+            xml += """<col f='yes'>"""+rml_obj.formatLang(cost_hour + cost_cycle)+' '+ company_currency.symbol + """</col>"""
             xml += '</row>'
 
             return xml, total
@@ -95,13 +98,13 @@ class report_custom(report_rml):
         xml = ''
         config_start = """
         <config>
-            <date>%s</date>
+            <date>""" + to_xml(rml_obj.formatLang(datetime.now().strftime('%Y-%m-%d %H:%M:%S'),date_time=True)) + """</date>
             <company>%s</company>
             <PageSize>210.00mm,297.00mm</PageSize>
             <PageWidth>595.27</PageWidth>
             <PageHeight>841.88</PageHeight>
-            <tableSize>55.00mm,55.00mm, 20.00mm, 22.00mm, 22.00mm, 25.00mm</tableSize>
-            """ % (time.strftime('%m/%d/%Y %H:%M'),user_pool.browse(cr, uid, uid).company_id.name)
+            <tableSize>55.00mm,58.00mm,29.00mm,29.00mm,29.00mm</tableSize>
+            """ % (user_pool.browse(cr, uid, uid).company_id.name)
         config_stop = """
             <report-footer>Generated by OpenERP</report-footer>
         </config>
@@ -111,14 +114,13 @@ class report_custom(report_rml):
             <lines style='header'>
                 <row>
                     <col>%s</col>
-                    <col/>
                     <col t='yes'/>
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                 </row>
             </lines>
-        """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
+        """ % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')')
         prod_header = """
                 <row>
                     <col>%s</col>
@@ -126,11 +128,9 @@ class report_custom(report_rml):
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
-                    <col t='yes'>%s</col>
                 </row>
-        """ % (_('Component'), _('Component suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
+        """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
 
-        company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
         for product in product_pool.browse(cr, uid, ids, context=context):
             bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
             title = "<title>%s</title>" %(_("Cost Structure"))
@@ -145,16 +145,14 @@ class report_custom(report_rml):
                     <col para='yes'>-</col>
                     <col para='yes'>-</col>
                     <col para='yes'>-</col>
-                    <col para='yes'>-</col>
                     </row></lines>"""
                 xml += """<lines style='total'> <row>
-                    <col>%s %s %s %s : </col>
-                    <col/>
+                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col f='yes'/>
-                    <col f='yes'>%.2f</col>
-                    <col f='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
+                    <col f='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
+                    <col f='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    </row></lines>'"""
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
                 factor = number * product.uom_id.factor / bom.product_uom.factor
@@ -169,20 +167,19 @@ class report_custom(report_rml):
                 }
                 xml_tmp = ''
                 for sub_bom in (sub_boms and sub_boms[0]) or [parent_bom]:
-                    txt, sum, sum_strd = process_bom(sub_bom, company_currency)
+                    txt, sum, sum_strd = process_bom(sub_bom, company_currency.id)
                     xml_tmp +=  txt
                     total += sum
                     total_strd += sum_strd
 
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                 xml += """<lines style='sub_total'> <row>
-                    <col>%s %s %s %s : </col>
-                    <col/>
+                    <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>%.2f</col>
-                    <col t='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    </row></lines>'"""
 
                 total2 = 0
                 xml_tmp = ''
@@ -194,27 +191,22 @@ class report_custom(report_rml):
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                     xml += """<lines style='sub_total'> <row>
-                    <col>%s %s %s %s : </col>
+                    <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""": </col>
                     <col/>
                     <col/>
                     <col/>
-                    <col/>
-                    <col t='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, total2)
+                    <col t='yes'>"""+ rml_obj.formatLang(total2) +' '+ company_currency.symbol +"""</col>
+                    </row></lines>'"""
                 xml += """<lines style='total'> <row>
-                    <col>%s %s %s %s : </col>
-                    <col/>
+                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>%.2f</col>
-                    <col t='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd+total2, total+total2)
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total+total2) +' '+ company_currency.symbol + """</col>
+                    </row></lines>'"""
 
         xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'
 
         return xml
 
 report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 1d6c6b4ffcca592390b3ef9045074328201f49cf Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 16 Sep 2010 17:45:38 +0530
Subject: [PATCH 034/118] [IMP] sale_layout : yml test report added

bzr revid: jma@tinyerp.com-20100916121538-gd0h3if1gjsbrvj2
---
 addons/sale_layout/__openerp__.py              | 1 +
 addons/sale_layout/test/sale_layout_report.yml | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 addons/sale_layout/test/sale_layout_report.yml

diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index ee9fdadf8c3..898915b6d99 100755
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -40,6 +40,7 @@
         "sale_layout_view.xml",
         "sale_layout_report.xml",
     ],
+    "test" : ['sale_layout_report.yml'],
     "active": False,
     "installable": True
 }
diff --git a/addons/sale_layout/test/sale_layout_report.yml b/addons/sale_layout/test/sale_layout_report.yml
new file mode 100644
index 00000000000..ed43ac639f6
--- /dev/null
+++ b/addons/sale_layout/test/sale_layout_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on Sale, we will print a Sale Layout report.
+- 
+  !python {model: sale.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.sale.order.layout').create(cr, uid, [ref('sale.order')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'sale_layout-sale layout report'+format), 'wb+').write(data)

From ba148dba0a21f895b698801ff35158d80e08989d Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 16 Sep 2010 17:59:49 +0530
Subject: [PATCH 035/118] [IMP] hr_attendance, hr_timesheet_invoice, hr_payroll
 : yml report test added

bzr revid: rme@tinyerp.com-20100916122949-gisdwwxrjc7xia6t
---
 addons/hr_attendance/__openerp__.py            |  2 +-
 .../hr_attendance/test/hr_attendance_error.yml |  9 +++++++++
 addons/hr_payroll/test/hr_payroll_report.yml   | 18 ++++++++++++++++++
 addons/hr_timesheet_invoice/__openerp__.py     |  4 +++-
 .../test/hr_timesheet_invoice_report.yml       |  9 +++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 addons/hr_attendance/test/hr_attendance_error.yml
 create mode 100644 addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 5a79566bcde..9ed2b76e1ed 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -43,7 +43,7 @@
         'wizard/hr_attendance_sign_in_out_view.xml',
         ],
     'demo_xml': ['hr_attendance_demo.xml'],
-    'test': ['test/test_hr_attendance.yml'],
+    'test': ['test/test_hr_attendance.yml','test/hr_attendance_error.yml'],
     'installable': True,
     'active': False,
     'certificate': '0063495605613',
diff --git a/addons/hr_attendance/test/hr_attendance_error.yml b/addons/hr_attendance/test/hr_attendance_error.yml
new file mode 100644
index 00000000000..6c045871cb5
--- /dev/null
+++ b/addons/hr_attendance/test/hr_attendance_error.yml
@@ -0,0 +1,9 @@
+-
+  In order to test the PDF reports defined on a hr attendance error, we will print a  hr attendance error
+- 
+  !python {model: hr.employee}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.attendance.error').create(cr, uid, [], {'model': 'hr.employee', 'form': {'init_date': '2010-09-16', 'end_date': '2010-09-16', 'id': 1, 'emp_ids': [ref('hr.employee2')], 'max_delay': 120}}
+    , {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
index 4d3fda41de7..88a797b6827 100644
--- a/addons/hr_payroll/test/hr_payroll_report.yml
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -17,3 +17,21 @@
         file(os.path.join(tools.config['test_report_directory'], 'hr_payslip_report.'+format), 'wb+').write(data)
     (data, format) = netsvc.LocalService('report.payslip.pdf').create(cr, uid, [ref('hr_payroll.hr_payslip_salaryslipofbonamyforjune0')], {}, {})
 
+-
+  Print the employee salary details 
+-
+  !python {model: hr.payslip}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'employee_ids': [ref('hr.employee2')]}}
+    (data, format) = netsvc.LocalService('report.employees.salary').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detai_report.'+format), 'wb+').write(data)
+-
+  Print the employee yearly salary details 
+-
+  !python {model: hr.payslip}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'salary_on': 'current_month', 'employee_ids': [ref('hr.employee2')]}}
+    (data, format) = netsvc.LocalService('report.year.salary').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_yearly_salary_detai_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index f9be64cc454..df44302ec56 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -47,7 +47,9 @@ reports, eso.""",
     ],
     'demo_xml': ['hr_timesheet_invoice_demo.xml',
                  ],
-    'test': ['test/test_hr_timesheet_invoice.yml'],             
+    'test': ['test/test_hr_timesheet_invoice.yml'
+             'test/hr_timesheet_invoice_report.yml',
+             ],             
     'installable': True,
     'active': False,
     'certificate': '0056091842381',
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
new file mode 100644
index 00000000000..434d04a979d
--- /dev/null
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -0,0 +1,9 @@
+-
+  In order to test the PDF reports defined on a hr timesheet invoice, we will print a  hr timesheet invoice
+-
+  !python {model: account.analytic.line}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'ir.ui.menu', 'form': {'id': 1, 'date_from': '2010-09-01', 'employee_ids': [[6, 0, [1, ref('hr.employee2')]]], 'journal_ids': [[6, 0, [1, 2, 3, 4]]], 'date_to': '2010-09-16'}}
+    (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-report.'+format), 'wb+').write(data)    
\ No newline at end of file

From d5b204646a6794e0cacce48daa805470893648e7 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 16 Sep 2010 18:05:25 +0530
Subject: [PATCH 036/118] [IMP]: Improve report 'Human Resource / Payroll /
 Payroll Register / Print Statement' for without payslip lines.

bzr revid: rch_open_erp-20100916123525-ket8i65jaaw73y7q
---
 addons/hr_payroll/report/payroll_register.rml | 91 +++++++++++--------
 1 file changed, 51 insertions(+), 40 deletions(-)

diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 178695d2d9c..d7df0ada7cc 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -22,7 +22,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -34,7 +34,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -65,6 +65,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="space" fontName="Helvetica" fontSize="6.0" leading="8"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -131,11 +132,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <section>
-      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table6">
         <tr>
           <td>
             <para style="terp_tblheader_details_center">#</para>
@@ -163,14 +164,18 @@
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table2">
+      <para style="space">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <section>
+      <para style="terp_default_9">[[repeatIn(o.line_ids, 'l')]]</para>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_8">[[ get_no() ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ repeatIn(o.line_ids, 'l') ]]</para>
-            <para style="terp_default_8">[[add_line(l)]]</para>
             <para style="terp_default_8">[[ l.employee_id.name ]]</para>
           </td>
           <td>
@@ -193,40 +198,46 @@
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_default_8">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_8">
+      <para style="space">
         <font color="white"> </font>
       </para>
     </section>
+    <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="241.0,241.0" style="Table5">
       <tr>
         <td>

From 3d2f1f17e50ebc6f254db8d91f8584fc485e70de Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 16 Sep 2010 18:28:50 +0530
Subject: [PATCH 037/118] [IMP] survey : yml report test added

bzr revid: rme@tinyerp.com-20100916125850-pad2rt5je7ocvhxn
---
 addons/survey/__openerp__.py         | 1 +
 addons/survey/test/survey_report.yml | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 addons/survey/test/survey_report.yml

diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 853370132de..fa48e176b26 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -47,6 +47,7 @@
     'demo_xml': ['survey_demo.xml'],
     'test': [
         'test/survey00.yml',
+        'test/survey_report.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/survey/test/survey_report.yml b/addons/survey/test/survey_report.yml
new file mode 100644
index 00000000000..13f012cd5a7
--- /dev/null
+++ b/addons/survey/test/survey_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a survey, we will print a survey
+- 
+  !python {model: survey}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.survey.analysis').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'survey-report.'+format), 'wb+').write(data)
\ No newline at end of file

From 09b85eee5fca42d1b2d42fbbaf8888a3bb053e2a Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 18:41:07 +0530
Subject: [PATCH 038/118] Overdue Payment

bzr revid: apa@tinyerp.com-20100916131107-b4zhut2h0z77n4p4
---
 addons/account/report/overdue.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index 5f461cd9768..fad5c27ec79 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -187,7 +187,7 @@
             <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>

From 4d037f59ed86f09522977109f47e24d18f36b8e6 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 16 Sep 2010 18:46:15 +0530
Subject: [PATCH 039/118] Cost stucture

bzr revid: apa@tinyerp.com-20100916131615-qpla5kyakld3xvbq
---
 addons/mrp/report/price.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 38e65e0446f..3a6ab81a308 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -150,8 +150,8 @@ class report_custom(report_rml):
                     <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col f='yes'/>
-                    <col f='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
-                    <col f='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
                     </row></lines>'"""
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)

From 576b7ddef0bd59cdbf22623a7e94760865fab6bf Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 16 Sep 2010 18:50:56 +0530
Subject: [PATCH 040/118] [IMP] account_analytic_plans : YML test for report
 added

bzr revid: ach@tinyerp.com-20100916132056-qeiyaid9g13um3du
---
 addons/account_analytic_plans/__openerp__.py  |  1 +
 .../report/crossovered_analytic.py            | 22 ++++++++++---------
 .../test/acount_analytic_plans_report.yml     |  9 ++++++++
 3 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 addons/account_analytic_plans/test/acount_analytic_plans_report.yml

diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 0c3d1d07370..41f29737d55 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -66,6 +66,7 @@ of distribution models.
         'wizard/account_crossovered_analytic_view.xml'
     ],
     'demo_xml'  : [],
+    'test' : ['account_analytic_plans/test/acount_analytic_plans_report.yml'],
     'installable': True,
     'active'    : False,
     'certificate': '0036417675373',
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index e064ddc148b..f8a975a4c25 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -96,17 +96,19 @@ class crossovered_analytic(report_sxw.rml_parse):
 
         self.final_list = children_list
         selected_ids = line_pool.search(self.cr,self.uid,[('account_id','in',self.final_list)])
+        if selected_ids:
+            query="SELECT sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                    WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
+    
+            self.cr.execute(query)
+            info=self.cr.dictfetchall()
 
-        query="SELECT sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
-                WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
-
-        self.cr.execute(query)
-        info=self.cr.dictfetchall()
-
-        res['ref_qty']=info[0]['qty']
-        res['ref_amt']=info[0]['amt']
-        self.base_amount= info[0]['amt']
-
+            res['ref_qty']=info[0]['qty']
+            res['ref_amt']=info[0]['amt']
+            self.base_amount= info[0]['amt']
+        res['ref_qty']=0.0
+        res['ref_amt']=0.0
+        self.base_amount= 0.0
         result.append(res)
         return result
 
diff --git a/addons/account_analytic_plans/test/acount_analytic_plans_report.yml b/addons/account_analytic_plans/test/acount_analytic_plans_report.yml
new file mode 100644
index 00000000000..debeba7daa0
--- /dev/null
+++ b/addons/account_analytic_plans/test/acount_analytic_plans_report.yml
@@ -0,0 +1,9 @@
+-
+  Print the Cross Overed Report in Normal mode
+-
+  !python {model: account.analytic.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'journal_ids':[6,0,(ref('account.cose_journal_sale'))],'ref':ref('account.analytic_root'),'empty_line':True,'id':ref('account.analytic_root'),'context':{}}}
+    (data, format) = netsvc.LocalService('report.account.analytic.account.crossovered.analytic').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_analytic_plans-crossovered_analyitic.'+format), 'wb+').write(data)
\ No newline at end of file

From d8946eb67ea4dfe20c0bb5f2c185a67325dbede9 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 16 Sep 2010 18:57:57 +0530
Subject: [PATCH 041/118] [IMP] account_budget : YML test added for reports

bzr revid: ach@tinyerp.com-20100916132757-s33ooyffhrubu5g4
---
 addons/account_budget/__openerp__.py          |  1 +
 .../test/account_budget_report.yml            | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 addons/account_budget/test/account_budget_report.yml

diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index f47e4685246..5d6d8da0def 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -63,6 +63,7 @@ Three reports are available:
     'demo_xml': ['crossovered_budget_demo.xml'],
     'test':[
             'test/account_budget.yml',
+            'test/account_budget_report.yml',
             ],
     'installable': True,
     'active': False,
diff --git a/addons/account_budget/test/account_budget_report.yml b/addons/account_budget/test/account_budget_report.yml
new file mode 100644
index 00000000000..fa086e24a64
--- /dev/null
+++ b/addons/account_budget/test/account_budget_report.yml
@@ -0,0 +1,27 @@
+-
+  Print the Analytic Budget Report in Normal mode
+-
+  !python {model: account.analytic.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
+    (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_budget-analytic_budget_report.'+format), 'wb+').write(data)
+-
+  Print the Budget Report in Normal mode
+-
+  !python {model: account.budget.post}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.budget.post', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
+    (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account_budget.account_budget_post_sales0')], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_budget-budget_report.'+format), 'wb+').write(data)
+-
+  Print the Cross Overed Budget Report in Normal mode
+-
+  !python {model: crossovered.budget}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'report':'analytic-full','id':ref('account_budget.crossovered_budget_budgetoptimistic0'),'context':{}}}
+    (data, format) = netsvc.LocalService('report.crossovered.budget.report').create(cr, uid, [ref('account_budget.crossovered_budget_budgetoptimistic0')], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
\ No newline at end of file

From e4479ffd6abb156316614c635343447f943a87b5 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 16 Sep 2010 19:30:17 +0530
Subject: [PATCH 042/118] [IMP] point_of_sale : yml test report added

bzr revid: jma@tinyerp.com-20100916140017-h651k3095mv24faa
---
 addons/point_of_sale/__openerp__.py              | 3 ++-
 addons/point_of_sale/test/pos_details_report.yml | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 addons/point_of_sale/test/pos_details_report.yml

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 351fc7ef733..21c7bdaab45 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -74,7 +74,8 @@ Main features :
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
     'test':['test/pos_test.yml',
-            'test/pos_report.yml'],
+            'test/pos_report.yml',
+            'test/pos_details.yml'],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/test/pos_details_report.yml b/addons/point_of_sale/test/pos_details_report.yml
new file mode 100644
index 00000000000..72f35b87ec5
--- /dev/null
+++ b/addons/point_of_sale/test/pos_details_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details report
+- 
+  !python {model: ir.ui.menu}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
\ No newline at end of file

From 12d4d294d95bfbd61787136ba63aab006e9d1b23 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 16 Sep 2010 20:00:48 +0530
Subject: [PATCH 043/118] [FIX] account_invoice_layout : YML test for report
 added

bzr revid: ach@tinyerp.com-20100916143048-p91ljsi6gklyb5xe
---
 addons/account_invoice_layout/__openerp__.py    |  3 ++-
 .../account_invoice_layout_demo.xml             | 14 ++++++++++++++
 .../report/report_account_invoice_layout.rml    |  8 ++++----
 .../test/account_invoice_layout_report.yml      | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 addons/account_invoice_layout/account_invoice_layout_demo.xml
 create mode 100644 addons/account_invoice_layout/test/account_invoice_layout_report.yml

diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index 77a6e428de6..36eeb41b137 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -45,7 +45,8 @@
         'account_invoice_layout_report.xml',
         'wizard/account_invoice_special_message.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['account_invoice_layout_demo.xml'],
+    'test':['test/account_invoice_layout_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0057235078173',
diff --git a/addons/account_invoice_layout/account_invoice_layout_demo.xml b/addons/account_invoice_layout/account_invoice_layout_demo.xml
new file mode 100644
index 00000000000..cb8df67d997
--- /dev/null
+++ b/addons/account_invoice_layout/account_invoice_layout_demo.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="demo_message1" model="notify.message">
+            <field name="name">OpenERP SA</field>
+            <field name="msg">ERP & CRM Solutions....</field>
+        </record>
+        <record id="demo_message1" model="notify.message">
+            <field name="name">Tiny sprl</field>
+            <field name="msg">Be Expert with the Experts...</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 77781c4191d..8f7d5f561e8 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -297,7 +297,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'])) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'] or '')) or removeParentNode('tr') ]]</para>
             <para style="terp_default_Note">
               <font color="white"> </font>
             </para>
@@ -337,7 +337,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name'] or '') or removeParentNode('blockTable') ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
@@ -467,7 +467,7 @@
     <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
       <tr>
         <td>
-          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
+          <para style="terp_default_9">[[ format(o.comment or '') or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -477,7 +477,7 @@
     <blockTable colWidths="539.0" style="Table_Payment_Terms">
       <tr>
         <td>
-          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para>
+          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note or '') or removeParentNode('blockTable')) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
new file mode 100644
index 00000000000..b7b1c1e76cc
--- /dev/null
+++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
@@ -0,0 +1,17 @@
+-
+  Print the Invoice layout report in Normal Mode
+- 
+  !python {model: account.invoice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
+-
+  Print the Invoice Layout Report with Message in Normal mode
+-
+  !python {model: account.invoice}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.invoice', 'form': {'message':ref('account_invoice_layout.demo_message1'),'id':ref('account.test_invoice_1'),'context':{}}}
+    (data, format) = netsvc.LocalService('report.notify_account.invoice').create(cr, uid, [ref('account.test_invoice_1')], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout_message_report.'+format), 'wb+').write(data) 
\ No newline at end of file

From 3f9135bdd2284487a3ee00a176511281b6003f3e Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 20:14:14 +0530
Subject: [PATCH 044/118] [IMP/FIX] Account : More yml test for reports

bzr revid: jvo@tinyerp.com-20100916144414-vrfifojv7rfok1x2
---
 .../account/report/account_general_journal.py |  2 +-
 addons/account/test/account_report.yml        | 76 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index 8cd3dad05ba..684a75b1f20 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -86,7 +86,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
                         'FROM account_move_line l '
                         'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
                         'LEFT JOIN res_currency c on (l.currency_id=c.id)'
-                        'WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ''
+                        'WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ' '
                         'GROUP BY j.id, j.code, j.name, l.amount_currency,c.code, l.currency_id ',
                         (period_id, tuple(self.journal_ids)))
         return self.cr.dictfetchall()
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 67db2dc628f..619d8f7771e 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -71,7 +71,7 @@
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet.'+format), 'wb+').write(data)
 
 -
-  Print the Account Balance Report in Normal mode
+  Print the Account Balance Report in Normal mode - From Account Chart
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
@@ -79,9 +79,17 @@
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
+    print "Account Balance Report in Normal mode - From Menu"
+    
+    data_dict.update({'model': 'ir.ui.menu'})
+    data_dict['form'].update({'active_ids':[ref('account.bal'),ref('account.gpf')]})
+    
+    (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal-menu.'+format), 'wb+').write(data)
 
 -
-  Print the Central Journal Report
+  Print the Central Journal Report - From Account
 -
   !python {model: account.journal.period}: |
     import netsvc, tools, os, time
@@ -90,11 +98,71 @@
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
 
-    data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True','target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
+    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
+       
+    print "Central Journal Report - From Menu"
+    data_dict.update({'model': 'ir.ui.menu'})
+    data_dict['form'].update({'active_ids':journal_period_ids})
+    
+    (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
+-
+  Print the General Journal Report - From Journal
+-
+  !python {model: account.journal.period}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
+    
+    data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
+    (data, format) = netsvc.LocalService('report.account.general.journal').create(cr, uid, journal_period_ids, data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal.'+format), 'wb+').write(data)
 
+-
+  Print the General Ledger Report in Normal Mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    acc_ids = [ref('account.bal'),ref('account.gpf')]
+    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':' True ','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal.'+format), 'wb+').write(data)
 
+    print "GL report from menu"
+    data_dict.update({'model': 'ir.ui.menu'})
+    data_dict['form'].update({'active_ids': acc_ids})
+    (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal-menu.'+format), 'wb+').write(data)
+-
+  Print the General Ledger Report in Landscape Mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    acc_ids = [ref('account.bal'),ref('account.gpf')]
+    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':' True ','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal-landscape.'+format), 'wb+').write(data)
+
+    print "GL report landscape mode from menu"
+    data_dict.update({'model': 'ir.ui.menu'})
+    data_dict['form'].update({'active_ids': acc_ids})
+    (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal-landscape-menu.'+format), 'wb+').write(data)
 
- 
\ No newline at end of file

From e470276384fcd7e999dfcc1abd3f1014a915020c Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 16 Sep 2010 21:08:14 +0530
Subject: [PATCH 045/118] [IMP] account_payment : YML test for report and demo
 data added

bzr revid: ach@tinyerp.com-20100916153814-s4qakadpqjkvem2j
---
 addons/account_payment/__openerp__.py         |  7 ++++--
 .../account_payment/account_payment_demo.xml  | 24 +++++++++++++++++++
 .../test/account_payment_report.yml           |  8 +++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 addons/account_payment/account_payment_demo.xml
 create mode 100644 addons/account_payment/test/account_payment_report.yml

diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index f3e437face2..5114a576512 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -47,8 +47,11 @@
         'account_invoice_view.xml',
         'account_payment_report.xml',
     ],
-    'demo_xml': [],
-    'test': ['test/account_payment.yml'],
+    'demo_xml': ['account_payment_demo.xml'],
+    'test': [
+             'test/account_payment.yml'
+             'test/account_payment_report.yml'
+    ],
     'installable': True,
     'active': False,
     'certificate': '0061703998541',
diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml
new file mode 100644
index 00000000000..25fe4a2c55b
--- /dev/null
+++ b/addons/account_payment/account_payment_demo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    	<record id="partner_bank_1" model="res.partner.bank">
+            <field name="name">Reserve Bank</field>
+            <field name="acc_number">00987654321</field>
+            <field name="partner_id" ref="base.res_partner_agrolait"></field>
+            <field name="state" eval="bank"/>
+        </record>
+    	<record id="payment_mode_1" model="payment.mode">
+            <field name="name">Direct Payment</field>
+            <field name="journal" ref="account.sales_journal"/>
+            <field name="bank_id" ref="account_payment.partner_bank_1"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+        <record id="payment_order_1" model="payment.order">
+            <field name="reference">ORDER1</field>
+            <field name="mode" ref="account_payment.payment_mode_1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="date_prefered">now</field>
+            <field name="state">draft</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account_payment/test/account_payment_report.yml b/addons/account_payment/test/account_payment_report.yml
new file mode 100644
index 00000000000..45022e19a73
--- /dev/null
+++ b/addons/account_payment/test/account_payment_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on Account Payment, Print a Payment Order
+- 
+  !python {model: payment.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payment.order').create(cr, uid, [ref('account_payment.payment_order_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_payment-payment_order_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 4d247a148f74165b621dc1f2ee754785f199c404 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 21:28:03 +0530
Subject: [PATCH 046/118] [IMP/FIX] Account : More yml test for reports

bzr revid: jvo@tinyerp.com-20100916155803-b5be6vb8e6lxcxqd
---
 addons/account/test/account_report.yml | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 6db4efeedd8..fbb2c9effb3 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -199,3 +199,53 @@
     (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
+
+-
+  Print the Partner Ledger Report
+-
+  !python {model: res.partner}: |
+    import netsvc, tools, os, time
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':' True ','amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all','query_line':'True '}}
+    (data, format) = netsvc.LocalService('report.account.third_party_ledger').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-partner_ledger.'+format), 'wb+').write(data)
+
+-
+  Print the Partner Ledger-Other Report
+-
+  !python {model: res.partner}: |
+    import netsvc, tools, os, time
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':' True ','amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all','query_line':' True '}}
+    (data, format) = netsvc.LocalService('report.account.third_party_ledger_other').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-partner_ledger-other.'+format), 'wb+').write(data)
+
+-
+  Print the Profit-Loss Report in Normal Mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = []
+    acc_ids = [ref('account.bal'),ref('account.gpf')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'display_type': False,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal'),'active_ids':acc_ids }}
+    (data, format) = netsvc.LocalService('report.pl.account').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss.'+format), 'wb+').write(data)
+
+-
+  Print the Profit-Loss Report in Horizontal Mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = []
+    acc_ids = [ref('account.bal'),ref('account.gpf')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'display_type': True,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal'),'active_ids':acc_ids }}
+    (data, format) = netsvc.LocalService('report.pl.account.horizontal').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss-horizontal.'+format), 'wb+').write(data)
\ No newline at end of file

From 02104162ab1c144e52499eba60b57dccc54e1614 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 16 Sep 2010 22:04:17 +0530
Subject: [PATCH 047/118] [IMP] account_report : YML test for report and demo
 data added

bzr revid: ach@tinyerp.com-20100916163417-brojjn3w1uvylwuk
---
 addons/account_report/__openerp__.py            |  3 ++-
 addons/account_report/account_report_demo.xml   | 11 +++++++++++
 .../account_report/report/print_indicator.rml   |  2 +-
 .../test/account_report_report.yml              | 17 +++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 addons/account_report/account_report_demo.xml
 create mode 100644 addons/account_report/test/account_report_report.yml

diff --git a/addons/account_report/__openerp__.py b/addons/account_report/__openerp__.py
index 07afc6ed58f..b8029bf3563 100644
--- a/addons/account_report/__openerp__.py
+++ b/addons/account_report/__openerp__.py
@@ -42,7 +42,8 @@
         'wizard/account_report_print_indicators_with_pdf_view.xml',
         'board_account_report_view.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['account_report_demo.xml'],
+    'test': ['test/account_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0050976406925',
diff --git a/addons/account_report/account_report_demo.xml b/addons/account_report/account_report_demo.xml
new file mode 100644
index 00000000000..30f1318c592
--- /dev/null
+++ b/addons/account_report/account_report_demo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    	<record id="account_report_1" model="account.report.report">
+            <field name="name">Account Demo Report</field>
+            <field name="code">ADR</field>
+            <field name="type">fiscal</field>
+            <field name="expression">debit&gt;0.0</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml
index 52133cb894e..160cd435ada 100644
--- a/addons/account_report/report/print_indicator.rml
+++ b/addons/account_report/report/print_indicator.rml
@@ -119,7 +119,7 @@
 		</blockTable>
 		<blockTable colWidths="528.0" repeatRows="1" style="Table7">
 		<tr>
-			<td><para style="P5"> <font color="white">[['..........'*(o['level']) ]]</font> <font>[[ format(o['note']) or removeParentNode('blockTable') ]]</font></para></td>
+			<td><para style="P5"> <font color="white">[['..........'*(o['level']) ]]</font> <font>[[ format(o['note'] or  '') or removeParentNode('blockTable') ]]</font></para></td>
 		</tr>
 		</blockTable>
 	</section>
diff --git a/addons/account_report/test/account_report_report.yml b/addons/account_report/test/account_report_report.yml
new file mode 100644
index 00000000000..d94dce1f553
--- /dev/null
+++ b/addons/account_report/test/account_report_report.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the PDF reports defined on Account, Print a Financial Statement Report
+- 
+  !python {model: account.report.report}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.accounting.report').create(cr, uid, [ref('account_report.account_report_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_report-financial_statement_report.'+format), 'wb+').write(data)
+-
+  Print the Indicators Report in Normal mode
+-
+  !python {model: account.report.history }: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'ir.ui.menu', 'form': {'select_base':'year','base_selection':[ref('account.data_fiscalyear')],'context':{}}}
+    (data, format) = netsvc.LocalService('report.print.indicators').create(cr, uid, [], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_report-indicators_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 416220ea9040ed5dcc762b7b67b8baa0756981a9 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 16 Sep 2010 22:08:39 +0530
Subject: [PATCH 048/118] [IMP/FIX] Account : More yml test for reports

bzr revid: jvo@tinyerp.com-20100916163839-wraq5zl13tb0xdow
---
 addons/account/report/tax_report.py    |  2 --
 addons/account/test/account_report.yml | 44 +++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 15607a79011..a89335f99c5 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -212,10 +212,8 @@ class tax_report(rml_parse.rml_parse):
 			result_accounts.append(account_elem)
 			ind+=1
 
-
 		return result_accounts
 
-
 report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
 	'addons/account/report/tax_report.rml', parser=tax_report, header="internal")
 
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index fbb2c9effb3..3dc65b10219 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -12,10 +12,33 @@
 - 
   !python {model: res.partner}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c'),ref('base.res_partner_sednacom'),ref('base.res_partner_thymbra'),ref('base.res_partner_desertic_hispafuentes'),ref('base.res_partner_tinyatwork'),ref('base.res_partner_2'),ref('base.res_partner_3'),ref('base.res_partner_4'),ref('base.res_partner_5'),ref('base.res_partner_6'),ref('base.res_partner_maxtor'),ref('base.res_partner_seagate'),ref('base.res_partner_8'),ref('base.res_partner_9'),ref('base.res_partner_10'),ref('base.res_partner_11'),ref('base.res_partner_14'),ref('base.res_partner_15'),ref('base.res_partner_accent')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
 
+#-
+#  Demo data for Account tax code
+#-
+# !record {model: account.tax.code, id: account_tax_code0}:
+#    name : Tax Code Test
+#-
+# Print Tax Code entries report
+#- 
+#  !python {model: account.tax.code}: |
+#    import netsvc, tools, os
+#    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref("account.account_tax_code0")], {}, {})
+#    if tools.config['test_report_directory']:
+#        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on an invoice, we will print an invoice
+- 
+  !python {model: account.invoice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
+
 -
   Print the Aged Partner Balance Report
 -
@@ -41,15 +64,26 @@
        file(os.path.join(tools.config['test_report_directory'], 'account-aged_partner_balance.'+format), 'wb+').write(data)
 
 -
-  Print the Account Balance Report in Landscape mode
+  Print the Compare Account Balance Report in Normal mode
+-
+  !python {model: account.account}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.account', 'form': {'id':ref('account.bal'),'chart_account_id':ref('account.chart0'),'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear': [ref('account.data_fiscalyear')] ,'target_move': 'all','periods': [],'context':{'state':'all'}}}
+    (data, format) = netsvc.LocalService('report.account.balance.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-compare-account_balance.'+format), 'wb+').write(data)
+
+-
+  Print the Compare Account Balance Report in Landscape mode
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
     data_dict = {'model': 'account.account', 'form': {'id':ref('account.bal'),'chart_account_id':ref('account.chart0'),'select_account': False,'format_perc':0,'show_columns' :0, 'compare_pattern': 'none','account_choice': 'moves','landscape':1,'period_manner': 'actual','fiscalyear': [ref('account.data_fiscalyear')] ,'target_move': 'all','periods': [],'context':{'state':'all'}}}
     (data, format) = netsvc.LocalService('report.account.account.balance.landscape').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-landscape.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'account-compare-account_balance-landscape.'+format), 'wb+').write(data)
 
+ 
 -
   Print the Account Balance Sheet in Hotizontal mode
 -
@@ -248,4 +282,6 @@
     data_dict = {'model': 'ir.ui.menu', 'form': {'display_type': True,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal'),'active_ids':acc_ids }}
     (data, format) = netsvc.LocalService('report.pl.account.horizontal').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss-horizontal.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss-horizontal.'+format), 'wb+').write(data)
+ 
+ 
\ No newline at end of file

From 8e79e7a22011d3b8d9e571c11bd2a03b2a4679dc Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Thu, 16 Sep 2010 22:35:41 +0530
Subject: [PATCH 049/118] [IMP] account_reporting : YML test for report added

bzr revid: ach@tinyerp.com-20100916170541-04lc7ihk3t62a5vc
---
 addons/account_reporting/__openerp__.py                  | 3 ++-
 addons/account_reporting/account_reporting_demo.xml      | 9 +++++++++
 .../account_reporting/test/account_reporting_report.yml  | 9 +++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 addons/account_reporting/account_reporting_demo.xml
 create mode 100644 addons/account_reporting/test/account_reporting_report.yml

diff --git a/addons/account_reporting/__openerp__.py b/addons/account_reporting/__openerp__.py
index 5ac93d17984..fb05e755ac2 100644
--- a/addons/account_reporting/__openerp__.py
+++ b/addons/account_reporting/__openerp__.py
@@ -36,7 +36,8 @@
         'account_data.xml',
         'wizard/account_reporting_balance_report_view.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['account_reporting_demo.xml'],
+    'test': ['test/account_reporting_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0072305016797',
diff --git a/addons/account_reporting/account_reporting_demo.xml b/addons/account_reporting/account_reporting_demo.xml
new file mode 100644
index 00000000000..880fa51deda
--- /dev/null
+++ b/addons/account_reporting/account_reporting_demo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    	<record id="account_balance_sheet_1" model="account.report.bs">
+            <field name="name">My Balance Sheet</field>
+            <field name="code">MBS</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_reporting/test/account_reporting_report.yml b/addons/account_reporting/test/account_reporting_report.yml
new file mode 100644
index 00000000000..9754f53cc4d
--- /dev/null
+++ b/addons/account_reporting/test/account_reporting_report.yml
@@ -0,0 +1,9 @@
+-
+  Print the Balance Sheet Report in Normal mode
+-
+  !python {model: account.report.bs }: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'account.report.bs', 'form': {'fiscalyear':ref('account.data_fiscalyear'),'periods':[ref('account.period_1'),ref('account.period_2'),ref('account.period_3')],'context':{}}}
+    (data, format) = netsvc.LocalService('report.account.report.bs').create(cr, uid, [ref('account_reporting.account_balance_sheet_1')], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account_reporting-balance_sheet_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 9ce59172fbbb7ec5faf9dfaae4dedfbcdd20c855 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 16 Sep 2010 23:22:58 +0530
Subject: [PATCH 050/118] [FIX]: fix a problem in the wiki module [FIX]: fix a
 view for the journal voucher view

bzr revid: mga@tinyerp.com-20100916175258-vjz4pnjh3eqlgb7k
---
 addons/account/account.py                     | 21 +++++
 .../voucher_sales_purchase_view.xml           |  6 +-
 addons/account_voucher/voucher_view.xml       | 11 +++
 addons/wiki/wiki.py                           | 66 ++++++++--------
 addons/wiki/wiki_view.xml                     | 76 +++++++++----------
 5 files changed, 106 insertions(+), 74 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 625bcd1a6a8..375d1a046d2 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -686,6 +686,27 @@ class account_journal(osv.osv):
             vals.update({'sequence_id' : self.create_sequence(cr, uid, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
+    def name_get(self, cr, user, ids, context={}):
+        """
+        Returns a list of tupples containing id, name.
+        result format : {[(id, name), (id, name), ...]}
+        
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a list of tupples containing id, name
+        """
+        result = self.browse(cr, user, ids, context)
+        res = []
+        for rs in result:
+            name = rs.name 
+            if rs.currency:
+                name = "%s (%s)" % (rs.name, rs.currency.name)
+            res += [(rs.id, name)]
+        return res
+    
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7dd79c2d829..b72faa46d46 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -102,6 +102,7 @@
                         <field name="name" colspan="4"/>
                         <field name="date" on_change="onchange_date(date)"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="True" nolabel="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Information">
@@ -133,7 +134,7 @@
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="currency_id" invisible="True" nolabel="1"/><field name="amount" string="Total"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
@@ -211,6 +212,7 @@
                         <field name="reference" select="1"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="True" nolabel="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
@@ -235,7 +237,7 @@
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="currency_id" invisible="True" nolabel="1"/><field name="amount" string="Total"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 94b257775c1..9291567ca24 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -147,6 +147,17 @@
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="search_view_id" ref="view_voucher_filter"/>
         </record>
+        <record id="action_journal_voucher_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_voucher_list"/>
+        </record>
+        <record id="action_journal_voucher_form" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_voucher_form"/>
+            <field name="act_window_id" ref="action_voucher_list"/>
+        </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
         <act_window
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index ab19dc8f4eb..ff21e394fa9 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -24,13 +24,13 @@ from osv import fields, osv
 from tools.translate import _
 import difflib
 
-class Wiki(osv.osv):
+class wiki_wiki(osv.osv):
     """ wiki """
     _name = "wiki.wiki"
 
-Wiki()
+wiki_wiki()
 
-class WikiGroup(osv.osv):
+class wiki_group(osv.osv):
     """ Wiki Groups """
 
     _name = "wiki.groups"
@@ -45,8 +45,8 @@ class WikiGroup(osv.osv):
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
-                                   ('tree', 'Tree')], 'Display Method'),
-       'home':fields.many2one('wiki.wiki', 'Home Page'),
+                                   ('tree', 'Tree')], 'Display Method', help="Define the default behaviour of the menu created on this group"),
+       'home':fields.many2one('wiki.wiki', 'Home Page', help="Required to select home page if display method is Home Page"),
        'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
     }
 
@@ -94,10 +94,10 @@ class WikiGroup(osv.osv):
             value['view_type'] = 'tree'
 
         return value
-WikiGroup()
+wiki_group()
 
 
-class Wiki2(osv.osv):
+class wiki_wiki2(osv.osv):
     """ Wiki Page """
 
     _inherit = "wiki.wiki"
@@ -111,7 +111,7 @@ class Wiki2(osv.osv):
         'create_uid': fields.many2one('res.users', 'Author', select=True),
         'create_date': fields.datetime("Created on", select=True),
         'write_date': fields.datetime("Modification Date", select=True),
-        'tags': fields.char('Tags', size=1024, select=True),
+        'tags': fields.char('Keywords', size=1024, select=True),
         'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
         'minor_edit': fields.boolean('Minor edit', select=True),
         'summary': fields.char('Summary', size=256),
@@ -119,12 +119,17 @@ class Wiki2(osv.osv):
         'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null',
             help="Topic, also called Wiki Group"),
         'toc': fields.boolean('Table of Contents',
-            help="Indicates that this pages is a table of contents (linking to other pages)"),
+            help="Indicates that this pages have a table of contents or not"),
         'review': fields.boolean('Needs Review', select=True,
             help="Indicates that this page should be reviewed, raising the attention of other contributors"),
-        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
+        'parent_id': fields.many2one('wiki.wiki', 'Parent Page', help="Allows you to link with the other page with in the current topic"),
         'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
+    _defaults = {
+        'toc': lambda *a: True,
+        'review': lambda *a: True,
+        'minor_edit': lambda *a: True,
+    }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
 
@@ -160,23 +165,28 @@ class Wiki2(osv.osv):
             @param id: Give wiki page's ID """
 
         return super(Wiki, self).copy_data(cr, uid, id, {'wiki_id': False}, context)
-
-    def create(self, cr, uid, vals, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks, """
-
-        id = super(Wiki, self).create(cr, uid, vals, context)
+    
+    def create_history(self, cr, uid, ids, vals, context=None):
+        history_id = False
         history = self.pool.get('wiki.wiki.history')
         if vals.get('text_area'):
             res = {
                 'minor_edit': vals.get('minor_edit', True),
                 'text_area': vals.get('text_area', ''),
                 'write_uid': uid,
-                'wiki_id': id,
+                'wiki_id': ids[0],
                 'summary':vals.get('summary', '')
             }
-            history.create(cr, uid, res)
+            history_id = history.create(cr, uid, res)
+        return history_id
+    
+    def create(self, cr, uid, vals, context=None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks, """
+
+        id = super(Wiki, self).create(cr, uid, vals, context)
+        self.create_history(cr, uid, [id], vals, context)
         return id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -185,23 +195,13 @@ class Wiki2(osv.osv):
             @param uid: the current user’s ID for security checks, """
 
         result = super(Wiki, self).write(cr, uid, ids, vals, context)
-        history = self.pool.get('wiki.wiki.history')
-        if vals.get('text_area'):
-            for id in ids:
-                res = {
-                    'minor_edit': vals.get('minor_edit', True),
-                    'text_area': vals.get('text_area', ''),
-                    'write_uid': uid,
-                    'wiki_id': id,
-                    'summary': vals.get('summary', '')
-                }
-                history.create(cr, uid, res)
+        self.create_history(cr, uid, ids, vals, context)
         return result
 
-Wiki2()
+wiki_wiki2()
 
 
-class History(osv.osv):
+class wiki_history(osv.osv):
     """ Wiki History """
 
     _name = "wiki.wiki.history"
@@ -240,6 +240,6 @@ class History(osv.osv):
         diff = difflib.HtmlDiff()
         return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
 
-History()
+wiki_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 5c9aa842e98..04f33be35cb 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -12,8 +12,7 @@
            parent="knowledge.menu_document_configuration" sequence="2" />
 
 
-<!--  Wiki Groups Tree view -->
-
+        <!--  Wiki Groups Tree view -->
        <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
@@ -25,23 +24,25 @@
             </field>
         </record>
 
-<!--  Wiki Groups Form view -->
-
+        <!--  Wiki Groups Form view -->
         <record model="ir.ui.view" id="wiki_group_form">
             <field name="name">wiki.groups.form</field>
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wiki Groups">
-                    <group colspan="4" col="4">
+                    <group col="4" colspan="3" >
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
+                    </group>
+                    <group col="2" colspan="1">
                         <field name="method" select="1"/>
-                        <field name="home" select="1"
+                        <field name="home" select="1" domain="[('group_id','=',active_id)]"
                             attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
                     <page string="Notes">
+                        <separator string="Group Description" colspan="4"/>
                         <field name="notes" colspan="4" nolabel="1"/>
                     </page><page string="Configuration">
                         <separator string="Page Template" colspan="4"/>
@@ -64,8 +65,7 @@
             </field>
         </record>
 
-<!--  Wiki Groups Action  -->
-
+        <!--  Wiki Groups Action  -->
         <record model="ir.actions.act_window" id="action_wiki_groups">
             <field name="name">Wiki Groups</field>
             <field name="res_model">wiki.groups</field>
@@ -84,8 +84,7 @@
             <field name="view_type">tree</field>
         </record>
 
-<!-- wiki Tree view For child -->
-
+        <!-- wiki Tree view For child -->
         <record id="view_wiki_tree_childs" model="ir.ui.view">
             <field name="name">wiki.wiki.tree.childs</field>
             <field name="model">wiki.wiki</field>
@@ -103,8 +102,7 @@
             </field>
         </record>
 
-<!-- wiki Tree view  -->
-
+        <!-- wiki Tree view  -->
         <record model="ir.ui.view" id="view_wiki_tree">
             <field name="name">wiki.wiki.tree</field>
             <field name="model">wiki.wiki</field>
@@ -112,27 +110,28 @@
             <field name="arch" type="xml">
                 <tree string="Wiki">
                     <field name="name"/>
+                    <field name="group_id"/>
                     <field name="section" invisible="not context.get('section',False)"/>
-                    <field name="group_id" invisible="context.get('group_id',False)"/>
                     <field name="review"/>
+                    <field name="create_uid" invisible="context.get('create_uid',False)"/>
                     <field name="write_uid"/>
                     <field name="write_date"/>
                 </tree>
             </field>
         </record>
 
-<!-- wiki Form view  -->
-
+        <!-- wiki Form view  -->
         <record model="ir.ui.view" id="view_wiki_form">
             <field name="name">wiki.wiki.form</field>
             <field name="model">wiki.wiki</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wiki">
-                    <group col="8" colspan="4">
-                        <field name="name" select="1" colspan="8"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="6"/>
                         <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section"/>
+                        <field name="parent_id" groups="base.group_extended" domain="[('group_id','=',group_id)]"/>
+                        <field name="section"/>                        
                     </group>
                     <notebook colspan="4">
                         <page string="Content">
@@ -140,44 +139,47 @@
                         <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                         </page>
                     </notebook>
-                    <separator colspan="4" string="Modifications"/>
-                    <group col="4" colspan="4">
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Modification Information"/>
                         <field name="write_date" readonly="1"/>
-                        <field name="review" select="1"/>
-                        <field name="tags" select="1" groups="base.group_extended"/>
-                        <field name="toc"/>
+                        <field name="minor_edit" groups="base.group_extended"/>
+                        <field name="review" select="1" groups="base.group_extended"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Meta Information"/>
+                        <field name="tags" select="1"/>
+                        <field name="toc" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
         </record>
 
-    <!-- wiki Search view  -->
-
+        <!-- wiki Search view  -->
         <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">wiki.wiki.search</field>
             <field name="model">wiki.wiki</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
-                    <filter icon="terp-check" string="Need Review" domain="[('review','=',True)]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="section" select="1"/>
                     <field name="name" select="1"/>
                     <field name="group_id" select="1"/>
+                    <field name="tags" select="1"/>
+                    <field name="section" select="1" groups="base.group_extended"/>
                     <field name="write_uid" select="1"/>
                     <field name="write_date" select="1"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="8" col="6">
-                        <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
+                        <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter icon="terp-personal-" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
+                        <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
                     </group>
                 </search>
             </field>
         </record>
 
-<!-- search page for wiki -->
-
+        <!-- search page for wiki -->
         <record model="ir.actions.act_window" id="action_wiki">
             <field name="name">Wiki Pages</field>
             <field name="res_model">wiki.wiki</field>
@@ -192,8 +194,7 @@
             id="menu_action_wiki_wiki" name="Wiki Pages"
             action="action_wiki" />
 
-<!--  Pages Waiting Review -->
-
+        <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
             <field name="name">Pages Waiting Review</field>
             <field name="res_model">wiki.wiki</field>
@@ -205,8 +206,7 @@
             <field name="filter" eval="True"/>
         </record>
 
-<!-- History Tree view -->
-
+        <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
             <field name="model">wiki.wiki.history</field>
@@ -221,8 +221,7 @@
             </field>
         </record>
 
-<!-- History Form view  -->
-
+        <!-- History Form view  -->
         <record model="ir.ui.view" id="wiki_history_form">
             <field name="name">wiki.wiki.history.form</field>
             <field name="model">wiki.wiki.history</field>
@@ -238,8 +237,7 @@
             </field>
         </record>
 
-<!-- History Action  -->
-
+        <!-- History Action  -->
         <record model="ir.actions.act_window" id="action_history">
             <field name="name">All Page Histories</field>
             <field name="res_model">wiki.wiki.history</field>

From c8e1c459430bda386d98275244eee44060a15915 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 02:57:23 +0530
Subject: [PATCH 051/118] [IMP/FIX] Account : Completion of test for reports

bzr revid: jvo@tinyerp.com-20100916212723-i9dvncrwn6p0w629
---
 addons/account/report/voucher_print.rml |   2 +-
 addons/account/test/account_report.yml  | 126 +++++++++++++++++++++---
 2 files changed, 113 insertions(+), 15 deletions(-)

diff --git a/addons/account/report/voucher_print.rml b/addons/account/report/voucher_print.rml
index abfa714aa43..b1d7941068c 100644
--- a/addons/account/report/voucher_print.rml
+++ b/addons/account/report/voucher_print.rml
@@ -325,7 +325,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P9">[[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]]</para>
+          <para style="P9">[[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="P2">
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 3dc65b10219..44899ec1d8d 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -16,20 +16,38 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
 
+-
+  In order to test the PDF reports defined on Account Move, we will print the Voucher Report
+- 
+  !python {model: account.move}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
+
 #-
 #  Demo data for Account tax code
 #-
-# !record {model: account.tax.code, id: account_tax_code0}:
+#  !record {model: account.tax.code, id: account_tax_code_0}:
 #    name : Tax Code Test
 #-
 # Print Tax Code entries report
 #- 
 #  !python {model: account.tax.code}: |
 #    import netsvc, tools, os
-#    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref("account.account_tax_code0")], {}, {})
+#    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account.account_tax_code_0')], {}, {})
 #    if tools.config['test_report_directory']:
 #        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
 
+#-
+#  Print Vat Declaration Report
+#-
+#   !python {model: account.tax.code}: |
+#    import netsvc, tools, os
+#    data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
+#   (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account.account_tax_code0")], data_dict, {})
+#    if tools.config['test_report_directory']:
+#       file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on an invoice, we will print an invoice
 - 
@@ -57,7 +75,18 @@
             'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
         }
         start = stop - RelativeDateTime(days=1)
-    data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': [], 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : 'True', 'id': 1,'result_selection': 'customer','direction_selection': 'past'}}
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    
+    data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': period_list,'journal_ids':journal_ids, 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : query_line, 'result_selection': 'customer','direction_selection': 'past','fiscalyear_id':fy_id}}
     data_dict['form'].update(res)
     (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
@@ -85,7 +114,7 @@
 
  
 -
-  Print the Account Balance Sheet in Hotizontal mode
+  Print the Account Balance Sheet in Horizontal mode
 -
   !python {model: account.account}: |
     import netsvc, tools, os, time
@@ -132,7 +161,14 @@
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
 
-    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
@@ -154,7 +190,14 @@
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
     
-    data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
     (data, format) = netsvc.LocalService('report.account.general.journal').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-general_journal.'+format), 'wb+').write(data)
@@ -168,7 +211,16 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':' True ','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    
+    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query': query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger.'+format), 'wb+').write(data)
@@ -188,7 +240,16 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':' True ','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    
+    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-landscape.'+format), 'wb+').write(data)
@@ -210,7 +271,15 @@
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
 
-    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    
+    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal.'+format), 'wb+').write(data)
@@ -228,8 +297,18 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all','query_line':' True '}}
+
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
@@ -239,8 +318,19 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':' True ','amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all','query_line':'True '}}
+
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    
+    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-partner_ledger.'+format), 'wb+').write(data)
@@ -250,8 +340,18 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os, time
+    fy_id = ref('account.data_fiscalyear')
+    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':' True ','amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all','query_line':' True '}}
+
+    obj_move = self.pool.get('account.move.line')
+    ctx = {}
+    ctx['fiscalyear'] = fy_id
+    ctx['journal_ids'] = journal_ids
+    ctx['chart_account_id'] = ref('account.chart0')
+    
+    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
+    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger_other').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-partner_ledger-other.'+format), 'wb+').write(data)
@@ -283,5 +383,3 @@
     (data, format) = netsvc.LocalService('report.pl.account.horizontal').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss-horizontal.'+format), 'wb+').write(data)
- 
- 
\ No newline at end of file

From f60ec8bc68c45657c8ab2fca93a3a6b01de0f75a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 09:39:40 +0530
Subject: [PATCH 052/118] [FIX] wiki: small fix

bzr revid: mra@mra-laptop-20100917040940-9aqyvanpxqid9l4w
---
 addons/wiki/wiki.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index ff21e394fa9..4f78b2f7c85 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -71,7 +71,7 @@ class wiki_group(osv.osv):
             group_id = ids[0]
         if not group_id:
             return {}
-        value = {            
+        value = {
             'name': 'Wiki Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
@@ -165,7 +165,7 @@ class wiki_wiki2(osv.osv):
             @param id: Give wiki page's ID """
 
         return super(Wiki, self).copy_data(cr, uid, id, {'wiki_id': False}, context)
-    
+
     def create_history(self, cr, uid, ids, vals, context=None):
         history_id = False
         history = self.pool.get('wiki.wiki.history')
@@ -179,13 +179,13 @@ class wiki_wiki2(osv.osv):
             }
             history_id = history.create(cr, uid, res)
         return history_id
-    
+
     def create(self, cr, uid, vals, context=None):
 
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks, """
 
-        id = super(Wiki, self).create(cr, uid, vals, context)
+        id = super(wiki_wiki2, self).create(cr, uid, vals, context)
         self.create_history(cr, uid, [id], vals, context)
         return id
 
@@ -194,7 +194,7 @@ class wiki_wiki2(osv.osv):
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks, """
 
-        result = super(Wiki, self).write(cr, uid, ids, vals, context)
+        result = super(wiki_wiki2, self).write(cr, uid, ids, vals, context)
         self.create_history(cr, uid, ids, vals, context)
         return result
 

From 0f70b04e5bcb7f188772be272ee8a60893af7010 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 09:57:22 +0530
Subject: [PATCH 053/118] [IMP] survey : YML test for report added

bzr revid: ach@tinyerp.com-20100917042722-f6vpep1bq4brfr9o
---
 addons/survey/test/survey_report.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/survey/test/survey_report.yml b/addons/survey/test/survey_report.yml
index 13f012cd5a7..adb3ddb28ed 100644
--- a/addons/survey/test/survey_report.yml
+++ b/addons/survey/test/survey_report.yml
@@ -1,8 +1,24 @@
 -
-  In order to test the PDF reports defined on a survey, we will print a survey
+  In order to test the PDF reports defined on a Survey, we will print Survey Analysis Report
 - 
   !python {model: survey}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.survey.analysis').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'survey-report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'survey-survey_analysis_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Survey, we will print Survey Browse Response Report
+- 
+  !python {model: survey}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.survey.browse.response').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'survey-survey_browse_response_report.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Survey, we will print Survey Form Report
+- 
+  !python {model: survey}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.survey.form').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'survey-survey_form_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 122fcfe9c823fc62e840dd91437f8b1cff7a388b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 10:11:11 +0530
Subject: [PATCH 054/118] [IMP] Account: move Target_move field (All entrires
 or posted one) into common class for partner account

bzr revid: mra@mra-laptop-20100917044111-oceth6a9lmfqigo0
---
 .../wizard/account_report_aged_partner_balance.py      |  5 +----
 addons/account/wizard/account_report_common_partner.py |  6 +++++-
 .../account/wizard/account_report_partner_balance.py   | 10 ++++------
 addons/account/wizard/account_report_partner_ledger.py |  5 +----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index cef1860b45b..b8b2a013d78 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -37,14 +37,11 @@ class account_aged_trial_balance(osv.osv_memory):
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
     _defaults = {
         'period_length': 30,
         'date_from' : time.strftime('%Y-%m-%d'),
         'direction_selection': 'past',
-        'target_move': 'all',
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -64,7 +61,7 @@ class account_aged_trial_balance(osv.osv_memory):
             context = {}
 
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection'])[0])
 
         period_length = data['form']['period_length']
         if period_length<=0:
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index fe71ccb08f2..64bbde2cdd3 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -30,15 +30,19 @@ class account_common_partner_report(osv.osv_memory):
                                               ('supplier','Payable Accounts'),
                                               ('customer_supplier' ,'Receivable and Payable Accounts')],
                                               "Partner's", required=True),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
+
     _defaults = {
         'result_selection': 'customer',
+        'target_move': 'all'
     }
 
     def pre_print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['result_selection'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['result_selection', 'target_move'])[0])
         return data
 
 account_common_partner_report()
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 5e5ca64173b..79fd63f332e 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -33,20 +33,18 @@ class account_partner_balance(osv.osv_memory):
 #                                    ,help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
                                     ,'Display Partners'),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
-                }
+    }
+
     _defaults = {
 #        'initial_balance': True,
         'display_partner': 'non-zero_balance',
-        'target_move': 'all'
-                }
+    }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_partner', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 53dbf12c348..8b1a5ec4f20 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -35,22 +35,19 @@ class account_partner_ledger(osv.osv_memory):
         'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
         'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
 
     }
     _defaults = {
        'reconcil': True,
        'initial_balance': True,
        'page_split': False,
-       'target_move': 'all'
     }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])
         if data['form']['page_split']:
             return {
                 'type': 'ir.actions.report.xml',

From 552d2c72446aa7e881a02f57c5e311935c86b40a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 10:13:04 +0530
Subject: [PATCH 055/118] [REF]

bzr revid: mra@mra-laptop-20100917044304-jggh2nqc38k91mtq
---
 .../account/wizard/account_report_aged_partner_balance.py   | 6 +++---
 addons/account/wizard/account_report_partner_balance.py     | 2 +-
 addons/account/wizard/account_report_partner_ledger.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index b8b2a013d78..99983654c82 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -78,7 +78,7 @@ class account_aged_trial_balance(osv.osv_memory):
                     'name': (i!=0 and (str((5-(i+1)) * period_length) + '-' + str((5-i) * period_length)) or ('+'+str(4 * period_length))),
                     'stop': start.strftime('%Y-%m-%d'),
                     'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
-                    }
+                }
                 start = stop - RelativeDateTime(days=1)
         else:
             for i in range(5):
@@ -87,7 +87,7 @@ class account_aged_trial_balance(osv.osv_memory):
                     'name' : (i!=4 and str((i) * period_length)+'-' + str((i+1) * period_length) or ('+'+str(4 * period_length))),
                     'start': start.strftime('%Y-%m-%d'),
                     'stop': (i!=4 and stop.strftime('%Y-%m-%d') or False),
-                    }
+                }
                 start = stop + RelativeDateTime(days=1)
         data['form'].update(res)
 
@@ -95,7 +95,7 @@ class account_aged_trial_balance(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.aged_trial_balance',
             'datas': data
-                }
+        }
 
 account_aged_trial_balance()
 
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 79fd63f332e..744e8bf5fc1 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -49,7 +49,7 @@ class account_partner_balance(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',
             'datas': data,
-                }
+    }
 
 account_partner_balance()
 
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 8b1a5ec4f20..e0e3778966b 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -53,7 +53,7 @@ class account_partner_ledger(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.third_party_ledger',
                 'datas': data,
-            }
+        }
         return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.third_party_ledger_other',

From 02a9c6f837ce310f5ef3bf92eed5ef171031a9d8 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 10:20:55 +0530
Subject: [PATCH 056/118] [IMP] point_of_sale : yml test report added

bzr revid: jma@tinyerp.com-20100917045055-iboip65l02zg6i2m
---
 addons/point_of_sale/__openerp__.py                   | 3 ++-
 addons/point_of_sale/test/pos_payment_report_date.yml | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 addons/point_of_sale/test/pos_payment_report_date.yml

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 21c7bdaab45..6f33f75f65d 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -75,7 +75,8 @@ Main features :
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
     'test':['test/pos_test.yml',
             'test/pos_report.yml',
-            'test/pos_details.yml'],
+            'test/pos_details.yml',
+            'test/pos_payment_report_date.yml'],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/test/pos_payment_report_date.yml b/addons/point_of_sale/test/pos_payment_report_date.yml
new file mode 100644
index 00000000000..15eefcdc6ab
--- /dev/null
+++ b/addons/point_of_sale/test/pos_payment_report_date.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Sales Lines report
+- 
+  !python {model: ir.ui.menu}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
\ No newline at end of file

From 55ba7cb48db7db539d97482c16050fb5c8d079f4 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 17 Sep 2010 11:16:52 +0530
Subject: [PATCH 057/118] [IMP][ADD] account: added new parent view account for
 bank account and revert some changes from demo & removed sencondary currency
 assignment from confi. account dict.

bzr revid: vra@tinyerp.com-20100917054652-8b67g6hoat9mnb3k
---
 addons/account/configurable_account_chart.xml |  4 ++--
 addons/account/installer.py                   | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index c0c898d4987..d4abad7d924 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -187,8 +187,8 @@
 			            <field name="code">1104</field>
 			            <field name="name">Bank Current Account</field>
 			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">view</field>
-			            <field name="user_type" ref="account_type_asset_view1"/>
+			            <field name="type">liquidity</field>
+			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
 
 		        <record id="conf_cli" model="account.account.template">
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 415879e6de8..deb47f98346 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -195,7 +195,7 @@ class account_installer(osv.osv_memory):
             vals={
                 'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name,
                 #'sign': account_template.sign,
-                'currency_id': account_template.currency_id and account_template.currency_id.id or False,
+                #'currency_id': account_template.currency_id and account_template.currency_id.id or False,
                 'code': code_acc,
                 'type': account_template.type,
                 'user_type': account_template.user_type and account_template.user_type.id or False,
@@ -209,6 +209,19 @@ 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':
+                b_vals={
+                    'name': 'Bank Accounts',
+                    'code': '110500',
+                    'type': 'view',
+                    'user_type': account_template.parent_id.user_type and account_template.user_type.id or False,
+                    'shortcut': account_template.shortcut,
+                    'note': account_template.note,
+                    'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
+                    'tax_ids': [(6,0,tax_ids)],
+                    'company_id': company_id.id,
+                }
+                bank_account = obj_acc.create(cr, uid, b_vals)
+                
                 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
@@ -265,10 +278,10 @@ class account_installer(osv.osv_memory):
 
                     vals_bnk = {'name': val.acc_name or '',
                         'currency_id': val.currency_id.id or False,
-                        'code': str(110400 + code_cnt),
+                        'code': str(110500 + code_cnt),
                         'type': 'liquidity',
                         'user_type': type,
-                        'parent_id':new_account,
+                        'parent_id':bank_account,
                         'company_id': company_id.id }
                     child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
                     vals_seq_child = {

From 799e478d18b16be5ce54eab886b5c15f7eec53a8 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 11:22:02 +0530
Subject: [PATCH 058/118] [IMP] stock : YML test for report and demo data added

bzr revid: ach@tinyerp.com-20100917055202-watsndx8n2biait4
---
 addons/stock/stock_demo.xml                   |  8 +++-
 .../test/stock_inventory_move_report.yml      |  8 ----
 .../stock/test/stock_lot_location_report.yml  |  8 ----
 addons/stock/test/stock_overview_report.yml   |  8 ----
 .../stock/test/stock_overviewall_report.yml   |  8 ----
 addons/stock/test/stock_report.yml            | 48 +++++++++++++++++++
 6 files changed, 55 insertions(+), 33 deletions(-)
 delete mode 100644 addons/stock/test/stock_inventory_move_report.yml
 delete mode 100644 addons/stock/test/stock_lot_location_report.yml
 delete mode 100644 addons/stock/test/stock_overview_report.yml
 delete mode 100644 addons/stock/test/stock_overviewall_report.yml
 create mode 100644 addons/stock/test/stock_report.yml

diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 6607d97b2b3..03a29838981 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -270,6 +270,12 @@
 			<field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
  			<field name="company_id" ref="base.main_company"/>
         </record>
-
+		 <record id="stock_picking_1" model="stock.picking">
+            <field name="name">PACKO1</field>
+            <field name="type">out</field>
+            <field name="move_type">direct</field>
+            <field name="invoice_state">2binvoiced</field>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/test/stock_inventory_move_report.yml b/addons/stock/test/stock_inventory_move_report.yml
deleted file mode 100644
index a92db995427..00000000000
--- a/addons/stock/test/stock_inventory_move_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on stock inventory, we will print a Stock Inventory Move report
-- 
-  !python {model: stock.inventory}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock.stock_inventory_0')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_inventory_move.'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_lot_location_report.yml b/addons/stock/test/stock_lot_location_report.yml
deleted file mode 100644
index d31bdf620d4..00000000000
--- a/addons/stock/test/stock_lot_location_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on stock location, we will print a lot location report
-- 
-  !python {model: stock.location}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lot.location').create(cr, uid, [ref('stock.stock_location_components')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_lot_location.'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_overview_report.yml b/addons/stock/test/stock_overview_report.yml
deleted file mode 100644
index 22d75625a63..00000000000
--- a/addons/stock/test/stock_overview_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a stock, we will print a Stock Overview report
-- 
-  !python {model: stock.location}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('stock.stock_location_14')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-overview'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_overviewall_report.yml b/addons/stock/test/stock_overviewall_report.yml
deleted file mode 100644
index 8f3bb61d044..00000000000
--- a/addons/stock/test/stock_overviewall_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
-- 
-  !python {model: stock.location}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
new file mode 100644
index 00000000000..491fd7fa9d7
--- /dev/null
+++ b/addons/stock/test/stock_report.yml
@@ -0,0 +1,48 @@
+-
+  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
+- 
+  !python {model: stock.location}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on stock location, we will print a lot location report
+- 
+  !python {model: stock.location}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lot.location').create(cr, uid, [ref('stock.stock_location_components')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_lot_location.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on stock inventory, we will print a Stock Inventory Move report
+- 
+  !python {model: stock.inventory}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock.stock_inventory_0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_inventory_move.'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a stock, we will print a Stock Overview report
+- 
+  !python {model: stock.location}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('stock.stock_location_14')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-overview'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a stock, we will print a Stock Picking List report
+- 
+  !python {model: stock.picking}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-picking_list'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Stock, we will print Product Stock Report
+- 
+  !python {model: product.product}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product.product_product_pc1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'stock-product_stock_report.'+format), 'wb+').write(data)
\ No newline at end of file

From cb7dda32186e2c133a007e9c5965c11fe63c3421 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 11:24:54 +0530
Subject: [PATCH 059/118] [IMP]: crm: Changing status by "Action Rule" should
 reflect on the communication history

bzr revid: rpa@tinyerp.com-20100917055454-w572pighksn9upku
---
 addons/crm/crm_action_rule.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 074821691e8..f7df076e24d 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -121,7 +121,11 @@ this if you want the rule to send an email to the partner."),
                     write['email_cc'] = obj.email_cc+','+obj.act_email_cc
             else:
                 write['email_cc'] = obj.act_email_cc
-        
+
+        # Put state change by rule in communication history
+        if hasattr(obj, 'state') and action.act_state:
+            model_obj._history(cr, uid, [obj], _(action.act_state))
+
         model_obj.write(cr, uid, [obj.id], write, context)
         emails = []
 

From 1210a7a16136cfa11bd07070e9f6ba967d6c4e17 Mon Sep 17 00:00:00 2001
From: "DHS (OpenERP)" <dhs@tinyerp.com>
Date: Fri, 17 Sep 2010 11:34:08 +0530
Subject: [PATCH 060/118] [IMP] l10n_ch,l10n_fr,l10n_lu,mrp : yml report test
 added

bzr revid: dhs@tinyerp.com-20100917060408-10ytdjjr1jn4tnn4
---
 addons/l10n_ch/__openerp__.py  |  3 +++
 addons/l10n_fr/__openerp__.py  |  3 ++-
 addons/l10n_lu/__openerp__.py  |  1 +
 addons/mrp/test/mrp_report.yml | 17 +++++++++++++----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index de378528b33..1af2e70ca59 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -94,6 +94,9 @@ TODO :
         "account_journal_view.xml",
         "security/ir.model.access.csv",
     ],
+    'test' : [
+        'test/l10n_ch_report.yml',
+    ],
     "active": False,
     "installable": True,
 }
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index f96945a8bc8..0de26734781 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -48,8 +48,9 @@ Credits: Sistheo Zeekom CrysaLEAD
         "security/ir.model.access.csv",
         "wizard/fr_report_bilan_view.xml",
         "wizard/fr_report_compute_resultant_view.xml",
-        
+
     ],
+    "test": ['test/l10n_fr_report.yml'],
     "demo_xml" : [],
     "certificate" : "00435321693876313629",
     "active": False,
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 739f36c9ce4..d1f6ba49905 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -41,6 +41,7 @@ This module installs:
         'account.tax.template.csv',
         'wizard/print_vat_view.xml'
     ],
+    'test': ['test/l10n_lu_report.yml'],
     'demo_xml': ['account.report.report.csv'],
     'installable': True,
     'active': False,
diff --git a/addons/mrp/test/mrp_report.yml b/addons/mrp/test/mrp_report.yml
index 5c619e0b09d..6a13d489104 100644
--- a/addons/mrp/test/mrp_report.yml
+++ b/addons/mrp/test/mrp_report.yml
@@ -8,7 +8,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_order.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp, we will print a order
+  In order to test the PDF reports defined on a mrp, we will print an order
 -
   !python {model: mrp.production}: |
     import netsvc, tools, os
@@ -17,10 +17,19 @@
         file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp, we will print a (mrp)Product-price order
+  In order to test the PDF reports defined on a mrp product price, we will print a (mrp)Product Price order
 -
   !python {model: product.product}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.product.price').create(cr, uid, [ref('product.product_product_0'), ref('product.product_product_pc2'), ref('product.product_product_cpu1'), ref('product.product_product_hdd1'), ref('product.product_product_fan'), ref('product.product_product_cpu1'), ref('product.product_product_ram512')], {}, {})
+    (data, format) = netsvc.LocalService('report.product.price').create(cr, uid, [1,2,3,5], {'model':'product.product', 'form':{'number': 1}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-production-price_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_product-price_order.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a mrp workcenter, we will print a (mrp)workcenter
+-
+  !python {model: mrp.workcenter}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.mrp.workcenter.load').create(cr, uid, [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')], {'model':'mrp.workcenter', 'form':{'time_unit': 'day', 'measure_unit': 'hours'}}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_workcenter.'+format), 'wb+').write(data)

From cf8c080bacc0b122ec382b7fe733084e070589d7 Mon Sep 17 00:00:00 2001
From: "DHS (OpenERP)" <dhs@tinyerp.com>
Date: Fri, 17 Sep 2010 11:36:32 +0530
Subject: [PATCH 061/118] [IMP] l10n_ch,l10n_fr,l10n_lu : YML test for report
 added

bzr revid: dhs@tinyerp.com-20100917060632-e2d2i8ike9ywsps9
---
 addons/l10n_ch/test/l10n_ch_report.yml | 17 +++++++++++++++++
 addons/l10n_fr/test/l10n_fr_report.yml | 26 ++++++++++++++++++++++++++
 addons/l10n_lu/test/l10n_lu_report.yml | 14 ++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 addons/l10n_ch/test/l10n_ch_report.yml
 create mode 100644 addons/l10n_fr/test/l10n_fr_report.yml
 create mode 100644 addons/l10n_lu/test/l10n_lu_report.yml

diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
new file mode 100644
index 00000000000..0379e6bc83b
--- /dev/null
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the PDF reports defined on a l10n_ch, we will print a bvr_report
+-
+  !python {model: account.invoice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_order.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a l10n_ch, we will print a bvr_invoice_report
+-
+  !python {model: account.invoice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice.'+format), 'wb+').write(data)
diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
new file mode 100644
index 00000000000..cfc4f659925
--- /dev/null
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -0,0 +1,26 @@
+-
+  In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
+-
+  !record {model: account.fiscalyear, id: account_fiscalyear_0}:
+    code: FY2011
+    company_id: base.main_company
+    date_start: '2011-01-01'
+    date_stop: '2011-12-31'
+    name: Fiscal Year 2011
+-
+  In order to test the PDF reports defined on a l10n_fr, we will print a account move line for l10n_fr
+-
+  !python {model: account.move.line}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_0')}}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a l10n_fr, we will print a compute result for l10n_fr
+-
+  !python {model: account.move.line}: |
+    import netsvc, tools, os,time
+    (data, format) = netsvc.LocalService('report.l10n.fr.compute_resultant').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-compute_resultant.'+format), 'wb+').write(data)
diff --git a/addons/l10n_lu/test/l10n_lu_report.yml b/addons/l10n_lu/test/l10n_lu_report.yml
new file mode 100644
index 00000000000..0ea9850df9a
--- /dev/null
+++ b/addons/l10n_lu/test/l10n_lu_report.yml
@@ -0,0 +1,14 @@
+-
+  It is demo data for the account.tax.code
+-
+ !record {model: account.tax.code, id: account_tax_code_id_r1}:
+    name: a
+
+-
+  In order to test the PDF reports defined on a l10u_lu, we will print a vat
+-
+  !python {model: res.partner}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat.'+format), 'wb+').write(data)

From 7b51194e4e6de18c6ca781f20fb79f76ce2b14ee Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 17 Sep 2010 11:40:44 +0530
Subject: [PATCH 062/118] [ADD] account: added onchange on invoice journal
 field to set the journal currency in invoice currency field otherwise company
 currency.

bzr revid: vra@tinyerp.com-20100917061044-89lz92j7flcf53ta
---
 addons/account/account_invoice_view.xml |  4 ++--
 addons/account/invoice.py               | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 81391e796b9..4d0a73cb4d3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
                     <group col="8" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id, company_id)"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -260,7 +260,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user"/>
+                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, company_id)"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 44a57c2e11d..0c0941c715a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -452,6 +452,24 @@ class account_invoice(osv.osv):
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, company_id):
+        result = {}
+        if journal_id and company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            journal_id = self.pool.get('account.journal').browse(cr, uid, journal_id)
+            if journal_id.currency:
+                result = {'value': {
+                    'currency_id': journal_id.currency.id
+                    }
+                }
+            else:
+                result = {'value': {
+                    'currency_id': company.currency_id.id
+                    }
+                }
+                
+        return result
+
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
         if not payment_term_id:
             return {}

From 5ad4e3bc2ef28aa8b9f2b89b8e40925ca0c223f9 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 11:41:35 +0530
Subject: [PATCH 063/118] [FIX] stock,sale_layout : __openerp__.py file
 corrected

bzr revid: ach@tinyerp.com-20100917061135-4orswyxxv9pv3dbt
---
 addons/sale_layout/__openerp__.py | 2 +-
 addons/stock/__openerp__.py       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index 898915b6d99..b8490c02fc9 100755
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -40,7 +40,7 @@
         "sale_layout_view.xml",
         "sale_layout_report.xml",
     ],
-    "test" : ['sale_layout_report.yml'],
+    "test" : ['test/sale_layout_report.yml'],
     "active": False,
     "installable": True
 }
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index e961c49333a..432f95242bd 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -75,10 +75,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "board_warehouse_view.xml"
     ],
     'test': ['test/stock_test.yml',
-             'test/stock_inventory_move_report.yml',
-             'test/stock_lot_location_report.yml',
-             'test/stock_overview_report.yml',
-             'test/stock_overviewall_report.yml'
+             'test/stock_report.yml',
              ],
     'installable': True,
     'active': False,

From d3dd802b45cd1f384196dec3e801a4d15cb052eb Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 11:43:18 +0530
Subject: [PATCH 064/118] [FIX] sale : YML test for report corrected

bzr revid: ach@tinyerp.com-20100917061318-h7stdwp2mkgr5vqm
---
 addons/sale/__openerp__.py       | 1 -
 addons/sale/test/sale_report.yml | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index eb108373201..6978a0bb072 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -79,7 +79,6 @@
         'test/sale_procurement.yml',
         'test/invoice_on_ordered_qty.yml',
         'test/invoice_on_shipped_qty.yml',
-        'test/sale_order_print.yml',
         'test/sale_report.yml',
     ],
     'installable': True,
diff --git a/addons/sale/test/sale_report.yml b/addons/sale/test/sale_report.yml
index 6453d52f658..d60420294fe 100644
--- a/addons/sale/test/sale_report.yml
+++ b/addons/sale/test/sale_report.yml
@@ -1,3 +1,11 @@
+-
+  In order to test the PDF reports defined on a sale order, we will print a sale order
+- 
+  !python {model: sale.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('sale.order'),ref('sale.order2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a sale order, we will print a report for sale prepare allot
 - 

From bd3b43b2ca6962090fd23e982cb4927fc169f5b6 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 11:58:37 +0530
Subject: [PATCH 065/118] [FIX] report_intrastat : report name corrected in yml

bzr revid: ach@tinyerp.com-20100917062837-u56227neca31ggn9
---
 addons/report_intrastat/test/report_instratat_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/report_intrastat/test/report_instratat_report.yml b/addons/report_intrastat/test/report_instratat_report.yml
index 821ce528cfd..c6162f51c25 100644
--- a/addons/report_intrastat/test/report_instratat_report.yml
+++ b/addons/report_intrastat/test/report_instratat_report.yml
@@ -5,4 +5,4 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice.intrastat').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'report_instratat-instrastat report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'report_instratat-instrastat_report.'+format), 'wb+').write(data)

From 07552b6246b47f819d1cd4998fb051fc8818af4f Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 12:14:03 +0530
Subject: [PATCH 066/118] [FIX] purchase_requisition,report_intrastat : YML and
 __openerp__.py files corrected

bzr revid: ach@tinyerp.com-20100917064403-eovtq294ebzwut5l
---
 addons/purchase_requisition/__openerp__.py                      | 2 +-
 .../purchase_requisition/test/purchase_requisition_report.yml   | 2 +-
 addons/report_intrastat/__openerp__.py                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 7594fdcb96b..0cfc48feccd 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -38,7 +38,7 @@
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"
     ],
     "active": False,
-    "test":['purchase_requisition_report.yml'],
+    "test":['test/purchase_requisition_report.yml'],
     "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_requisition/test/purchase_requisition_report.yml b/addons/purchase_requisition/test/purchase_requisition_report.yml
index 73edfe18054..29edea96a8a 100644
--- a/addons/purchase_requisition/test/purchase_requisition_report.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_report.yml
@@ -5,4 +5,4 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.order_purchase_requisition1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition- purchase requisition report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index ca421627ff5..b4dc9b52c89 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -37,7 +37,7 @@
         'intrastat_report.xml'
     ],
     'demo_xml': [],
-    'test': ['report_instratat_report.yml'],
+    'test': ['test/report_instratat_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0056982189085',

From aed6c48ade90c500b77b8b8d3b039006e110fddc Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 12:21:33 +0530
Subject: [PATCH 067/118] [FIX] Account: Invoice => onchange_journal_id
 improved

bzr revid: mra@mra-laptop-20100917065133-i73dcqgl5bno9as5
---
 addons/account/invoice.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 0c0941c715a..56b50f76d1f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -454,20 +454,20 @@ class account_invoice(osv.osv):
 
     def onchange_journal_id(self, cr, uid, ids, journal_id, company_id):
         result = {}
-        if journal_id and company_id:
+        if journal_id:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
+            if journal.currency:
+                result = {'value': {
+                    'currency_id': journal.currency.id
+                    }
+                }
+                return result
+        if company_id:
             company = self.pool.get('res.company').browse(cr, uid, company_id)
-            journal_id = self.pool.get('account.journal').browse(cr, uid, journal_id)
-            if journal_id.currency:
-                result = {'value': {
-                    'currency_id': journal_id.currency.id
+            result = {'value': {
+                'currency_id': company.currency_id.id
                     }
                 }
-            else:
-                result = {'value': {
-                    'currency_id': company.currency_id.id
-                    }
-                }
-                
         return result
 
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):

From 51bd63ea9594715254bb82eae11ab472c3ea3007 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 12:21:44 +0530
Subject: [PATCH 068/118] [IMP] delivery : yml test report added

bzr revid: jma@tinyerp.com-20100917065144-mw8m99dopc4umqg2
---
 addons/delivery/__openerp__.py           | 2 +-
 addons/delivery/test/delivery_report.yml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 addons/delivery/test/delivery_report.yml

diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 193bd0bcaee..0f183f0d244 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -40,7 +40,7 @@
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
-    'test':['test/delivery_test.yml',],
+    'test':['test/delivery_test.yml','test/delievry_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0033981912253',
diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml
new file mode 100644
index 00000000000..ed3a859f23d
--- /dev/null
+++ b/addons/delivery/test/delivery_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a Delievry, we will print a Delivery Order report
+- 
+  !python {model: stock.picking}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'delievry-shipping'+format), 'wb+').write(data)

From 86803a81d422602274f92c1fbf4bb743f084648b Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 12:31:02 +0530
Subject: [PATCH 069/118] [IMP] delivery : changes

bzr revid: jma@tinyerp.com-20100917070102-a6pd9qjydcr1l4m1
---
 addons/delivery/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 0f183f0d244..ad88d552e6b 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -40,7 +40,7 @@
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
-    'test':['test/delivery_test.yml','test/delievry_report.yml'],
+    'test':['test/delivery_test.yml','test/delivery_report.yml'],
     'installable': True,
     'active': False,
     'certificate': '0033981912253',

From f183f4863ffc87f42e0d7bf39a1e2637ab4e45e7 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 12:52:11 +0530
Subject: [PATCH 070/118] [FIX] purchase : YML and __openerp__.py files
 corrected

bzr revid: ach@tinyerp.com-20100917072211-jx7waxcmzjgppj4b
---
 addons/purchase/__openerp__.py           | 1 +
 addons/purchase/test/purchase_report.yml | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index c7b4de7decc..7af6dbceff0 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -60,6 +60,7 @@
              'test/purchase_from_picking.yml',
              'purchase_unit_test.xml',
              'test/procurement_buy.yml',
+             'test/purchase_report.yml',
     ],
     'demo': ['purchase_demo.xml'],
     'installable': True,
diff --git a/addons/purchase/test/purchase_report.yml b/addons/purchase/test/purchase_report.yml
index b98d1f212ac..bbc15b1e936 100644
--- a/addons/purchase/test/purchase_report.yml
+++ b/addons/purchase/test/purchase_report.yml
@@ -6,3 +6,11 @@
     (data, format) = netsvc.LocalService('report.purchase.quotation').create(cr, uid, [ref('purchase.order_purchase1'),ref('purchase.order_purchase2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'purchase-request_quotation'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Purchase Order, we will print Purchase Order report
+- 
+  !python {model: purchase.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.purchase.order').create(cr, uid, [ref('purchase.order_purchase1'),ref('purchase.order_purchase2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'purchase-purchase_order_report'+format), 'wb+').write(data)
\ No newline at end of file

From 9fb0234dbaa14eb8c803500c7abf3abacaf231c1 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 12:54:30 +0530
Subject: [PATCH 071/118] [FIX] project_scrum : YML test for report added

bzr revid: ach@tinyerp.com-20100917072430-111mgvgc3n9v34ce
---
 addons/project_scrum/__openerp__.py                | 1 +
 addons/project_scrum/test/project_scrum_report.yml | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 addons/project_scrum/test/project_scrum_report.yml

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 847263ba7d3..3350419af30 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -60,6 +60,7 @@
         "board_project_scrum_view.xml",
     ],
     'demo_xml': ['project_scrum_demo.xml'],
+    'test': ['test/project_scrum_report.yml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/project_scrum/test/project_scrum_report.yml b/addons/project_scrum/test/project_scrum_report.yml
new file mode 100644
index 00000000000..7fb3e9c07fc
--- /dev/null
+++ b/addons/project_scrum/test/project_scrum_report.yml
@@ -0,0 +1,9 @@
+-
+  In order to test the PDF reports defined on a Project Scrum, we will print Project Scrum Sprint Burndown Report
+- 
+  !python {model: project.scrum.sprint}: |
+    import netsvc, tools, os
+    data_dict = {'model': 'project.scrum.sprint', 'id':ref('project_scrum.scrum_sprint_0')}
+    (data, format) = netsvc.LocalService('report.scrum.sprint.burndown').create(cr, uid, [ref('project_scrum.scrum_sprint_0')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'project_scrum-project_scrum_sprint_burndown.'+format), 'wb+').write(data)
\ No newline at end of file

From a2b9eaeccf3a4d0abb8ffc254e3ff46fd01dfb32 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Fri, 17 Sep 2010 12:58:06 +0530
Subject: [PATCH 072/118] [IMP] hr_attendance, hr_holidays, hr_timesheet,
 hr_timesheet_invoice, hr_payroll, hr_expense  : yml report test added

bzr revid: rme@tinyerp.com-20100917072806-t86i3yit9ceiofk9
---
 addons/hr_attendance/__openerp__.py           |  4 ++-
 .../test/hr_attendance_error.yml              |  9 ------
 .../test/hr_attendance_error_report.yml       | 29 +++++++++++++++++
 addons/hr_expense/test/hr_expense_report.yml  |  2 +-
 addons/hr_holidays/__openerp__.py             |  4 ++-
 .../hr_holidays/test/hr_holidays_report.yml   | 13 ++++++++
 addons/hr_payroll/test/hr_payroll_report.yml  |  9 +++---
 addons/hr_timesheet/__openerp__.py            |  4 ++-
 .../hr_timesheet/test/hr_timesheet_report.yml | 31 +++++++++++++++++++
 .../test/hr_timesheet_invoice_report.yml      | 20 ++++++++++--
 10 files changed, 104 insertions(+), 21 deletions(-)
 delete mode 100644 addons/hr_attendance/test/hr_attendance_error.yml
 create mode 100644 addons/hr_attendance/test/hr_attendance_error_report.yml
 create mode 100644 addons/hr_holidays/test/hr_holidays_report.yml
 create mode 100644 addons/hr_timesheet/test/hr_timesheet_report.yml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 9ed2b76e1ed..18e585effc2 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -43,7 +43,9 @@
         'wizard/hr_attendance_sign_in_out_view.xml',
         ],
     'demo_xml': ['hr_attendance_demo.xml'],
-    'test': ['test/test_hr_attendance.yml','test/hr_attendance_error.yml'],
+    'test': ['test/test_hr_attendance.yml',
+             'test/hr_attendance_error_report.yml'
+             ],
     'installable': True,
     'active': False,
     'certificate': '0063495605613',
diff --git a/addons/hr_attendance/test/hr_attendance_error.yml b/addons/hr_attendance/test/hr_attendance_error.yml
deleted file mode 100644
index 6c045871cb5..00000000000
--- a/addons/hr_attendance/test/hr_attendance_error.yml
+++ /dev/null
@@ -1,9 +0,0 @@
--
-  In order to test the PDF reports defined on a hr attendance error, we will print a  hr attendance error
-- 
-  !python {model: hr.employee}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.hr.attendance.error').create(cr, uid, [], {'model': 'hr.employee', 'form': {'init_date': '2010-09-16', 'end_date': '2010-09-16', 'id': 1, 'emp_ids': [ref('hr.employee2')], 'max_delay': 120}}
-    , {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_attendance/test/hr_attendance_error_report.yml b/addons/hr_attendance/test/hr_attendance_error_report.yml
new file mode 100644
index 00000000000..d7ca06587c7
--- /dev/null
+++ b/addons/hr_attendance/test/hr_attendance_error_report.yml
@@ -0,0 +1,29 @@
+-
+  In order to test the PDF reports defined on a HR Attendance Error, we will print a  HR Attendance Error
+- 
+  !python {model: hr.employee}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    data_dict = {'model': 'hr.employee', 'form': {'init_date': start.strftime('%Y-%m-%d'), 'end_date':start.strftime('%Y-%m-%d'), 'emp_ids': [ref('hr.employee2')], 'max_delay': 120}}
+    (data, format) = netsvc.LocalService('report.hr.attendance.error').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-error_report.'+format), 'wb+').write(data)
+
+-
+ In order to test the PDF reports defined on a HR Attendance By Month, we will print a  HR Attendance By Month
+-
+  !python {model: hr.employee}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    year=start.year
+    month=start.month
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year': year }}
+    (data, format) = netsvc.LocalService('report.hr.attendance.bymonth').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee2')]})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-by_month_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_expense/test/hr_expense_report.yml b/addons/hr_expense/test/hr_expense_report.yml
index 52a44e0dafb..4c81ceb5976 100644
--- a/addons/hr_expense/test/hr_expense_report.yml
+++ b/addons/hr_expense/test/hr_expense_report.yml
@@ -5,4 +5,4 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.hr_expense_expense_septemberexpenses0'),ref('hr_expense.hr_expense_expense_septemberexpenses1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_expense_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 7d68b216494..e6d901ad02c 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -65,7 +65,9 @@
         'board_hr_holidays_view.xml',
         ],
     'demo_xml': ['hr_holidays_demo.xml',],
-    'test': ['test/test_hr_holiday.yml'],
+    'test': ['test/test_hr_holiday.yml',
+             'test/hr_holidays_report.yml',
+             ],
     'installable': True,
     'active': False,
     'certificate': '0086579209325',
diff --git a/addons/hr_holidays/test/hr_holidays_report.yml b/addons/hr_holidays/test/hr_holidays_report.yml
new file mode 100644
index 00000000000..fb8eb6319a0
--- /dev/null
+++ b/addons/hr_holidays/test/hr_holidays_report.yml
@@ -0,0 +1,13 @@
+-
+ In order to test the PDF reports defined on a HR Holidays, we will print a  HR Holidays
+-
+  !python {model: hr.holidays}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': start.strftime('%Y-%m-%d'), 'depts' : [ref('hr.dep_sales')],'holiday_type' : 'Validated' }}
+    (data, format) = netsvc.LocalService('report.holidays.summary').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee2')]})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_holidays-summary_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
index 88a797b6827..69ca8328ea6 100644
--- a/addons/hr_payroll/test/hr_payroll_report.yml
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.salary.structure').create(cr, uid, [ref('hr_payroll.hr_employee_bonamy0')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_emp_salary_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-salary_report.'+format), 'wb+').write(data)
           
 -
   In order to test the PDF reports defined on a HR Payslip, we will print a HR Payslip
@@ -14,11 +14,10 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.payslip.pdf').create(cr, uid, [ref('hr_payroll.hr_payslip_salaryslipofbonamyforjune0')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_payslip_report.'+format), 'wb+').write(data)
-    (data, format) = netsvc.LocalService('report.payslip.pdf').create(cr, uid, [ref('hr_payroll.hr_payslip_salaryslipofbonamyforjune0')], {}, {})
+        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payslip_report.'+format), 'wb+').write(data)
 
 -
-  Print the employee salary details 
+  In order to test the PDF reports defined on a HR Employee Salary Details, we will print a HR Employee Salary Details
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
@@ -27,7 +26,7 @@
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detai_report.'+format), 'wb+').write(data)
 -
-  Print the employee yearly salary details 
+ In order to test the PDF reports defined on a HR Employee Salary Details, we will print a HR Employee Salary Details
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index c7207b6761c..5a2e37353cd 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -50,7 +50,9 @@ to set up a management by affair.
         'wizard/hr_timesheet_sign_in_out_view.xml',
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
-    'test': ['test/test_hr_timesheet.yml'],
+    'test': ['test/test_hr_timesheet.yml',
+             'test/hr_timesheet_invoice_report.yml',
+             ],
     'installable': True,
     'active': False,
     'certificate': '0071405533469',
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
new file mode 100644
index 00000000000..04c07d77403
--- /dev/null
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -0,0 +1,31 @@
+-
+ In order to test the PDF reports defined on a HR Timesheet User Report, we will print a  HR Timesheet User Report
+-
+  !python {model: hr.employee}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    month=start.month
+    year=start.year
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : ref('base.user_root') }}
+    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
+
+-
+ In order to test the PDF reports defined on a HR Timesheet Users Report, we will print a  HR Timesheet Users Report
+-
+  !python {model: hr.employee}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    month=start.month
+    year=start.year
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [ref('base.user_root')] }}
+    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
index 434d04a979d..118699c4aa3 100644
--- a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -1,9 +1,23 @@
 -
-  In order to test the PDF reports defined on a hr timesheet invoice, we will print a  hr timesheet invoice
+  In order to test the PDF reports defined on a HR Timesheet Account Analytic Profit, we will print a  HR Timesheet Account Analytic Profit
 -
   !python {model: account.analytic.line}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'id': 1, 'date_from': '2010-09-01', 'employee_ids': [[6, 0, [1, ref('hr.employee2')]]], 'journal_ids': [[6, 0, [1, 2, 3, 4]]], 'date_to': '2010-09-16'}}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': '2010-09-01', 'employee_ids': [[6, 0, [1, ref('hr.employee2')]]], 'journal_ids': [[6, 0, [1, 2, 3, 4]]], 'date_to': '2010-09-16'}}
     (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-report.'+format), 'wb+').write(data)    
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-account_analytic_profit_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a HR Cost Ledger, we will print a HR Cost Ledger
+-
+  !python {model: account.analytic.account}: |
+    import netsvc, tools, os, time
+    import datetime
+    from mx.DateTime import *
+    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = DateTime(int(start.year), int(start.month), int(start.day))
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date1': start.strftime('%Y-%m-%d'), 'date2': start.strftime('%Y-%m-%d')}}
+    (data, format) = netsvc.LocalService('report.hr.timesheet.invoice.account.analytic.account.cost_ledger').create(cr, uid, [], data_dict, {'periods': []})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-cost_ledger_report.'+format), 'wb+').write(data)    
\ No newline at end of file

From 4e61111c59767e70b4a365937fef4e4792d0397c Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Fri, 17 Sep 2010 14:01:34 +0530
Subject: [PATCH 073/118] [IMP] Account: added user_id while created analytic
 lines

bzr revid: pap@tinyerp.co.in-20100917083134-dw7g5vf9myo03e47
---
 addons/account/account_analytic_line.py  | 1 -
 addons/account/account_bank_statement.py | 2 +-
 addons/account/account_move_line.py      | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 5a8ee0d4e8c..be1e5ec65e6 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -51,7 +51,6 @@ class account_analytic_line(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
-
         if context.get('from_date',False):
             args.append(['date', '>=',context['from_date']])
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 53c08525a6a..5bd1167c173 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -321,7 +321,7 @@ class account_bank_statement(osv.osv):
 
                 move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
                 torec.append(move_line_id)
-
+                
                 if move.analytic_account_id:
                     anal_val = {}
                     amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 990dd277d65..954cc4e1781 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -131,7 +131,8 @@ class account_move_line(osv.osv):
                     'general_account_id': obj_line.account_id.id,
                     'journal_id': obj_line.journal_id.analytic_journal_id.id,
                     'ref': obj_line.ref,
-                    'move_id':obj_line.id
+                    'move_id':obj_line.id,
+                    'user_id': uid
                 }
                 new_id = self.pool.get('account.analytic.line').create(cr,uid,vals_lines)
         return True
@@ -1181,6 +1182,7 @@ class account_move_line(osv.osv):
                         'general_account_id': vals.get('account_id', False),
                         'journal_id': journal.analytic_journal_id.id,
                         'ref': vals.get('ref', False),
+                        'user_id': uid
                     })]
 
         result = super(osv.osv, self).create(cr, uid, vals, context)

From 72f88ecf493eaef5bb5d36e8245a5d9368ecbf3f Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Fri, 17 Sep 2010 14:25:09 +0530
Subject: [PATCH 074/118] [REM] Account: removed analytic lines creation in
 account_bank_statement as it is created when move line is created

bzr revid: pap@tinyerp.co.in-20100917085509-5mmx1uj5ja31dtpp
---
 addons/account/account_bank_statement.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 5bd1167c173..50df29fde69 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -322,26 +322,6 @@ class account_bank_statement(osv.osv):
                 move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
                 torec.append(move_line_id)
                 
-                if move.analytic_account_id:
-                    anal_val = {}
-                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
-                    anal_val = {
-                        'name': val['name'],
-                        'ref': val['ref'],
-                        'date': val['date'],
-                        'amount': amt,
-                        'account_id': val['analytic_account_id'],
-                        'currency_id': val['currency_id'],
-                        'general_account_id': val['account_id'],
-                        'journal_id': st.journal_id.analytic_journal_id.id,
-                        'period_id': val['period_id'],
-                        'user_id': uid,
-                        'move_id': move_line_id
-                                }
-                    if val.get('amount_currency', False):
-                        anal_val['amount_currency'] = val['amount_currency']
-                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)
-
                 if move.reconcile_id and move.reconcile_id.line_new_ids:
                     for newline in move.reconcile_id.line_new_ids:
                         account_move_line_obj.create(cr, uid, {

From a4c243a087a51d156adc6424a6053b2aba7776d5 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 17 Sep 2010 14:32:04 +0530
Subject: [PATCH 075/118] [IMP] account: improved the onchange of journal
 field.

bzr revid: vra@tinyerp.com-20100917090204-l6pq10n421zuw20b
---
 addons/account/account_invoice_view.xml |  4 ++--
 addons/account/invoice.py               | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4d0a73cb4d3..5f20b14b9b2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
                     <group col="8" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id, company_id)"/>
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id)"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -260,7 +260,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, company_id)"/>
+                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 56b50f76d1f..27a3b889ff0 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -452,8 +452,7 @@ class account_invoice(osv.osv):
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
 
-    def onchange_journal_id(self, cr, uid, ids, journal_id, company_id):
-        result = {}
+    def onchange_journal_id(self, cr, uid, ids, journal_id):
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
             if journal.currency:
@@ -462,12 +461,11 @@ class account_invoice(osv.osv):
                     }
                 }
                 return result
-        if company_id:
-            company = self.pool.get('res.company').browse(cr, uid, company_id)
-            result = {'value': {
-                'currency_id': company.currency_id.id
-                    }
+        user_company = self.pool.get('res.users').browse(cr, uid, [uid])[0].company_id
+        result = {'value': {
+            'currency_id': user_company.currency_id.id
                 }
+            }
         return result
 
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
@@ -568,7 +566,6 @@ class account_invoice(osv.osv):
                 val['currency_id'] = False
             else:
                 val['currency_id'] = currency.id
-
         if company_id:
             company = self.pool.get('res.company').browse(cr, uid, company_id)
             if company.currency_id.company_id and company.currency_id.company_id.id != company_id:

From fbccb0d6d521d233caf19e956553f7dcda1f42ff Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 14:38:28 +0530
Subject: [PATCH 076/118] [FIX] Account: Cash statement => creation of analytic
 lines from cash statement now with creation of account.move.line so removed
 the code to manually create analytic lines

bzr revid: mra@mra-laptop-20100917090828-yvulxc6lmrci9s57
---
 addons/account/account_cash_statement.py | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 8cdb20aa225..c87b3bf2f80 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -454,25 +454,25 @@ class account_cash_statement(osv.osv):
                 move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
                 torec.append(move_line_id)
 
-                if move.analytic_account_id:
-                    anal_val = {}
-                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
-                    anal_val = {
-                        'name': val['name'],
-                        'ref': val['ref'],
-                        'date': val['date'],
-                        'amount': amt,
-                        'account_id': val['analytic_account_id'],
-                        'currency_id': val['currency_id'],
-                        'general_account_id': val['account_id'],
-                        'journal_id': st.journal_id.analytic_journal_id.id,
-                        'period_id': val['period_id'],
-                        'user_id': uid,
-                        'move_id': move_line_id
-                                }
-                    if val.get('amount_currency', False):
-                        anal_val['amount_currency'] = val['amount_currency']
-                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)
+#                if move.analytic_account_id:
+#                    anal_val = {}
+#                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
+#                    anal_val = {
+#                        'name': val['name'],
+#                        'ref': val['ref'],
+#                        'date': val['date'],
+#                        'amount': amt,
+#                        'account_id': val['analytic_account_id'],
+#                        'currency_id': val['currency_id'],
+#                        'general_account_id': val['account_id'],
+#                        'journal_id': st.journal_id.analytic_journal_id.id,
+#                        'period_id': val['period_id'],
+#                        'user_id': uid,
+#                        'move_id': move_line_id
+#                                }
+#                    if val.get('amount_currency', False):
+#                        anal_val['amount_currency'] = val['amount_currency']
+#                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)
 
                 if move.reconcile_id and move.reconcile_id.line_new_ids:
                     for newline in move.reconcile_id.line_new_ids:

From e98dd1021b73a1409e874ef7069e6cc319e2db74 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 17 Sep 2010 14:54:17 +0530
Subject: [PATCH 077/118] [FIX] hr_timesheet_invoice: Remove inhertied view of
 analytic account

bzr revid: hmo@tinyerp.com-20100917092417-90ewk1k9lxe7f1mh
---
 .../hr_timesheet_invoice_view.xml                    | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index ef4bee1deb3..21ddd3ddda5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -21,17 +21,7 @@
             </field>
         </record>
 
-        <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="company_currency_id" position="replace">
-                    <field name="currency_id"/>
-                </field>
-            </field>
-        </record>
+        
 
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>

From 8321e6c8a0466f01bb952ede106bb5caf657dfdf Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 15:00:07 +0530
Subject: [PATCH 078/118] [REF]

bzr revid: jvo@tinyerp.com-20100917093007-m4b02ivfi2h8vo3p
---
 addons/account_analytic_plans/__openerp__.py                    | 2 +-
 .../account_budget/wizard/account_budget_crossovered_report.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 41f29737d55..6e00c6b587d 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -66,7 +66,7 @@ of distribution models.
         'wizard/account_crossovered_analytic_view.xml'
     ],
     'demo_xml'  : [],
-    'test' : ['account_analytic_plans/test/acount_analytic_plans_report.yml'],
+    'test' : ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'active'    : False,
     'certificate': '0036417675373',
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index 9a700e90ebb..2862cd1db48 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -42,7 +42,7 @@ class account_budget_crossvered_report(osv.osv_memory):
         data = self.read(cr, uid, ids)[0]
         datas = {
              'ids': context.get('active_ids',[]),
-             'model': 'crossovered.budge',
+             'model': 'crossovered.budget',
              'form': data
                  }
         datas['form']['report']='analytic-full'

From 17489eca380c00c0f594cf4cb4d47d1218d76973 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 15:12:09 +0530
Subject: [PATCH 079/118] [REF]

bzr revid: mra@mra-laptop-20100917094209-050mlfn3ku5utm0w
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 27a3b889ff0..05fd98e9872 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -452,7 +452,7 @@ class account_invoice(osv.osv):
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
 
-    def onchange_journal_id(self, cr, uid, ids, journal_id):
+    def onchange_journal_id(self, cr, uid, ids, journal_id=False):
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
             if journal.currency:

From 4dd8d1b9580c56309e31a601037872b71132057d Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 17 Sep 2010 15:13:34 +0530
Subject: [PATCH 080/118] [IMP]: Improve 'Human Resource / Reporting /Payroll
 /Employee Salary Statment' report.

bzr revid: rch_open_erp-20100917094334-p0p2rng3mvhfihqg
---
 .../report/report_employees_detail.rml        | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 8a9689b45c6..3b032af3409 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -172,19 +172,19 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -194,13 +194,13 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -210,8 +210,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -225,10 +225,10 @@
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]]</para>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] [[ get_employee_detail(o) ]]</para>
     <para style="terp_header_Centre">Employees Salary Details </para>
     <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
     <para style="terp_default_space">
@@ -284,7 +284,7 @@
           <para style="terp_tblheader_Details">Designation</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].function.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Phone No.</para>
@@ -355,7 +355,9 @@
         <font color="white"> </font>
       </para>
       <section>
-        <para style="terp_default_9">[[ get_employee_detail(o) ]]</para>
+        <para style="terp_default_9">
+          <font color="white"> </font>
+        </para>
         <para style="terp_tblheader_Details">Allowances with Basic:</para>
         <section>
           <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
@@ -528,43 +530,43 @@
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_total()) ]]</u></para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -579,4 +581,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From db13c7b51f4bb745a1a702e3ba776fc550fdba3a Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 15:17:57 +0530
Subject: [PATCH 081/118] [IMP] project_plannning : YML test for report and
 demo data added

bzr revid: ach@tinyerp.com-20100917094757-8ro6i925et0osp0w
---
 addons/project_planning/__openerp__.py                    | 1 +
 addons/project_planning/project_planning_demo.xml         | 8 ++++++++
 addons/project_planning/test/project_plannning_report.yml | 8 ++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 addons/project_planning/test/project_plannning_report.yml

diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 4624de97f8c..3f378cc21be 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -55,6 +55,7 @@ At the end of the month, the planning manager can also check if the encoded time
     ],
     'test': [
         'test/planning_states.yml'
+        'test/planning_report.yml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project_planning/project_planning_demo.xml b/addons/project_planning/project_planning_demo.xml
index 9a64217f252..1c12e5c53cf 100644
--- a/addons/project_planning/project_planning_demo.xml
+++ b/addons/project_planning/project_planning_demo.xml
@@ -8,5 +8,13 @@
             <field name="manager_id" ref="base.user_root"/>
             <field name="member_ids" eval="[(6,0,[ref('base.user_demo')])]"/>
         </record>
+        <record id="project_plannning_1" model="report_account_analytic.planning">
+        	<field name="name">Project_Planning</field>
+            <field name="business_days">20</field>
+            <field name="date_from">2010-01-01'</field>
+            <field name="date_to">2010-12-31</field>
+            <field name="state">draft</field>
+            <field name="member_ids" ref="base.user_demo"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project_planning/test/project_plannning_report.yml b/addons/project_planning/test/project_plannning_report.yml
new file mode 100644
index 00000000000..770522c0d17
--- /dev/null
+++ b/addons/project_planning/test/project_plannning_report.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a Project Planning, we will print Project Planning report
+- 
+  !python {model: report_account_analytic.planning}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.report_account_analytic.planning.print').create(cr, uid, [ref('project_planning.project_plannning_1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'project_planning-project_planning_report'+format), 'wb+').write(data)
\ No newline at end of file

From d73c7af13ced989a808c6e367d72ffec18ed9258 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 15:31:49 +0530
Subject: [PATCH 082/118] [FIX] product,project_plannning : corrected yml
 reporttest file

bzr revid: ach@tinyerp.com-20100917100149-u73wv83t30w8oqho
---
 addons/product/test/product_report.yml                    | 4 ++--
 addons/project_planning/test/project_plannning_report.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product/test/product_report.yml b/addons/product/test/product_report.yml
index 9ff387278aa..6e80083f66b 100644
--- a/addons/product/test/product_report.yml
+++ b/addons/product/test/product_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on Products, we will print a Products Pricelists report
+  In order to test the PDF reports defined on Products, we will print a Products Pricelists Report
 - 
   !python {model: product.product}: |
     import netsvc, tools, os
@@ -14,4 +14,4 @@
     }
     (data, format) = netsvc.LocalService('report.product.pricelist').create(cr, uid, [ref('product.product_product_pc1'), ref('product.product_product_pc3')], data_dict, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'product-product pricelist'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'product-product_pricelist'+format), 'wb+').write(data)
diff --git a/addons/project_planning/test/project_plannning_report.yml b/addons/project_planning/test/project_plannning_report.yml
index 770522c0d17..a7597af86e8 100644
--- a/addons/project_planning/test/project_plannning_report.yml
+++ b/addons/project_planning/test/project_plannning_report.yml
@@ -1,6 +1,6 @@
 -
-  In order to test the PDF reports defined on a Project Planning, we will print Project Planning report
-- 
+  In order to test the PDF reports defined on a Project Planning, we will print Project Planning Report
+-
   !python {model: report_account_analytic.planning}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.report_account_analytic.planning.print').create(cr, uid, [ref('project_planning.project_plannning_1')], {}, {})

From 8120b4dcc3cc533453276a1c4fd6fe7acd1f5596 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 15:34:23 +0530
Subject: [PATCH 083/118] [REF] Removed unnecessary yml file from sale

bzr revid: ach@tinyerp.com-20100917100423-2w796eeark0oobv4
---
 addons/sale/test/sale_order_print.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 addons/sale/test/sale_order_print.yml

diff --git a/addons/sale/test/sale_order_print.yml b/addons/sale/test/sale_order_print.yml
deleted file mode 100644
index def94d8c27e..00000000000
--- a/addons/sale/test/sale_order_print.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a sale order, we will print a sale order
-- 
-  !python {model: sale.order}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('sale.order'),ref('sale.order2')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)

From 561797f1bad8988531d9ff893f6638c0bbcbe660 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 17 Sep 2010 15:56:37 +0530
Subject: [PATCH 084/118] [IMP]: Improve 'Point Of Sale / Daily Operations /Pos
 Line' report. Add currency symbol.

bzr revid: rch_open_erp-20100917102637-hr0tbxe8aw1febgm
---
 addons/point_of_sale/report/pos_lines.rml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 0cc1c43520a..28f240c1070 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,13 +186,13 @@
             <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -223,7 +223,7 @@
           <para style="terp_default_9">Net Total </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -251,7 +251,7 @@
           <para style="terp_default_9">Taxes</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -279,7 +279,7 @@
           <para style="terp_default_9">Total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>

From ea4c5088a92389fd0a78fa93a3246220f3cee3d9 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 16:00:30 +0530
Subject: [PATCH 085/118] [IMP] Account: Charts of accounts (Remove domain from
 periods) and improved view

bzr revid: mra@mra-laptop-20100917103030-o2gqxsm10th4o3e9
---
 addons/account/wizard/account_chart.py       | 10 +++++-----
 addons/account/wizard/account_chart_view.xml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 84683d17b30..bf10838b9c8 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -54,14 +54,14 @@ class account_chart(osv.osv_memory):
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
         res = {}
-        res['value'] = {'period_from': False, 'period_to': False}
+        res['value'] = {}
         if fiscalyear_id:
             start_period = end_period = False
             cr.execute('''
-                SELECT * FROM (SELECT p.id 
-                               FROM account_period p 
-                               LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) 
-                               WHERE f.id = %s 
+                SELECT * FROM (SELECT p.id
+                               FROM account_period p
+                               LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
+                               WHERE f.id = %s
                                ORDER BY p.date_start ASC
                                LIMIT 1) AS period_start
                 UNION
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index eb662058f32..f35a2c5480c 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -9,11 +9,11 @@
                 <form string="Account charts">
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
+                        <field name="target_move"/>
                         <label align="0.7" colspan="4" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
                         <separator string="Periods" colspan="4"/>
-                        <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear)]"/>
-                        <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear)]"/>
-                        <field name="target_move"/>
+                        <field name="period_from"/>
+                        <field name="period_to"/>
                     </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="6">

From 5ce0c19a154c52fb22f5c51b5e10837e9236a04a Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 16:28:55 +0530
Subject: [PATCH 086/118] [IMP/FIX] Hr_holidays,hr_attendance report yml
 corrected

bzr revid: jvo@tinyerp.com-20100917105855-wra7gjdhk9lgovcn
---
 addons/hr_attendance/__openerp__.py           |  2 +-
 .../test/hr_attendance_error_report.yml       | 29 -------------------
 .../test/hr_attendance_report.yml             | 19 ++++++++++++
 .../hr_holidays/test/hr_holidays_report.yml   | 17 ++++++-----
 4 files changed, 29 insertions(+), 38 deletions(-)
 delete mode 100644 addons/hr_attendance/test/hr_attendance_error_report.yml
 create mode 100644 addons/hr_attendance/test/hr_attendance_report.yml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 18e585effc2..3714050cbdb 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -44,7 +44,7 @@
         ],
     'demo_xml': ['hr_attendance_demo.xml'],
     'test': ['test/test_hr_attendance.yml',
-             'test/hr_attendance_error_report.yml'
+             'test/hr_attendance_report.yml'
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_attendance/test/hr_attendance_error_report.yml b/addons/hr_attendance/test/hr_attendance_error_report.yml
deleted file mode 100644
index d7ca06587c7..00000000000
--- a/addons/hr_attendance/test/hr_attendance_error_report.yml
+++ /dev/null
@@ -1,29 +0,0 @@
--
-  In order to test the PDF reports defined on a HR Attendance Error, we will print a  HR Attendance Error
-- 
-  !python {model: hr.employee}: |
-    import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    data_dict = {'model': 'hr.employee', 'form': {'init_date': start.strftime('%Y-%m-%d'), 'end_date':start.strftime('%Y-%m-%d'), 'emp_ids': [ref('hr.employee2')], 'max_delay': 120}}
-    (data, format) = netsvc.LocalService('report.hr.attendance.error').create(cr, uid, [], data_dict, {'periods': []})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-error_report.'+format), 'wb+').write(data)
-
--
- In order to test the PDF reports defined on a HR Attendance By Month, we will print a  HR Attendance By Month
--
-  !python {model: hr.employee}: |
-    import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    year=start.year
-    month=start.month
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year': year }}
-    (data, format) = netsvc.LocalService('report.hr.attendance.bymonth').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee2')]})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-by_month_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_attendance/test/hr_attendance_report.yml b/addons/hr_attendance/test/hr_attendance_report.yml
new file mode 100644
index 00000000000..d26f6ddb9bc
--- /dev/null
+++ b/addons/hr_attendance/test/hr_attendance_report.yml
@@ -0,0 +1,19 @@
+-
+ In order to test the PDF reports defined on HR Attendance, we will print a report of HR Attendance By Month
+-
+  !python {model: hr.employee}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'hr.employee', 'form': {'month': time.gmtime()[1], 'year': time.gmtime()[0]}}
+    (data, format) = netsvc.LocalService('report.hr.attendance.bymonth').create(cr, uid, [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')], data_dict, {'active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-by_month_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on HR Attendance, we will print a report of HR Attendance Error
+- 
+  !python {model: hr.employee}: |
+    import netsvc, tools, os, time
+    data_dict = {'model': 'hr.employee', 'form': {'init_date': time.strftime('%Y-01-01'), 'end_date':time.strftime('%Y-%m-%d'), 'emp_ids': [ref('hr.employee1')], 'max_delay': 120}}
+    (data, format) = netsvc.LocalService('report.hr.attendance.error').create(cr, uid, [ref('hr.employee1')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-error_report.'+format), 'wb+').write(data)
diff --git a/addons/hr_holidays/test/hr_holidays_report.yml b/addons/hr_holidays/test/hr_holidays_report.yml
index fb8eb6319a0..9faf7358b53 100644
--- a/addons/hr_holidays/test/hr_holidays_report.yml
+++ b/addons/hr_holidays/test/hr_holidays_report.yml
@@ -1,13 +1,14 @@
 -
- In order to test the PDF reports defined on a HR Holidays, we will print a  HR Holidays
+ In order to test the PDF reports defined on a HR Holidays, we will print HR Holidays
 -
   !python {model: hr.holidays}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': start.strftime('%Y-%m-%d'), 'depts' : [ref('hr.dep_sales')],'holiday_type' : 'Validated' }}
-    (data, format) = netsvc.LocalService('report.holidays.summary').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee2')]})
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'depts' : [ref('hr.dep_sales')],'holiday_type' : 'Validated' }}
+    (data, format) = netsvc.LocalService('report.holidays.summary').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_holidays-summary_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_holidays-dept_summary_report.'+format), 'wb+').write(data)
+    
+    data_dict = {'model': 'hr.employee', 'form': {'date_from': time.strftime('%Y-%m-01'), 'depts' : [ref('hr.dep_sales')],'holiday_type' : 'Validated','emp':[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')] }}
+    (data, format) = netsvc.LocalService('report.holidays.summary').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_holidays-employee_summary_report.'+format), 'wb+').write(data)
\ No newline at end of file

From a6d6fa504021b9014ce2fdf559b2eede27068d84 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 17 Sep 2010 16:33:57 +0530
Subject: [PATCH 087/118] [IMP] Account: Add target moves in general ledger
 report

bzr revid: psi@tinyerp.co.in-20100917110357-eqczcxbrg6l66d6u
---
 .../account/report/account_general_ledger.py  | 108 ++++++++++++------
 .../wizard/account_report_general_ledger.py   |   5 +-
 .../account_report_general_ledger_view.xml    |   1 +
 3 files changed, 81 insertions(+), 33 deletions(-)

diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index e49c47034fb..f313704bc8a 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -43,6 +43,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         self.init_query = data['form']['initial_bal_query']
         self.init_balance = data['form']['initial_balance']
         self.display_account = data['form']['display_account']
+        self.target_move = data['form'].get('target_move', 'all')
         if (data['model'] == 'ir.ui.menu'):
             new_ids = [data['form']['chart_account_id']]
             objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
@@ -78,14 +79,14 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         self.context = context
 
     def _sum_currency_amount_account(self, account):
-        self.cr.execute("SELECT sum(l.amount_currency) AS tot_currency "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s" %(account.id, self.query))
+        self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
+                FROM account_move_line l \
+                WHERE l.account_id = %s AND %s' %(account.id, self.query))
         sum_currency = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT sum(l.amount_currency) AS tot_currency "\
-                            "FROM account_move_line l "\
-                            "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
+                            FROM account_move_line l \
+                            WHERE l.account_id = %s AND %s '%(account.id, self.init_query))
             sum_currency += self.cr.fetchone()[0] or 0.0
         return str(sum_currency)
 
@@ -117,13 +118,23 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
 
     def lines(self, account):
         """ Return all the account_move_line of account with their account code counterparts """
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted', '']
         # First compute all counterpart strings for every move_id where this account appear.
         # Currently, the counterpart info is used only in landscape mode
         sql = """
             SELECT m1.move_id,
-            array_to_string(ARRAY(SELECT DISTINCT a.code FROM account_move_line m2 LEFT JOIN account_account a ON (m2.account_id=a.id) WHERE m2.move_id = m1.move_id AND m2.account_id<>%%s), ', ') AS counterpart
-            FROM (SELECT move_id FROM account_move_line l WHERE %s AND l.account_id = %%s GROUP BY move_id) m1
-        """ % self.query
+                array_to_string(ARRAY(SELECT DISTINCT a.code
+                                          FROM account_move_line m2
+                                          LEFT JOIN account_account a ON (m2.account_id=a.id)
+                                          WHERE m2.move_id = m1.move_id
+                                          AND m2.account_id<>%%s), ', ') AS counterpart
+                FROM (SELECT move_id
+                        FROM account_move_line l
+                        LEFT JOIN account_move am ON (am.id = l.move_id)
+                        WHERE am.state IN %s and %s AND l.account_id = %%s GROUP BY move_id) m1
+        """% (tuple(move_state), self.query)
         self.cr.execute(sql, (account.id, account.id))
         counterpart_res = self.cr.dictfetchall()
         counterpart_accounts = {}
@@ -143,13 +154,13 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
             p.name AS partner_name
             FROM account_move_line l
-            LEFT JOIN account_move m on (l.move_id=m.id)
+            JOIN account_move m on (l.move_id=m.id)
             LEFT JOIN res_currency c on (l.currency_id=c.id)
             LEFT JOIN res_partner p on (l.partner_id=p.id)
             LEFT JOIN account_invoice i on (m.id =i.move_id)
             JOIN account_journal j on (l.journal_id=j.id)
-            WHERE %s AND l.account_id = %%s ORDER by %s
-        """ % (self.query, sql_sort)
+            WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s
+        """ %(self.query, tuple(move_state), sql_sort)
         self.cr.execute(sql, (account.id,))
         res_lines = self.cr.dictfetchall()
         res_init = []
@@ -167,8 +178,8 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
                 LEFT JOIN res_partner p on (l.partner_id=p.id)
                 LEFT JOIN account_invoice i on (m.id =i.move_id)
                 JOIN account_journal j on (l.journal_id=j.id)
-                WHERE %s AND l.account_id = %%s
-            """ %(self.init_query)
+                WHERE %s AND m.state IN %s AND l.account_id = %%s
+            """ %(self.init_query, tuple(move_state))
 
             self.cr.execute(sql, (account.id,))
             res_init = self.cr.dictfetchall()
@@ -192,40 +203,73 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         return res
 
     def _sum_debit_account(self, account):
-        self.cr.execute("SELECT sum(debit) "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s "%(account.id, self.query))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted','']
+        self.cr.execute('SELECT sum(debit) \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ self.query +' '
+                ,(account.id, tuple(move_state)))
         sum_debit = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT sum(debit) "\
-                    "FROM account_move_line l "\
-                    "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT sum(debit) \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_debit += self.cr.fetchone()[0] or 0.0
         return sum_debit
 
     def _sum_credit_account(self, account):
-        self.cr.execute("SELECT sum(credit) "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s "%(account.id, self.query))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted','']
+        self.cr.execute('SELECT sum(credit) \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ self.query +' '
+                ,(account.id, tuple(move_state)))
         sum_credit = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT sum(credit) "\
-                    "FROM account_move_line l "\
-                    "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT sum(credit) \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_credit += self.cr.fetchone()[0] or 0.0
         return sum_credit
 
     def _sum_balance_account(self, account):
-        self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_balance "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s"%(account.id, self.query))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted','']
+        self.cr.execute('SELECT (sum(debit) - sum(credit)) as tot_balance \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ self.query +' '
+                ,(account.id, tuple(move_state)))
         sum_balance = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_balance "\
-                    "FROM account_move_line l "\
-                    "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT (sum(debit) - sum(credit)) as tot_balance \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_balance += self.cr.fetchone()[0] or 0.0
         return sum_balance
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index 9f8a548c5ba..ada80db1762 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -32,12 +32,15 @@ class account_report_general_ledger(osv.osv_memory):
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
         'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
     _defaults = {
         'landscape': True,
         'amount_currency': True,
         'sortby': 'sort_date',
         'initial_balance': False,
+        'target_move': 'all',
     }
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, context=None):
@@ -50,7 +53,7 @@ class account_report_general_ledger(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby', 'target_move'])[0])
         if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
             data['form'].update({'initial_balance': False})
         if data['form']['landscape']:
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 87953a367df..42256912add 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
                    <field name="display_account"/>
+                   <field name="target_move"/>
                    <field name="sortby"/>
                    <field name="landscape"/>
                    <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>

From 8da97acf4f8c5a0e019b42e8ead68d2d944c20c7 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 17 Sep 2010 16:36:42 +0530
Subject: [PATCH 088/118] [REF]

bzr revid: mra@mra-laptop-20100917110642-ui1u24hu02muqvjf
---
 addons/account/account_cash_statement.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index c87b3bf2f80..2fd80348404 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -270,7 +270,7 @@ class account_cash_statement(osv.osv):
             super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
         return True
 
-    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         """ Changes balance start and starting details if journal_id changes"
         @param statement_id: Changed statement_id
         @param journal_id: Changed journal_id
@@ -288,7 +288,7 @@ class account_cash_statement(osv.osv):
                 'balance_start': balance_start
             })
             return res
-        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
+        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
         return res
 
     def _equal_balance(self, cr, uid, ids, statement, context={}):

From 5c3a3e3c4d5ef1e098dc158968e18c8497c93a58 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 16:40:37 +0530
Subject: [PATCH 089/118] [REF]

bzr revid: jvo@tinyerp.com-20100917111037-z6wylxt1t950cn62
---
 addons/hr_payroll/test/hr_payroll_report.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
index 69ca8328ea6..e2268db7697 100644
--- a/addons/hr_payroll/test/hr_payroll_report.yml
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a HR Employee Salary, we will print a HR Employee Salary
+  In order to test the PDF reports defined on HR Employee Salary, we will print HR Employee Salary
 - 
   !python {model: hr.employee}: |
     import netsvc, tools, os
@@ -8,7 +8,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-salary_report.'+format), 'wb+').write(data)
           
 -
-  In order to test the PDF reports defined on a HR Payslip, we will print a HR Payslip
+  In order to test the PDF reports defined on HR Payslip, we will print a HR Payslip
 - 
   !python {model: hr.payslip}: |
     import netsvc, tools, os
@@ -17,7 +17,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payslip_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a HR Employee Salary Details, we will print a HR Employee Salary Details
+  In order to test the PDF reports defined on HR Employee Salary Details, we will print HR Employee Salary Details
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
@@ -26,7 +26,7 @@
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detai_report.'+format), 'wb+').write(data)
 -
- In order to test the PDF reports defined on a HR Employee Salary Details, we will print a HR Employee Salary Details
+ In order to test the PDF reports defined on HR Employee Salary Details, we will print HR Employee Salary Details
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time

From bcbdcde958f0c515460d7cfbb5e59d0279f277d6 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 17:29:28 +0530
Subject: [PATCH 090/118] [IMP] Account_voucher : YML test added for reports

bzr revid: jvo@tinyerp.com-20100917115928-dp4dly4tyu9fjzer
---
 .../account_voucher/test/account_voucher.yml   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index b63bfc9d129..67d26cbdbb1 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -95,3 +95,21 @@
   !python {model: account.voucher}: |
     acc_id=self.browse(cr, uid, ref("account_voucher_voucheraxelor0"))
     assert(acc_id.move_id)
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher amount Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_amount').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-amount.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)

From 1830043ba5569a5b3cdadbebce363574a3115305 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 17 Sep 2010 14:03:21 +0200
Subject: [PATCH 091/118] [IMP] account: usability changes in invoices form
 view

bzr revid: qdp-launchpad@tinyerp.com-20100917120321-q8hxajy1u3s4hooy
---
 addons/account/account_invoice_view.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5f20b14b9b2..aeb9a7112ec 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
                     <group col="8" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id)"/>
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -161,14 +161,14 @@
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
                         <field name="date_invoice"/>
-                        <field name="period_id" groups="account.group_account_user"/>
+                        <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
                         <group colspan="2" col="1" groups="account.group_account_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
+                           <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
@@ -221,7 +221,6 @@
                         </page>
                         <page string="Other Info">
                             <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
@@ -260,7 +259,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)"/>
+                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -271,14 +270,14 @@
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
                     <field name="date_invoice"/>
-                    <field name="period_id" groups="account.group_account_user"/>
+                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
                     <group colspan="2" col="1" groups="account.group_account_user">
                         <label align="0.0" string="(keep empty to use the current period)"/>
                     </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
+                            <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="name"/>
                             <field name="payment_term" widget="selection"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
@@ -316,7 +315,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection"  groups="base.group_multi_company"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="date_due"/>
                             <field name="user_id"/>

From aaea54012aa3fbb89be07b731f88fd596a03760b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 17 Sep 2010 17:38:14 +0530
Subject: [PATCH 092/118] [FIX,MOD] hr_*, survey : problem with access rights
 are sovled

bzr revid: vir@tinyerp.com-20100917120814-e45m5gwpqvrirk8y
---
 addons/hr_evaluation/__openerp__.py           |  1 +
 .../security/hr_evaluation_security.xml       | 26 +++++++++++++++++++
 .../security/ir.model.access.csv              | 17 ++++++++++++
 .../report/hr_recruitment_report_view.xml     |  2 +-
 .../hr_timesheet/security/ir.model.access.csv |  1 +
 .../security/ir.model.access.csv              |  2 ++
 .../security/ir.model.access.csv              |  2 +-
 addons/survey/security/ir.model.access.csv    | 13 ----------
 addons/survey/security/survey_security.xml    |  6 -----
 9 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 addons/hr_evaluation/security/hr_evaluation_security.xml

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 9710a84b4d7..b28c6d4e913 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -40,6 +40,7 @@
                  ],
     "update_xml": [
         "security/ir.model.access.csv",
+        "security/hr_evaluation_security.xml",
         "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml"
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
new file mode 100644
index 00000000000..49b0e19177b
--- /dev/null
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <record id="survey.menu_surveys" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    <record id="survey.menu_define_survey" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    <record id="survey.menu_survey_form" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    <record id="survey.menu_survey_page_form1" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    <record id="survey.menu_survey_type_form1" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    <record id="survey.menu_answer_surveys" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    <record id="survey.menu_run_survey_form" model="ir.ui.menu">
+        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
+    </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 4e37e74ca0f..181e412ce69 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -12,3 +12,20 @@
 "access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
 "access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
 "access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
+"access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
+"access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
+"access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
+"access_survey_page_hr_manager","survey.page","survey.model_survey_page","base.group_hr_manager",1,1,1,1
+"access_survey_question_hr_manager","survey.question","survey.model_survey_question","base.group_hr_manager",1,1,1,1
+"access_survey_question_column_heading_hr_manager","survey.question.column.heading","survey.model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
+"access_survey_answer_hr_manager","survey.answer","survey.model_survey_answer","base.group_hr_manager",1,1,1,1
+"access_survey_response_hr_manager","survey.response","survey.model_survey_response","base.group_hr_manager",1,1,1,1
+"access_survey_response_line_hr_manager","survey.response.line","survey.model_survey_response_line","base.group_hr_manager",1,1,1,1
+"access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
+"access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
+"access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
+"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
+"access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
+"access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
+"access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
+"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0
\ No newline at end of file
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index a789206b518..edb00d1f727 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -130,7 +130,7 @@
         <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager"/>
     <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index cab38e5b519..0b75f11e2c4 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -7,3 +7,4 @@
 "access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
 "access_hr_analytic_timesheet_manager","hr.analytic.timesheet.manager","model_hr_analytic_timesheet","base.group_hr_manager",1,0,0,0
 "access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","model_hr_analytic_timesheet","base.group_system",1,0,0,0
+"access_hr_analytic_timesheet_employee","hr.analytic.timesheet.employee","model_hr_analytic_timesheet","base.group_user",1,1,1,0
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 619fc6344cf..7089e184f98 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -12,3 +12,5 @@
 "access_report_analytic_account_close_system","report.analytic.account.close system","model_report_analytic_account_close","base.group_system",1,1,1,1
 "access_report_account_analytic_line_to_invoice_system","report.account.analytic.line.to.invoice system","model_report_account_analytic_line_to_invoice","base.group_system",1,1,1,1
 "access_report_timesheet_line","report.timesheet.line","model_report_timesheet_line","base.group_hr_manager",1,0,0,0
+"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,0
+"access_account_fiscalyear_hr_user","account.fiscalyear.hr.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 3ca4d966f78..de19d325f5f 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -6,7 +6,7 @@
 "access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,1,1,1
 "access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
 "access_timesheet_report_manager","timesheet.report.manager","model_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
 "access_hr_timesheet_sheet_sheet_day_manager","hr_timesheet_sheet.sheet.day.manager","model_hr_timesheet_sheet_sheet_day","base.group_hr_manager",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account_manager","hr_timesheet_sheet.sheet.account.manager","model_hr_timesheet_sheet_sheet_account","base.group_hr_manager",1,1,1,1
 "access_hr_timesheet_sheet_sheet_day_employee","hr_timesheet_sheet.sheet.day.employee","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 9d7c9c44ee4..2a64acdb0d4 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -25,19 +25,6 @@
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
-"access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
-"access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
-"access_survey_page","survey.page","model_survey_page","base.group_hr_manager",1,1,1,1
-"access_survey_question","survey.question","model_survey_question","base.group_hr_manager",1,1,1,1
-"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_answer","survey.answer","model_survey_answer","base.group_hr_manager",1,1,1,1
-"access_survey_response","survey.response","model_survey_response","base.group_hr_manager",1,1,1,1
-"access_survey_response_line","survey.response.line","model_survey_response_line","base.group_hr_manager",1,1,1,1
-"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
-"access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
-"access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
 "access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,1,1,1
 "access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
 "access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 7172fdf615e..6c3559fa138 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -4,12 +4,6 @@
 
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
-    </record>
-    <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / Manager</field>
-    </record>
-    <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / User</field>
     </record>
    	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>

From 6130e0b45052a5e3a7dc0b595fad1f95c14670cd Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Fri, 17 Sep 2010 17:56:27 +0530
Subject: [PATCH 093/118] [FIX] Account: default company_id was taken, passed
 company_id explicitly for journals created while configuring chart of account

bzr revid: pap@tinyerp.co.in-20100917122627-iuowz0lnvyozg3fh
---
 addons/account/account.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 375d1a046d2..28fff33a4bc 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2680,6 +2680,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         vals_journal['type'] = 'sale'
         vals_journal['code'] = _('SAJ')
         vals_journal['sequence_id'] = seq_id_sale
+        vals_journal['company_id'] =  company_id
 
         if obj_multi.chart_template_id.property_account_receivable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
@@ -2693,6 +2694,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         vals_journal['code'] = _('EXJ')
         vals_journal['sequence_id'] = seq_id_purchase
         vals_journal['view_id'] = view_id
+        vals_journal['company_id'] =  company_id
 
         if obj_multi.chart_template_id.property_account_payable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
@@ -2744,6 +2746,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['code']= _('BNK') + str(current_num)
             vals_journal['sequence_id'] = seq_id
             vals_journal['type'] = 'cash'
+            vals_journal['company_id'] =  company_id
+            
             if line.currency_id:
                 vals_journal['view_id'] = view_id_cur
                 vals_journal['currency'] = line.currency_id.id

From fc889e24dd649c57bd05f42fd19bfe34da86835e Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 17:59:36 +0530
Subject: [PATCH 094/118] [FIX/IMP] point_of_sale : YML test for report added
 and corrected the reports

bzr revid: ach@tinyerp.com-20100917122936-n89nhvb9uor5cmo3
---
 addons/point_of_sale/__openerp__.py           |  3 +-
 addons/point_of_sale/pos_demo.xml             |  9 ++
 .../report/pos_payment_report_user.py         |  8 +-
 .../point_of_sale/report/pos_users_product.py |  2 +-
 .../point_of_sale/test/pos_details_report.yml |  8 --
 .../test/pos_payment_report_date.yml          |  8 --
 addons/point_of_sale/test/pos_report.yml      | 97 +++++++++++++++++--
 7 files changed, 105 insertions(+), 30 deletions(-)
 delete mode 100644 addons/point_of_sale/test/pos_details_report.yml
 delete mode 100644 addons/point_of_sale/test/pos_payment_report_date.yml

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 6f33f75f65d..ad466b12522 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -75,8 +75,7 @@ Main features :
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
     'test':['test/pos_test.yml',
             'test/pos_report.yml',
-            'test/pos_details.yml',
-            'test/pos_payment_report_date.yml'],
+    ],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 80ba3d24397..18029826008 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -61,5 +61,14 @@
             <field name="notice">Discount Applied</field>
         </record>
 		
+		<record id="account_bank_statement_st0" model="account.bank.statement">
+			<field name="name">St. 05/19</field>
+            <field name="balance_end_real">0.0</field>
+            <field name="date">2010-05-19</field>
+            <field name="journal_id" ref="account.bank_journal"/>
+            <field name="period_id" ref="account.period_5"/>
+            <field name="state">draft</field>
+        </record>
+		
     </data>
 </openerp>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index 48ea148d8d1..dc829859c3e 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -40,13 +40,13 @@ class pos_payment_report_user(report_sxw.rml_parse):
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
                          "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
-                         "and po.user_id IN %s",(tuple(ids), )
-        self.cr.execute (sql)
+                         "and po.user_id IN %s"
+        self.cr.execute (sql, (tuple(ids), ))
         data=self.cr.dictfetchall()
         return data
-    def __pos_payment_user__total__(self,form):
+    def __pos_payment_user__total__(self, form):
         res=[]
-        ids = form['user_id'][0][-1]
+        ids = form['user_id']
         self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 3a284f1957f..141445bcafe 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -42,7 +42,7 @@ class pos_user_product(report_sxw.rml_parse):
         a_l=[]
         for r in data:
             a_l.append(r['id'])
-        if len(a):
+        if len(a_l):
             sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id IN %s and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit""",(tuple(a_l),)
             self.cr.execute(sql2)
             data = self.cr.dictfetchall()
diff --git a/addons/point_of_sale/test/pos_details_report.yml b/addons/point_of_sale/test/pos_details_report.yml
deleted file mode 100644
index 72f35b87ec5..00000000000
--- a/addons/point_of_sale/test/pos_details_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details report
-- 
-  !python {model: ir.ui.menu}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/point_of_sale/test/pos_payment_report_date.yml b/addons/point_of_sale/test/pos_payment_report_date.yml
deleted file mode 100644
index 15eefcdc6ab..00000000000
--- a/addons/point_of_sale/test/pos_payment_report_date.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Sales Lines report
-- 
-  !python {model: ir.ui.menu}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index bd89ca2015d..1747fb60305 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Detail Summary report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Detail Summary Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -8,7 +8,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -17,7 +17,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Lines report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Lines Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -26,7 +26,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-lines report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt report
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -35,7 +35,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement report
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -44,10 +44,93 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt with reimbursement report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement report
+  In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.receipt.without.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report Report
+- 
+  !python {model: ir.ui.menu}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details Report
+- 
+  !python {model: ir.ui.menu}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a Account Statement Report
+- 
+  !python {model: account.bank.statement}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.account.statement').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-account_statement_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS User Product Report
+- 
+  !python {model: account.bank.statement}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.user.product').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-user_product_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS All Close Cashbox Of the Day Report
+- 
+  !python {model: account.bank.statement}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.all.closed.cashbox.of.the.day').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-all_closed_cash_box_of_the_day_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    data_dict = {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'),'user_id':[ref('base.user_root')] }}
+    (data, format) = netsvc.LocalService('report.pos.sales.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Today Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root')] }}
+    (data, format) = netsvc.LocalService('report.pos.sales.user.today').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_today_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Payment Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Payment User Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root'),ref('base.user_demo')] }}
+    (data, format) = netsvc.LocalService('report.pos.payment.report.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_user_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Today's Sales of Current User Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
\ No newline at end of file

From e9f4a790417353ed218504ace0341808d1835c28 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 18:09:17 +0530
Subject: [PATCH 095/118] [IMP] auction : yml test for report added

bzr revid: jma@tinyerp.com-20100917123917-f04ltijvvpm6dlcu
---
 addons/auction/test/auction_report.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index 4d5110c03a1..1a73c482a87 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -89,4 +89,13 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bids.lots').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Buyer list report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.buyer.list').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_auction_buyer_list_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 7a294c79f34e085a1c20edb1c0e13352f003fb89 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 18:18:43 +0530
Subject: [PATCH 096/118] [IMP] auction : yml test for report added

bzr revid: jma@tinyerp.com-20100917124843-pgc4khwy2so5zv46
---
 addons/auction/test/auction_report.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index 1a73c482a87..9a4928ed675 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -98,4 +98,13 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.buyer.list').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_auction_buyer_list_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'action_auction_buyer_list_report.'+format), 'wb+').write(data)
+        
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Flagey Hussier report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.flagey.huissier').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'action_flagey_hussier_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 739687936aae6c9fc14bd5e02500b5d32cac8521 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 18:20:36 +0530
Subject: [PATCH 097/118] [FIX] mrp_repair : YML and report corrected

bzr revid: ach@tinyerp.com-20100917125036-v0870q20tzaxcuw8
---
 addons/mrp_repair/report/order.rml           | 2 +-
 addons/mrp_repair/test/mrp_repair_report.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index dae2a25ec0e..21ac0dec954 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -386,7 +386,7 @@
     <blockTable colWidths="534.0" style="Table8">
       <tr>
         <td>
-          <para style="P3">[[ format(o.quotation_notes) or removeParentNode('blockTable') ]]</para>
+          <para style="P3">[[ format(o.quotation_notes or '') or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp_repair/test/mrp_repair_report.yml b/addons/mrp_repair/test/mrp_repair_report.yml
index b6eb782dcfe..cc6600c6704 100644
--- a/addons/mrp_repair/test/mrp_repair_report.yml
+++ b/addons/mrp_repair/test/mrp_repair_report.yml
@@ -1,8 +1,8 @@
 -
-  In order to test the PDF reports defined on a mrp-repair, we will print a order
+  In order to test the PDF reports defined on a MRP Repair, we will print an Order Report
 -
   !python {model: mrp.repair}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.repair.order').create(cr, uid, [ref('mrp_repair.mrp_repair_rma0')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-repair_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_repair-order_report.'+format), 'wb+').write(data)

From 14f4df40dc3fbcab03aee4f51fcc2540f87cfdef Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 18:36:47 +0530
Subject: [PATCH 098/118] [FIX] mrp_operations : YML corrected

bzr revid: ach@tinyerp.com-20100917130647-qqxt5imw4tqgbfrb
---
 addons/mrp_operations/test/mrp_operations_report.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_operations/test/mrp_operations_report.yml b/addons/mrp_operations/test/mrp_operations_report.yml
index c83d077acde..f0a646adf4e 100644
--- a/addons/mrp_operations/test/mrp_operations_report.yml
+++ b/addons/mrp_operations/test/mrp_operations_report.yml
@@ -1,17 +1,17 @@
 -
-  In order to test the PDF reports defined on a mrp operations, we  will print a barcode
+  In order to test the PDF reports defined on a MRP Operations, we  will print a Barcode Report
 -
   !python {model: mrp_operations.operation.code}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.mrp.code.barcode').create(cr, uid, [ref('mrp_operations.mrp_op_1'),ref('mrp_operations.mrp_op_2'),ref('mrp_operations.mrp_op_3'),ref('mrp_operations.mrp_op_4'),ref('mrp_operations.mrp_op_5')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcoder.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcode_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp operations, we  will print a workcenters
+  In order to test the PDF reports defined on a MRP Operations, we  will print Workcenter's Barcode Report
 -
   !python {model: mrp.workcenter}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.mrp.wc.barcode').create(cr, uid, [ref('mrp.mrp_workcenter_0'),ref('mrp.mrp_workcenter_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_ workcenter.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-workcenter_barcode_report.'+format), 'wb+').write(data)

From c78bd45a442fb90dd51218584dfb2e8513dc2bf1 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 18:39:00 +0530
Subject: [PATCH 099/118] [IMP] Account_voucher : YML test added for reports

bzr revid: jvo@tinyerp.com-20100917130900-x624xz5tasmi8w70
---
 addons/account/test/account_report.yml        | 45 ++++++++++---------
 addons/account_voucher/__openerp__.py         |  1 +
 .../account_voucher/test/account_voucher.yml  | 18 --------
 .../test/account_voucher_report.yml           | 34 ++++++++++++++
 4 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 addons/account_voucher/test/account_voucher_report.yml

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 44899ec1d8d..0048de7af46 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -25,29 +25,30 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
 
-#-
-#  Demo data for Account tax code
-#-
-#  !record {model: account.tax.code, id: account_tax_code_0}:
-#    name : Tax Code Test
-#-
-# Print Tax Code entries report
-#- 
-#  !python {model: account.tax.code}: |
-#    import netsvc, tools, os
-#    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account.account_tax_code_0')], {}, {})
-#    if tools.config['test_report_directory']:
-#        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
+-
+  Demo data for Account tax code
+-
+  !record {model: account.tax.code, id: account_tax_code_0}:
+    name : Tax Code Test
+-
+ Print Tax Code entries report
+- 
+  !python {model: account.tax.code}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
+
+-
+  Print Vat Declaration Report
+-
+   !python {model: account.tax.code}: |
+    import netsvc, tools, os
+    data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
+    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_tax_code_0")], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 
-#-
-#  Print Vat Declaration Report
-#-
-#   !python {model: account.tax.code}: |
-#    import netsvc, tools, os
-#    data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
-#   (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account.account_tax_code0")], data_dict, {})
-#    if tools.config['test_report_directory']:
-#       file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on an invoice, we will print an invoice
 - 
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 824ca746f37..752bb74f90c 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -52,6 +52,7 @@
 #         "test/account_voucher.yml",
 #          "test/sales_receipt.yml",
 #          "test/sales_payment.yml",
+            "test/account_voucher_report.yml"
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 67d26cbdbb1..b63bfc9d129 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -95,21 +95,3 @@
   !python {model: account.voucher}: |
     acc_id=self.browse(cr, uid, ref("account_voucher_voucheraxelor0"))
     assert(acc_id.move_id)
-
--
-  In order to test the PDF reports defined on a account_voucher, we will print account voucher amount Report
--
-  !python {model: account.voucher}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.voucher.cash_amount').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-amount.'+format), 'wb+').write(data)
-
--
-  In order to test the PDF reports defined on a account_voucher, we will print account voucher Report
--
-  !python {model: account.voucher}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
new file mode 100644
index 00000000000..eddb313c776
--- /dev/null
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -0,0 +1,34 @@
+-
+  Demo for Account Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    amount: 1000.0
+    line_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher amount Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_amount').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-amount.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)

From 93a1f6513d6168b1d883103b3765c543a818e2eb Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 18:54:56 +0530
Subject: [PATCH 100/118] [FIX] mrp:YML for report corrected

bzr revid: ach@tinyerp.com-20100917132456-m47j5qe3gmnsrimo
---
 addons/mrp/test/mrp_report.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/test/mrp_report.yml b/addons/mrp/test/mrp_report.yml
index 6a13d489104..db9a83d495b 100644
--- a/addons/mrp/test/mrp_report.yml
+++ b/addons/mrp/test/mrp_report.yml
@@ -1,35 +1,35 @@
 -
-  In order to test the PDF reports defined on a mrp, we will print a bom order
+  In order to test the PDF reports defined on a MRP, we will print a BOM Structure Report
 -
   !python {model: mrp.bom}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bom.structure').create(cr, uid, [ref('mrp.mrp_bom_0'),ref('mrp.mrp_bom_1'),ref('mrp.mrp_bom_2'),ref('mrp.mrp_bom_23'),ref('mrp.mrp_bom_1901'),ref('mrp.mrp_bom_assemblysection0'),ref('mrp.mrp_bom_sidepanel0'),ref('mrp.mrp_bom_defaultbomforshelfofcm1'),ref('mrp.mrp_bom_sidepanel3')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_structure_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp, we will print an order
+  In order to test the PDF reports defined on a MRP, we will print Production Order Report
 -
   !python {model: mrp.production}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.mrp.production.order').create(cr, uid, [ref('mrp.mrp_production_mo1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp product price, we will print a (mrp)Product Price order
+  In order to test the PDF reports defined on a MRP, we will print Product Price Report
 -
   !python {model: product.product}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.product.price').create(cr, uid, [1,2,3,5], {'model':'product.product', 'form':{'number': 1}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_product-price_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-product_price_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp workcenter, we will print a (mrp)workcenter
+  In order to test the PDF reports defined on a MRP, we will print Workcenter Load Report
 -
   !python {model: mrp.workcenter}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.mrp.workcenter.load').create(cr, uid, [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')], {'model':'mrp.workcenter', 'form':{'time_unit': 'day', 'measure_unit': 'hours'}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_workcenter.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-workcenter_load_report.'+format), 'wb+').write(data)

From b5d64dbd12318acad01e9206a65feedf91efaf12 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 18:56:33 +0530
Subject: [PATCH 101/118] [IMP] auction : yml test for report added

bzr revid: jma@tinyerp.com-20100917132633-dnv1d38r4fn5vwt9
---
 addons/auction/test/auction_report.yml | 29 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index 9a4928ed675..f29a19a4fff 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -24,6 +24,7 @@
     (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'lots_list_report.'+format), 'wb+').write(data)
+        
 -
   In order to test the PDF reports defined on auction, we will print a lots inventory Report
 - 
@@ -32,6 +33,7 @@
     (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'lots_inventory_report.'+format), 'wb+').write(data)
+        
 -
   In order to test the PDF reports defined on auction, we will print a deposit seller Report
 - 
@@ -40,6 +42,7 @@
     (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_deposit_5_lot_1'),ref('auction.auction_deposit_5_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'deposit_seller_report.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print a catalog
 -
@@ -48,6 +51,7 @@
     (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_1'),ref('auction.auction_date_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'auction-catalog_list.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print buyer form report
 -
@@ -56,6 +60,7 @@
     (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_deposit_6_lot_1'),ref('auction.auction_deposit_6_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_form.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print bids phones report
 -
@@ -64,6 +69,7 @@
     (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_deposit_7_lot_1'),ref('auction.auction_deposit_7_lot_2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'auction-bids_phones_details.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Total
 - 
@@ -71,7 +77,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.total.rml').create(cr, uid, [ref('auction.auction_deposit_8_lot_1'),ref('auction.auction_deposit_8_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_total_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_total_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Result
@@ -80,7 +86,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.result').create(cr, uid, [ref('auction.auction_deposit_9_lot_1'),ref('auction.auction_deposit_9_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_result_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_result_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Lot
@@ -89,8 +95,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bids.lots').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)
-        
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lot_report.'+format), 'wb+').write(data)        
+
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Buyer list report
 - 
@@ -98,8 +104,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.buyer.list').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_auction_buyer_list_report.'+format), 'wb+').write(data)
-        
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_buyer_list_report.'+format), 'wb+').write(data)        
+
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Flagey Hussier report
 - 
@@ -107,4 +113,13 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.flagey.huissier').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_flagey_hussier_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_flagey_hussier_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a auction, we will print Auction Seller Form report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.seller_form_report').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_seller_form_report.'+format), 'wb+').write(data)
\ No newline at end of file

From 4b1f284f9019a8d66e84aa3bc70fe4eed7058aa5 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 18:59:45 +0530
Subject: [PATCH 102/118] [FIX] lunch : YML for report corrected

bzr revid: ach@tinyerp.com-20100917132945-6yvjb6fahbeozmvu
---
 addons/lunch/test/lunch_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/lunch/test/lunch_report.yml b/addons/lunch/test/lunch_report.yml
index 76214dfb599..2043afe7796 100644
--- a/addons/lunch/test/lunch_report.yml
+++ b/addons/lunch/test/lunch_report.yml
@@ -1,8 +1,8 @@
 -
-  In order to test the PDF reports defined on a lunch, we will print a lunch order
+  In order to test the PDF reports defined on a Lunch, we will print a Lunch Order Report
 -
   !python {model: lunch.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lunch.order').create(cr, uid, [ref('lunch.lunch_order_0'),ref('lunch.lunch_order_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lunch-lunch_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'lunch-lunch_order_report.'+format), 'wb+').write(data)

From c4e9216020dfaedc1fc93775d2efe22c3abd7dd2 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 19:06:36 +0530
Subject: [PATCH 103/118] [IMP] auction : yml test for report added

bzr revid: jma@tinyerp.com-20100917133636-xd9oe12zp2cim8ui
---
 addons/auction/test/auction_report.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index f29a19a4fff..0219af369b4 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.artists').create(cr, uid, [ref('auction.auction_deposit_1_lot_1'),ref('auction.auction_deposit_1_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_artist_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_artist_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print a auction Bid
@@ -14,7 +14,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.bids').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_bid_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_bid_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print a lots list Report
@@ -23,7 +23,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lots_list_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lots_list_report.'+format), 'wb+').write(data)
         
 -
   In order to test the PDF reports defined on auction, we will print a lots inventory Report
@@ -32,7 +32,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lots_inventory_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lots_inventory_report.'+format), 'wb+').write(data)
         
 -
   In order to test the PDF reports defined on auction, we will print a deposit seller Report
@@ -41,7 +41,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_deposit_5_lot_1'),ref('auction.auction_deposit_5_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'deposit_seller_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_deposit_seller_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print a catalog
@@ -50,7 +50,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_1'),ref('auction.auction_date_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'auction-catalog_list.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_catalog_list.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print buyer form report
@@ -59,7 +59,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_deposit_6_lot_1'),ref('auction.auction_deposit_6_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_form.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_buyer_form.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print bids phones report
@@ -68,7 +68,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_deposit_7_lot_1'),ref('auction.auction_deposit_7_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'auction-bids_phones_details.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_bids_phones_details.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Total

From d6ece1013d637d8b1445f7e6197bc6549166cdf1 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 17 Sep 2010 19:08:24 +0530
Subject: [PATCH 104/118] [IMP] hr_timesheet : Improvement in working hours
 view

bzr revid: vir@tinyerp.com-20100917133824-x8cwpc4dbu2atidj
---
 addons/hr_timesheet/hr_timesheet_view.xml     | 32 +++++++++++++------
 .../hr_timesheet_invoice_view.xml             |  6 ++--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index cbd0675208f..6029336542d 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -31,17 +31,31 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines">
-                    <field colspan="4" name="name"/>
+                    <group colspan="4" col="6">
+                    <field name="name"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
                     <field name="date" select="1" on_change="on_change_date(date)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    <newline/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
-                    <field name="amount"/>
-                    <field name="general_account_id"/>
-                    <field name="journal_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Information">
+                            <group colspan="2" col="2">
+                                <separator string="Product" colspan="2"/>
+                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Accounting" colspan="2"/>
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
+                                <field name="amount"/>
+                                <field name="general_account_id"/>
+                                <field name="journal_id"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing" colspan="2"/>
+                            </group>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 21ddd3ddda5..1befaebf168 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -21,18 +21,16 @@
             </field>
         </record>
 
-        
-
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <field name="journal_id" position="after">
+                <xpath expr='//separator[@string="Invoicing"]' position='after'>
                     <field name="to_invoice"/>
                     <field name="invoice_id"/>
-                </field>
+                </xpath>
             </field>
         </record>
 

From 7298e8599d7f427aee791644eaec1237816f8fd7 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Fri, 17 Sep 2010 19:10:55 +0530
Subject: [PATCH 105/118] [IMP] base_module_doc_rst : spell check

bzr revid: jma@tinyerp.com-20100917134055-qpesyjxs9vz0nxxs
---
 addons/base_module_doc_rst/module_report.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_module_doc_rst/module_report.xml b/addons/base_module_doc_rst/module_report.xml
index d8bbe51bf46..e3d4e342472 100644
--- a/addons/base_module_doc_rst/module_report.xml
+++ b/addons/base_module_doc_rst/module_report.xml
@@ -3,7 +3,7 @@
     <data>
 
         <report auto="False" id="base.ir_module_reference_print" model="ir.module.module" name="ir.module.reference.graph" rml="base_module_doc_rst/report/ir_module_reference_graph.rml" string="Technical guide"/>
-        <report id="report_proximity_graph" model="ir.module.module" name="proximity.graph" string="Proximity grpah"/>
+        <report id="report_proximity_graph" model="ir.module.module" name="proximity.graph" string="Proximity graph"/>
 
     </data>
 </openerp>

From a056d7e325693df4e64879e75edfcb780681e90b Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 19:16:28 +0530
Subject: [PATCH 106/118] [FIX] l10n_lu : YML for report test corrected

bzr revid: ach@tinyerp.com-20100917134628-abi9hv1ffqwpj65h
---
 addons/l10n_lu/test/l10n_lu_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_lu/test/l10n_lu_report.yml b/addons/l10n_lu/test/l10n_lu_report.yml
index 0ea9850df9a..43b1ce35df1 100644
--- a/addons/l10n_lu/test/l10n_lu_report.yml
+++ b/addons/l10n_lu/test/l10n_lu_report.yml
@@ -5,10 +5,10 @@
     name: a
 
 -
-  In order to test the PDF reports defined on a l10u_lu, we will print a vat
+  In order to test the PDF reports defined on a l10u_lu, we will print a VAT Report
 -
   !python {model: res.partner}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data)

From 98aeaf06ed366ea79d7980ac85c8f32338849f66 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 19:27:42 +0530
Subject: [PATCH 107/118] [FIX] l10n_fr : YML for report test corrected

bzr revid: ach@tinyerp.com-20100917135742-fxmr6y1l990n49dl
---
 addons/l10n_fr/test/l10n_fr_report.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
index cfc4f659925..ddc95595175 100644
--- a/addons/l10n_fr/test/l10n_fr_report.yml
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -1,26 +1,26 @@
 -
   In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
 -
-  !record {model: account.fiscalyear, id: account_fiscalyear_0}:
+  !record {model: account.fiscalyear, id: account_fiscalyear_01}:
     code: FY2011
     company_id: base.main_company
-    date_start: '2011-01-01'
-    date_stop: '2011-12-31'
-    name: Fiscal Year 2011
+    date_start: '2012-01-01'
+    date_stop: '2012-12-31'
+    name: Fiscal Year 2012
 -
-  In order to test the PDF reports defined on a l10n_fr, we will print a account move line for l10n_fr
+  In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
 -
   !python {model: account.move.line}: |
     import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_0')}}, {})
+    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a l10n_fr, we will print a compute result for l10n_fr
+  In order to test the PDF reports defined on a l10n_fr, we will print a Compute Resultant Report for l10n_fr
 -
   !python {model: account.move.line}: |
     import netsvc, tools, os,time
     (data, format) = netsvc.LocalService('report.l10n.fr.compute_resultant').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-compute_resultant.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-compute_resultant_report.'+format), 'wb+').write(data)

From 8cfba5e4abc7b1cbe10ab166bda1721c959d85e8 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 17 Sep 2010 19:34:47 +0530
Subject: [PATCH 108/118] [FIX] l10n_ch : YML for report test corrected

bzr revid: ach@tinyerp.com-20100917140447-boby81bpcvhfg1cr
---
 addons/l10n_ch/test/l10n_ch_report.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
index 0379e6bc83b..49c058a4bc8 100644
--- a/addons/l10n_ch/test/l10n_ch_report.yml
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -1,17 +1,17 @@
 -
-  In order to test the PDF reports defined on a l10n_ch, we will print a bvr_report
+  In order to test the PDF reports defined on a l10n_ch, we will print BVR Report
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a l10n_ch, we will print a bvr_invoice_report
+  In order to test the PDF reports defined on a l10n_ch, we will print a BVR Invoice Report
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice_report.'+format), 'wb+').write(data)

From 5b7264282b8ab93d6d0119460684a550cd1f2d69 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 17 Sep 2010 16:21:13 +0200
Subject: [PATCH 109/118] [FIX] account: corrected company_currency usage

bzr revid: qdp-launchpad@tinyerp.com-20100917142113-e26tz8py9optgnzb
---
 addons/account/invoice.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 27a3b889ff0..559070450c9 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -453,19 +453,14 @@ class account_invoice(osv.osv):
         return {}
 
     def onchange_journal_id(self, cr, uid, ids, journal_id):
+        result = {}
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
-            if journal.currency:
-                result = {'value': {
-                    'currency_id': journal.currency.id
+            currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
+            result = {'value': {
+                    'currency_id': currency_id,
                     }
                 }
-                return result
-        user_company = self.pool.get('res.users').browse(cr, uid, [uid])[0].company_id
-        result = {'value': {
-            'currency_id': user_company.currency_id.id
-                }
-            }
         return result
 
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):

From 56eed340302c30b8f3eb30c186a198b56b1005bc Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 19:53:23 +0530
Subject: [PATCH 110/118] [FIX] Hr_timesheet,hr_timesheet_invoice : YML test
 corrections

bzr revid: jvo@tinyerp.com-20100917142323-737yl8uiblz2mzc7
---
 addons/hr_timesheet/__openerp__.py            |  2 +-
 .../hr_timesheet/test/hr_timesheet_report.yml | 28 +++++++------------
 addons/hr_timesheet_invoice/__openerp__.py    |  2 +-
 .../test/hr_timesheet_invoice_report.yml      | 19 ++++++-------
 4 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 5a2e37353cd..90ddc25fff6 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -51,7 +51,7 @@ to set up a management by affair.
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
     'test': ['test/test_hr_timesheet.yml',
-             'test/hr_timesheet_invoice_report.yml',
+             'test/hr_timesheet_report.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 04c07d77403..811858eb7f2 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -1,31 +1,23 @@
 -
- In order to test the PDF reports defined on a HR Timesheet User Report, we will print a  HR Timesheet User Report
+ In order to test the PDF reports defined on HR Timesheet User Report, we will print a  HR Timesheet User Report
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    month=start.month
-    year=start.year
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : ref('base.user_root') }}
-    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {'periods': []})
+    month = time.gmtime()[1]
+    year = time.gmtime()[0]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : uid }}
+    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
 
 -
- In order to test the PDF reports defined on a HR Timesheet Users Report, we will print a  HR Timesheet Users Report
+ In order to test the PDF reports defined on HR Timesheet Users Report, we will print a  HR Timesheet Users Report
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    month=start.month
-    year=start.year
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [ref('base.user_root')] }}
-    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {'periods': []})
+    month = time.gmtime()[1]
+    year = time.gmtime()[0]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [uid] }}
+    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index df44302ec56..f45490867c2 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -47,7 +47,7 @@ reports, eso.""",
     ],
     'demo_xml': ['hr_timesheet_invoice_demo.xml',
                  ],
-    'test': ['test/test_hr_timesheet_invoice.yml'
+    'test': ['test/test_hr_timesheet_invoice.yml',
              'test/hr_timesheet_invoice_report.yml',
              ],             
     'installable': True,
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
index 118699c4aa3..ecdd486a65e 100644
--- a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -1,23 +1,20 @@
 -
-  In order to test the PDF reports defined on a HR Timesheet Account Analytic Profit, we will print a  HR Timesheet Account Analytic Profit
+  In order to test the PDF reports defined on HR Timesheet Account Analytic Profit, we will print report of  HR Timesheet Account Analytic Profit
 -
   !python {model: account.analytic.line}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': '2010-09-01', 'employee_ids': [[6, 0, [1, ref('hr.employee2')]]], 'journal_ids': [[6, 0, [1, 2, 3, 4]]], 'date_to': '2010-09-16'}}
-    (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {'periods': []})
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'employee_ids': [[6,0,[ref('hr.employee1'), ref('hr.employee2'),ref('hr.employee3')]]], 'journal_ids': [[6,0,[ref('account.cose_journal_sale'),ref('account.exp'),ref('account.sit')]]], 'date_to': time.strftime('%Y-%m-%d')}}
+    (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-account_analytic_profit_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a HR Cost Ledger, we will print a HR Cost Ledger
+  In order to test the PDF reports defined on HR Cost Ledger, we will print report of HR Cost Ledger
 -
   !python {model: account.analytic.account}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date1': start.strftime('%Y-%m-%d'), 'date2': start.strftime('%Y-%m-%d')}}
-    (data, format) = netsvc.LocalService('report.hr.timesheet.invoice.account.analytic.account.cost_ledger').create(cr, uid, [], data_dict, {'periods': []})
+    acc_ids = [ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_sednacom'),ref('account.analytic_thymbra'),ref('account.analytic_partners_camp_to_camp')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date1': time.strftime('%Y-01-01'), 'date2': time.strftime('%Y-%m-%d')}}
+    (data, format) = netsvc.LocalService('report.hr.timesheet.invoice.account.analytic.account.cost_ledger').create(cr, uid, acc_ids, data_dict, {'active_ids': acc_ids})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-cost_ledger_report.'+format), 'wb+').write(data)    
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-cost_ledger_report.'+format), 'wb+').write(data)

From 6d6d2d912ff042bc114fc25b282d5d3378f7bb5f Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 17 Sep 2010 16:30:45 +0200
Subject: [PATCH 111/118] [REF] account: removal of reconciliation on bank
 statements (account.bank.statement.reconcile object). This feature should now
 be handled by account_voucher module

bzr revid: qdp-launchpad@tinyerp.com-20100917143045-j7n45wazq60xtdnv
---
 addons/account/account_bank_statement.py    | 454 +++++---------------
 addons/account/account_move_line.py         |   8 -
 addons/account/account_view.xml             |  39 +-
 addons/account/security/ir.model.access.csv |   4 -
 4 files changed, 114 insertions(+), 391 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 50df29fde69..e2dafa57ef8 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -214,22 +214,121 @@ class account_bank_statement(osv.osv):
         self.write(cr, uid, ids, {}, context)
         return True
 
-    def button_confirm_bank(self, cr, uid, ids, context=None):
-        done = []
+
+    def create_move_from_st_line(self, cr, uid, st_line, company_currency_id, next_number, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_analytic_line_obj = self.pool.get('account.analytic.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+
+        st = st_line.statement_id
+        
+        context.update({'date': st_line.date})
+        move_id = account_move_obj.create(cr, uid, {
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'date': st_line.date,
+        }, context=context)
+        account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
+            'move_ids': [(4, move_id, False)]
+        })
+
+        torec = []
+        if st_line.amount >= 0:
+            account_id = st.journal_id.default_credit_account_id.id
+        else:
+            account_id = st.journal_id.default_debit_account_id.id
+        acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
+        amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                company_currency_id, st_line.amount, context=context,
+                account=acc_cur)
+
+        val = {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
+            'account_id': (st_line.account_id) and st_line.account_id.id,
+            'credit': ((amount>0) and amount) or 0.0,
+            'debit': ((amount<0) and -amount) or 0.0,
+            'statement_id': st.id,
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'currency_id': st.currency.id,
+            'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
+        }
+
+        amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                company_currency_id, st_line.amount, context=context,
+                account=acc_cur)
+        if st.currency.id <> company_currency_id:
+            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                        st.currency.id, amount, context=context,
+                        account=acc_cur)
+            val['amount_currency'] = -amount_cur
+
+        if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
+            val['currency_id'] = st_line.account_id.currency_id.id
+            if company_currency_id==st_line.account_id.currency_id.id:
+                amount_cur = st_line.amount
+            else:
+                amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                        st_line.account_id.currency_id.id, amount, context=context,
+                        account=acc_cur)
+            val['amount_currency'] = amount_cur
+
+        move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
+        torec.append(move_line_id)
+        
+        # Fill the secondary amount/currency
+        # if currency is not the same than the company
+        amount_currency = False
+        currency_id = False
+        if st.currency.id <> company_currency_id:
+            amount_currency = st_line.amount
+            currency_id = st.currency.id
+        account_move_line_obj.create(cr, uid, {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
+            'account_id': account_id,
+            'credit': ((amount < 0) and -amount) or 0.0,
+            'debit': ((amount > 0) and amount) or 0.0,
+            'statement_id': st.id,
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'amount_currency': amount_currency,
+            'currency_id': currency_id,
+            }, context=context)
+
+        for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                account_move_obj.browse(cr, uid, move_id,
+                    context=context).line_id],
+                context=context):
+            if line.state <> 'valid':
+                raise osv.except_osv(_('Error !'),
+                        _('Journal Item "%s" is not valid') % line.name)
+
+        move_name = next_number + ' - ' + str(st_line.sequence)
+        account_move_obj.write(cr, uid, [move_id], {'name': move_name}) 
+        # Bank statements will not consider boolean on journal entry_posted
+        account_move_obj.post(cr, uid, [move_id], context=context)
+        return move_id
+
+    def button_confirm_bank(self, cr, uid, ids, context=None):
+        done = []
         obj_seq = self.pool.get('ir.sequence')
 
         if context is None:
             context = {}
-        company_currency_id = res_users_obj.browse(cr, uid, uid,
-                context=context).company_id.currency_id.id
 
         for st in self.browse(cr, uid, ids, context):
+            company_currency_id = st.journal_id.company_id.currency_id.id
             if not st.state=='draft':
                 continue
 
@@ -245,161 +344,24 @@ class account_bank_statement(osv.osv):
             if not st.name == '/':
                 next_number = st.name
             else:
-                next_number = obj_seq.get(cr, uid, 'account.bank.statement')
+                if st.journal_id.sequence_id:
+                    c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
+                    next_number = obj_seq.get_id(cr, uid, st.journal_id.sequence_id.id, context=c)
+                else:
+                    next_number = obj_seq.get(cr, uid, 'account.bank.statement')
 
             for line in st.move_line_ids:
                 if line.state <> 'valid':
                     raise osv.except_osv(_('Error !'),
                             _('The account entries lines are not in valid state.'))
-            # for bank.statement.lines
-            # In line we get reconcile_id on bank.ste.rec.
-            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
-            for move in st.line_ids:
-                if move.analytic_account_id:
+            for st_line in st.line_ids:
+                if st_line.analytic_account_id:
                     if not st.journal_id.analytic_journal_id:
                         raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
-
-                context.update({'date': move.date})
-                move_id = account_move_obj.create(cr, uid, {
-                    'journal_id': st.journal_id.id,
-                    'period_id': st.period_id.id,
-                    'date': move.date,
-                }, context=context)
-                account_bank_statement_line_obj.write(cr, uid, [move.id], {
-                    'move_ids': [(4, move_id, False)]
-                })
-                if not move.amount:
+                if not st_line.amount:
                     continue
 
-                torec = []
-                if move.amount >= 0:
-                    account_id = st.journal_id.default_credit_account_id.id
-                else:
-                    account_id = st.journal_id.default_debit_account_id.id
-                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) or move.account_id
-                amount = res_currency_obj.compute(cr, uid, st.currency.id,
-                        company_currency_id, move.amount, context=context,
-                        account=acc_cur)
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        amount += newline.amount
-
-                val = {
-                    'name': move.name,
-                    'date': move.date,
-                    'ref': move.ref,
-                    'move_id': move_id,
-                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                    'account_id': (move.account_id) and move.account_id.id,
-                    'credit': ((amount>0) and amount) or 0.0,
-                    'debit': ((amount<0) and -amount) or 0.0,
-                    'statement_id': st.id,
-                    'journal_id': st.journal_id.id,
-                    'period_id': st.period_id.id,
-                    'currency_id': st.currency.id,
-                    'analytic_account_id': move.analytic_account_id and move.analytic_account_id.id or False
-                }
-
-                amount = res_currency_obj.compute(cr, uid, st.currency.id,
-                        company_currency_id, move.amount, context=context,
-                        account=acc_cur)
-                if st.currency.id <> company_currency_id:
-                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                st.currency.id, amount, context=context,
-                                account=acc_cur)
-                    val['amount_currency'] = -amount_cur
-
-                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id <> company_currency_id:
-                    val['currency_id'] = move.account_id.currency_id.id
-                    if company_currency_id==move.account_id.currency_id.id:
-                        amount_cur = move.amount
-                    else:
-                        amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                move.account_id.currency_id.id, amount, context=context,
-                                account=acc_cur)
-                    val['amount_currency'] = amount_cur
-
-                move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
-                torec.append(move_line_id)
-                
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        account_move_line_obj.create(cr, uid, {
-                            'name': newline.name or move.name,
-                            'date': move.date,
-                            'ref': move.ref,
-                            'move_id': move_id,
-                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                            'account_id': (newline.account_id) and newline.account_id.id,
-                            'debit': newline.amount>0 and newline.amount or 0.0,
-                            'credit': newline.amount<0 and -newline.amount or 0.0,
-                            'statement_id': st.id,
-                            'journal_id': st.journal_id.id,
-                            'period_id': st.period_id.id,
-                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
-
-                        }, context=context)
-
-                # Fill the secondary amount/currency
-                # if currency is not the same than the company
-                amount_currency = False
-                currency_id = False
-                if st.currency.id <> company_currency_id:
-                    amount_currency = move.amount
-                    currency_id = st.currency.id
-                account_move_line_obj.create(cr, uid, {
-                    'name': move.name,
-                    'date': move.date,
-                    'ref': move.ref,
-                    'move_id': move_id,
-                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                    'account_id': account_id,
-                    'credit': ((amount < 0) and -amount) or 0.0,
-                    'debit': ((amount > 0) and amount) or 0.0,
-                    'statement_id': st.id,
-                    'journal_id': st.journal_id.id,
-                    'period_id': st.period_id.id,
-                    'amount_currency': amount_currency,
-                    'currency_id': currency_id,
-                    }, context=context)
-
-                for line in account_move_line_obj.browse(cr, uid, [x.id for x in
-                        account_move_obj.browse(cr, uid, move_id,
-                            context=context).line_id],
-                        context=context):
-                    if line.state <> 'valid':
-                        raise osv.except_osv(_('Error !'),
-                                _('Journal Item "%s" is not valid') % line.name)
-
-                if move.reconcile_id and move.reconcile_id.line_ids:
-                    ## Search if move has already a partial reconciliation
-                    previous_partial = False
-                    for line_reconcile_move in move.reconcile_id.line_ids:
-                        if line_reconcile_move.reconcile_partial_id:
-                            previous_partial = True
-                            break
-                    ##
-                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
-                    #try:
-                    if abs(move.reconcile_amount-move.amount)<0.0001:
-
-                        writeoff_acc_id = False
-                        #There should only be one write-off account!
-                        for entry in move.reconcile_id.line_new_ids:
-                            writeoff_acc_id = entry.account_id.id
-                            break
-                        ## If we have already a partial reconciliation
-                        ## We need to make a partial reconciliation
-                        ## To add this amount to previous paid amount
-                        if previous_partial:
-                            account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                        ## If it's the first reconciliation, we do a full reconciliation as regular
-                        else:
-                            account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
-                    else:
-                        account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                move_name = next_number + ' - ' + str(move.sequence)
-                account_move_obj.write(cr, uid, [move_id], {'name': move_name, 'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
+                self.create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context)
 
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
@@ -454,175 +416,6 @@ class account_bank_statement(osv.osv):
 
 account_bank_statement()
 
-class account_bank_statement_reconcile(osv.osv):
-    _name = "account.bank.statement.reconcile"
-    _description = "Statement Reconcile"
-
-    def _total_entry(self, cursor, user, ids, name, attr, context=None):
-        result = {}
-        for o in self.browse(cursor, user, ids, context=context):
-            result[o.id] = 0.0
-            for line in o.line_ids:
-                result[o.id] += line.debit - line.credit
-        return result
-
-    def _total_new(self, cursor, user, ids, name, attr, context=None):
-        result = {}
-        for o in self.browse(cursor, user, ids, context=context):
-            result[o.id] = 0.0
-            for line in o.line_new_ids:
-                result[o.id] += line.amount
-        return result
-
-    def _total_balance(self, cursor, user, ids, name, attr, context=None):
-        result = {}
-        for o in self.browse(cursor, user, ids, context=context):
-            result[o.id] = o.total_new - o.total_entry + o.total_amount
-        return result
-
-    def _total_amount(self, cursor, user, ids, name, attr, context=None):
-        res = {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-        currency_id = context.get('currency_id', company_currency_id)
-
-        acc_cur = None
-        if context.get('journal_id', False) and context.get('account_id',False):
-            st =self.pool.get('account.journal').browse(cursor, user, context['journal_id'])
-            acc = self.pool.get('account.account').browse(cursor, user, context['account_id'])
-            acc_cur = (( context.get('amount',0.0)<=0) and st.default_debit_account_id) or acc
-
-        for reconcile_id in ids:
-            res[reconcile_id] = res_currency_obj.compute(cursor, user,
-                    currency_id, company_currency_id,
-                    context.get('amount', 0.0), context=context, account=acc_cur)
-        return res
-
-    def _default_amount(self, cursor, user, context=None):
-        if context is None:
-            context = {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-        currency_id = context.get('currency_id', company_currency_id)
-
-        acc_cur = None
-        if context.get('journal_id', False) and context.get('account_id',False):
-            st =self.pool.get('account.journal').browse(cursor, user, context['journal_id'])
-            acc = self.pool.get('account.account').browse(cursor, user, context['account_id'])
-            acc_cur = (( context.get('amount',0.0)<=0) and st.default_debit_account_id) or acc
-
-        return res_currency_obj.compute(cursor, user,
-                currency_id, company_currency_id,
-                context.get('amount', 0.0), context=context, account=acc_cur)
-
-    def _total_currency(self, cursor, user, ids, name, attrs, context=None):
-        res = {}
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-        for reconcile_id in ids:
-            res[reconcile_id] = company_currency_id
-        return res
-
-    def _default_currency(self, cursor, user, context=None):
-        res_users_obj = self.pool.get('res.users')
-
-        return res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-
-    def _total_second_amount(self, cursor, user, ids, name, attr,
-            context=None):
-        res = {}
-        for reconcile_id in ids:
-            res[reconcile_id] = context.get('amount', 0.0)
-        return res
-
-    def _total_second_currency(self, cursor, user, ids, name, attr, context=None):
-        res = {}
-        for reconcile_id in ids:
-            res[reconcile_id] = context.get('currency_id', False)
-        return res
-
-    def name_get(self, cursor, user, ids, context=None):
-        res= []
-        for o in self.browse(cursor, user, ids, context=context):
-            result = 0.0
-            res_currency = ''
-            for line in o.line_ids:
-                if line.amount_currency and line.currency_id:
-                    result += line.amount_currency
-                    res_currency = line.currency_id.code
-                else:
-                    result += line.debit - line.credit
-            if res_currency:
-                res_currency = ' ' + res_currency
-            res.append((o.id, '[%.2f'% (result - o.total_new,) + res_currency + ']' ))
-        return res
-
-    _columns = {
-        'name': fields.char('Date', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'line_new_ids': fields.one2many('account.bank.statement.reconcile.line',
-            'line_id', 'Write-Off'),
-        'total_entry': fields.function(_total_entry, method=True,
-            string='Total entries'),
-        'total_new': fields.function(_total_new, method=True,
-            string='Total write-off'),
-        'total_second_amount': fields.function(_total_second_amount,
-            method=True, string='Payment amount',
-            help='The amount in the currency of the journal'),
-        'total_second_currency': fields.function(_total_second_currency, method=True,
-            string='Currency', type='many2one', relation='res.currency',
-            help='The currency of the journal'),
-        'total_amount': fields.function(_total_amount, method=True,
-            string='Payment amount'),
-        'total_currency': fields.function(_total_currency, method=True,
-            string='Currency', type='many2one', relation='res.currency'),
-        'total_balance': fields.function(_total_balance, method=True,
-            string='Balance'),
-        #line_ids define in account.py
-        'statement_line': fields.one2many('account.bank.statement.line',
-             'reconcile_id', 'Bank Statement Line'),
-    }
-    _defaults = {
-        'name': lambda *a: time.strftime('%Y-%m-%d'),
-        'partner_id': lambda obj, cursor, user, context=None: \
-                context.get('partner', False),
-        'total_amount': _default_amount,
-        'total_currency': _default_currency,
-        'total_second_amount':  lambda obj, cursor, user, context=None: \
-                context.get('amount', 0.0),
-        'total_second_currency': lambda obj, cursor, user, context=None: \
-                context.get('currency_id', False),
-        'total_balance': _default_amount,
-    }
-account_bank_statement_reconcile()
-
-class account_bank_statement_reconcile_line(osv.osv):
-    _name = "account.bank.statement.reconcile.line"
-    _description = "Statement reconcile line"
-    _columns = {
-        'name': fields.char('Description', size=64, required=True),
-        'account_id': fields.many2one('account.account', 'Account', required=True),
-        'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
-        'amount': fields.float('Amount', required=True),
-        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account", domain=[('parent_id', '!=', False)])
-    }
-    _defaults = {
-        'name': 'Write-Off',
-    }
-account_bank_statement_reconcile_line()
-
-
 class account_bank_statement_line(osv.osv):
 
     def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context=None):
@@ -663,25 +456,6 @@ class account_bank_statement_line(osv.osv):
             res['value']['amount'] = balance
         return res
 
-    def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
-        if not ids:
-            return {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        res = {}
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-        for line in self.browse(cursor, user, ids, context=context):
-            if line.reconcile_id:
-                res[line.id] = res_currency_obj.compute(cursor, user,
-                        company_currency_id, line.statement_id.currency.id,
-                        line.reconcile_id.total_entry, context=context)
-            else:
-                res[line.id] = 0.0
-        return res
-
     _order = "statement_id desc, sequence"
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
@@ -699,16 +473,12 @@ class account_bank_statement_line(osv.osv):
             required=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement',
             select=True, required=True, ondelete='cascade'),
-        'reconcile_id': fields.many2one('account.bank.statement.reconcile',
-            'Reconcile'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_ids': fields.many2many('account.move',
             'account_bank_statement_line_move_rel', 'move_id','statement_id',
             'Moves'),
         'ref': fields.char('Reference', size=32),
         'note': fields.text('Notes'),
-        'reconcile_amount': fields.function(_reconcile_amount,
-            string='Amount reconciled', method=True, type='float'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
         'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
     }
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 954cc4e1781..bb208e4e231 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1259,13 +1259,5 @@ class account_move_line(osv.osv):
         return result
 account_move_line()
 
-
-class account_bank_statement_reconcile(osv.osv):
-    _inherit = "account.bank.statement.reconcile"
-    _columns = {
-        'line_ids': fields.many2many('account.move.line', 'account_bank_statement_line_rel', 'statement_id', 'line_id', 'Entries'),
-    }
-account_bank_statement_reconcile()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bcd5d8b233b..3b54653e80c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -521,7 +521,7 @@
                             attrs="{'invisible':[('state','=','confirm')]}"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Transaction">
+                        <page string="Transaction" name="statement_line_ids">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" readonly="1"/>
@@ -533,8 +533,6 @@
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="base.group_extended"/>
                                     <field name="amount"/>
-                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
-                                    <field invisible="1" name="reconcile_amount"/>
                                 </tree>
                                 <form string="Statement lines">
                                     <field name="date"/>
@@ -544,7 +542,6 @@
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                                     <field name="analytic_account_id" groups="base.group_extended" />
                                     <field name="amount"/>
-                                    <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field name="ref"/>
                                     <field name="sequence" readonly="0"/>
                                     <separator colspan="4" string="Notes"/>
@@ -552,7 +549,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Journal Entries">
+                        <page string="Journal Entries" name="move_live_ids">
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -657,38 +654,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <record id="view_bank_statement_reconcile" model="ir.ui.view">
-            <field name="name">account.bank.statement.reconcile.form</field>
-            <field name="model">account.bank.statement.reconcile</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reconcile">
-                    <field name="name" select="1"/>
-                    <newline/>
-                    <field name="total_second_amount"/>
-                    <field name="total_second_currency"/>
-                    <newline/>
-                    <field name="total_amount"/>
-                    <field name="total_currency"/>
-                    <newline/>
-                    <separator colspan="4" string="Entries"/>
-                    <field colspan="4" domain="[('partner_id','=',context.get('partner_id', False)),('state','=','valid'),('account_id','=',context.get('account_id', False)),('reconcile_id', '=', False)]" name="line_ids" nolabel="1" view_mode="tree"/>
-                    <field colspan="4" name="line_new_ids" nolabel="1">
-                        <tree editable="bottom" string="Write-Off">
-                            <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="amount"/>
-                            <field name="name"/>
-                        </tree>
-                    </field>
-                    <group col="7" colspan="4">
-                        <field name="total_entry"/>
-                        <field name="total_new"/>
-                        <field name="total_balance"/>
-                        <button name="dummy" string="Compute" icon="terp-stock_format-scientific"/>
-                    </group>
-                </form>
-            </field>
-        </record>
         <!--
     Account Types
     -->
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index b87f0e45cd3..11c83ff48fd 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -29,8 +29,6 @@
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,0,0,0
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
-"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
-"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
@@ -182,7 +180,6 @@
 "access_account_tax_code_accounting_accountant","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
 "access_account_bank_statement_accounting_accountant","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1
 "access_account_cashbox_line_accounting_accountant","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1
-"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_accounting_accountant",1,1,1,1
 "access_account_bank_statement_line_accounting_accountant","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1
 "access_account_invoice_report_accounting_accountant","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
 "access_report_account_receivable_accounting_accountant","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0
@@ -197,7 +194,6 @@
 "access_account_analytic_account_accounting_accountant","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0
 "access_account_analytic_line_accounting_accountant","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
 "access_account_analytic_journal_accounting_accountant","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
-"access_account_bank_statement_reconcile_accounting_accountant","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
 "access_account_analytic_journal_analytic_accounting","account.analytic.journal","model_account_analytic_journal","analytic.group_analytic_accounting",1,1,1,1
 "access_account_account_analytic_accounting","account.account","model_account_account","analytic.group_analytic_accounting",1,0,0,0
 "access_product_product_analytic_accounting","product.product","product.model_product_product","analytic.group_analytic_accounting",1,0,0,0

From 8d46fd06f1a6935e6cf4c218654571e1088d96bd Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 17 Sep 2010 21:17:16 +0530
Subject: [PATCH 112/118] [FIX] Hr_payroll : YML test corrections

bzr revid: jvo@tinyerp.com-20100917154716-szuse3ldd64almaj
---
 addons/hr_payroll/hr_payroll_demo.xml        |  1 +
 addons/hr_payroll/test/hr_payroll_report.yml | 27 +++++++++++---------
 addons/hr_payroll/test/payment_advice.yml    |  9 +++++++
 addons/hr_payroll/test/payroll_register.yml  | 10 +++++++-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 9c2ce90cd7a..0d5b593279e 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -72,6 +72,7 @@
             <field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
             <field name="name">First Contract</field>
             <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+            <field name="date_end" eval="time.strftime('%Y')+'-12-31'"/>
             <field name="struct_id" ref="hr_payroll.structure_001"/>
             <field name="employee_id" ref="hr_employee_bonamy0"/>
             <field name="notes">This is a First Contract</field>
diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
index e2268db7697..35020d30ceb 100644
--- a/addons/hr_payroll/test/hr_payroll_report.yml
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -1,14 +1,14 @@
 -
-  In order to test the PDF reports defined on HR Employee Salary, we will print HR Employee Salary
+  In order to test the PDF reports defined on HR Payroll, we will print Employees' Salary Structure
 - 
   !python {model: hr.employee}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.salary.structure').create(cr, uid, [ref('hr_payroll.hr_employee_bonamy0')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-salary_report.'+format), 'wb+').write(data)
-          
+        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-salary_structure.'+format), 'wb+').write(data)
+
 -
-  In order to test the PDF reports defined on HR Payslip, we will print a HR Payslip
+  Print HR Payslip
 - 
   !python {model: hr.payslip}: |
     import netsvc, tools, os
@@ -17,20 +17,23 @@
         file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payslip_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on HR Employee Salary Details, we will print HR Employee Salary Details
+  Print HR Employee Salary Details
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'employee_ids': [ref('hr.employee2')]}}
-    (data, format) = netsvc.LocalService('report.employees.salary').create(cr, uid, [], data_dict, {'periods': []})
+    emp_ids = [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'employee_ids': emp_ids, 'ids':emp_ids }}
+    (data, format) = netsvc.LocalService('report.employees.salary').create(cr, uid, [], data_dict, {'active_ids': emp_ids})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detai_report.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detail_report.'+format), 'wb+').write(data)
 -
- In order to test the PDF reports defined on HR Employee Salary Details, we will print HR Employee Salary Details
+  Print HR Employee Salary Details Annual basis
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'salary_on': 'current_month', 'employee_ids': [ref('hr.employee2')]}}
-    (data, format) = netsvc.LocalService('report.year.salary').create(cr, uid, [], data_dict, {'periods': []})
+    emp_ids = [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]
+    data_dict = {'model': 'hr.payslip', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'salary_on': 'current_month', 'employee_ids': emp_ids, 'ids':emp_ids}}
+    (data, format) = netsvc.LocalService('report.year.salary').create(cr, uid, [], data_dict,{'active_ids': emp_ids} )
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_yearly_salary_detai_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_yearly_salary_detail_report.'+format), 'wb+').write(data)
+
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index a2a9c3d5dbe..934485109b6 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -52,3 +52,12 @@
     from tools.translate import _
     advice_id=self.browse(cr, uid, ref("hr_payroll_advice_advice0"))
     assert(advice_id.state == 'confirm'), _('State not changed!')
+
+-
+  Print Payroll Advice
+- 
+  !python {model: hr.payroll.advice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('hr_payroll_advice_advice0')], {}, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payroll-advice.'+format), 'wb+').write(data)
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index f5772602db4..6ce953c1d94 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -1,6 +1,5 @@
 -
   I test the 'Payroll Register' in order to check the hr_payroll in OpenERP
--
   I create a new employee “Keith”
 -
   !record {model: hr.employee, id: hr_employee_keith0}:
@@ -61,3 +60,12 @@
     from tools.translate import _
     reg_brw=self.browse(cr, uid, ref("hr_payroll_register_payroll0"))
     assert(reg_brw.state == 'hr_check'), _('State not changed!')
+
+-
+  Print HR Payroll Register
+-
+  !python {model: hr.payroll.register}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.payroll.register.sheet').create(cr, uid, [ref('hr_payroll_register_payroll0')], {}, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-register_report.'+format), 'wb+').write(data)

From 32e09241ba869a6baa7d609eb2ad9d42667fede5 Mon Sep 17 00:00:00 2001
From: Panos Christeas <xrg@linux.gr>
Date: Sat, 18 Sep 2010 12:54:46 +0530
Subject: [PATCH 113/118] [MERGE] sfd-adoons: base_synchro, openoffice-plugin

bzr revid: hmo@tinyerp.com-20100918072446-gc1slo8lz82b2qli
---
 addons/base_report_designer/__init__.py       |   5 +-
 addons/base_report_designer/__openerp__.py    |   5 +-
 .../base_report_designer.py                   |  17 +-
 .../base_report_designer_installer.xml        |  93 ++
 .../base_report_designer_wizard.xml           |  22 -
 addons/base_report_designer/installer.py      |  63 ++
 .../__init__.py                               |   2 +-
 .../normalized_odt2rml.xsl                    |   0
 .../normalized_oo2rml.xsl                     |   0
 .../office.dtd                                |   0
 .../openerp_sxw2rml.py}                       |  16 +-
 .../plugin/openerp_report_designer.zip        | Bin 0 -> 153561 bytes
 .../plugin/openerp_report_designer/README     |  40 +
 .../openerp_report_designer/bin/Makefile      |  42 +
 .../openerp_report_designer/bin/OOo_run.sh    |   2 +
 .../bin/package/Addons.xcu                    | 636 ++++++++++++++
 .../bin/script/About.py                       | 111 +++
 .../bin/script/AddAttachment.py               | 277 ++++++
 .../bin/script/Change.py                      | 109 +++
 .../bin/script/ConvertBracesToField.py        | 285 ++++++
 .../bin/script/ConvertFieldsToBraces.py       |  85 ++
 .../bin/script/ExportToRML.py                 | 132 +++
 .../bin/script/Expression.py                  | 115 +++
 .../bin/script/Fields.py                      | 291 +++++++
 .../bin/script/LoginTest.py                   |  55 ++
 .../bin/script/ModifyExistingReport.py        | 213 +++++
 .../bin/script/NewReport.py                   | 119 +++
 .../bin/script/Repeatln.py                    | 300 +++++++
 .../bin/script/SendToServer.py                | 241 +++++
 .../bin/script/ServerParameter.py             | 208 +++++
 .../bin/script/Translation.py                 | 274 ++++++
 .../bin/script/__init__.py                    |  61 ++
 .../bin/script/compile_all.py                 |  49 ++
 .../openerp_report_designer/bin/script/import |   2 +
 .../bin/script/lib/__init__.py                |  28 +
 .../bin/script/lib/actions.py                 | 111 +++
 .../bin/script/lib/error.py                   |  60 ++
 .../bin/script/lib/functions.py               | 264 ++++++
 .../bin/script/lib/gui.py                     | 822 ++++++++++++++++++
 .../bin/script/lib/logreport.py               |  48 +
 .../bin/script/lib/rpc.py                     | 204 +++++
 .../bin/script/lib/tiny_socket.py             |  93 ++
 .../bin/script/lib/tools.py                   |  40 +
 .../bin/script/modify.py                      | 138 +++
 .../openerp_report_designer/test/test.txt     |  57 ++
 .../test/test_fields.py                       |  32 +
 .../base_report_security.xml}                 |   0
 .../base_report_designer/wizard/__init__.py   |   4 +-
 .../wizard/base_report_design_view.xml        |  68 ++
 .../wizard/base_report_designer_modify.py     | 343 +++-----
 addons/base_synchro/__init__.py               |  23 +
 addons/base_synchro/__openerp__.py            |  33 +
 addons/base_synchro/base_synchro_obj.py       | 107 +++
 addons/base_synchro/base_synchro_view.xml     | 146 ++++
 addons/base_synchro/base_synchro_wizard.xml   |   8 +
 addons/base_synchro/wizard/__init__.py        |  22 +
 addons/base_synchro/wizard/base_synchro.py    | 279 ++++++
 57 files changed, 6517 insertions(+), 283 deletions(-)
 create mode 100644 addons/base_report_designer/base_report_designer_installer.xml
 delete mode 100644 addons/base_report_designer/base_report_designer_wizard.xml
 create mode 100644 addons/base_report_designer/installer.py
 rename addons/base_report_designer/{wizard/tiny_sxw2rml => openerp_sxw2rml}/__init__.py (96%)
 rename addons/base_report_designer/{wizard/tiny_sxw2rml => openerp_sxw2rml}/normalized_odt2rml.xsl (100%)
 rename addons/base_report_designer/{wizard/tiny_sxw2rml => openerp_sxw2rml}/normalized_oo2rml.xsl (100%)
 rename addons/base_report_designer/{wizard/tiny_sxw2rml => openerp_sxw2rml}/office.dtd (100%)
 rename addons/base_report_designer/{wizard/tiny_sxw2rml/tiny_sxw2rml.py => openerp_sxw2rml/openerp_sxw2rml.py} (96%)
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer.zip
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/README
 create mode 100755 addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
 create mode 100755 addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/import
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/test/test.txt
 create mode 100644 addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
 rename addons/base_report_designer/{base_report_data.xml => security/base_report_security.xml} (100%)
 create mode 100644 addons/base_report_designer/wizard/base_report_design_view.xml
 create mode 100644 addons/base_synchro/__init__.py
 create mode 100644 addons/base_synchro/__openerp__.py
 create mode 100755 addons/base_synchro/base_synchro_obj.py
 create mode 100755 addons/base_synchro/base_synchro_view.xml
 create mode 100644 addons/base_synchro/base_synchro_wizard.xml
 create mode 100644 addons/base_synchro/wizard/__init__.py
 create mode 100644 addons/base_synchro/wizard/base_synchro.py

diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py
index 46a0a1e2476..2a14d2821ae 100644
--- a/addons/base_report_designer/__init__.py
+++ b/addons/base_report_designer/__init__.py
@@ -18,8 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
-import base_report_designer
 import wizard
+import base_report_designer
+import installer
+import openerp_sxw2rml
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 50fe73f753f..9d39bba8a61 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -36,8 +36,9 @@ upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_report_data.xml'],
-    'update_xml': ['base_report_designer_wizard.xml'],
+    'init_xml': ['security/base_report_security.xml',
+                 'wizard/base_report_design_view.xml'],
+    'update_xml': ['base_report_designer_installer.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index a4a135c4299..283c8ec7e23 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 from osv import osv
-from wizard.tiny_sxw2rml import sxw2rml
+from openerp_sxw2rml import sxw2rml
 from StringIO import StringIO
 from report import interface
 import base64
 import pooler
 import tools
-
+import addons
 
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
@@ -37,12 +37,9 @@ class report_xml(osv.osv):
         '''
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = tools.file_open('normalized_oo2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
         if file_type=='odt':
-            fp = tools.file_open('normalized_odt2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
-
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         return  {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))}
 
     def upload_report(self, cr, uid, report_id, file_sxw, file_type, context):
@@ -52,11 +49,9 @@ class report_xml(osv.osv):
         pool = pooler.get_pool(cr.dbname)
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = tools.file_open('normalized_oo2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
         if file_type=='odt':
-            fp = tools.file_open('normalized_odt2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         report = pool.get('ir.actions.report.xml').write(cr, uid, [report_id], {
             'report_sxw_content': base64.decodestring(file_sxw), 
             'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), 
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
new file mode 100644
index 00000000000..21537d3d63c
--- /dev/null
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+
+    <record id="view_report_designer_installer" model="ir.ui.view">
+      <field name="name">Form View: OpenERP Report Designer Installation</field>
+      <field name="model">base_report_designer.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="arch" type="xml">
+          <data>
+              <form position="attributes">
+                  <attribute name="string">OpenERP Report Designer Configuration</attribute>
+              </form>
+              <separator string="title" position="attributes">
+                   <attribute name="string">OpenERP Report Designer</attribute>
+              </separator>
+              <xpath expr="//label[@string='description']" position="attributes">
+                  <attribute name="string">This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer.</attribute>
+              </xpath>
+	          <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr="//button[@string='Skip']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr='//separator[@string="vsep"]' position='attributes'>
+		  		<attribute name='string'></attribute>
+		  		<attribute name='rowspan'>15</attribute>
+		  	  </xpath>
+		  	  <group colspan="8" position="replace">
+              <group colspan="8" height="450" width="750">
+                  <field name="name" invisible="1"/>
+                  <field name="plugin_file" filename="name"/>
+                  <separator string="Installation and Configuration Steps" colspan="4"/>
+                  <field name="description" nolabel="1" colspan="8"/>
+              </group>
+              </group>
+          </data>
+      </field>
+    </record>
+
+    <record id="action_report_designer_installer" model="ir.actions.act_window">
+      <field name="name">OpenERP Report Designer Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base_report_designer.installer</field>
+      <field name="view_id" ref="view_report_designer_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="report_designer_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_report_designer_installer"/>
+      <field name="sequence">3</field>
+    </record>
+
+
+
+    <record id="action_report_designer_wizard" model="ir.actions.act_window">
+      <field name="name">OpenERP Report Designer</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base_report_designer.installer</field>
+      <field name="view_id" ref="view_report_designer_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+      <field name="context">{'menu':True}</field> 
+    </record>
+
+    
+    <menuitem icon="terp-graph" id="base.reporting_menu"
+            name="Reporting" sequence="30" />
+
+    <menuitem id="base.next_id_50" name="Configuration"
+        parent="base.reporting_menu"  sequence="3" />
+
+    <menuitem parent="base.next_id_50" name="Report Designer"
+        action="action_report_designer_wizard"
+        id="menu_action_report_designer_wizard" sequence="70" />
+
+   <menuitem parent="base.next_id_50" name="Modify an existing report"
+            action="action_view_base_report_sxw"
+            id="menu_wizard_report_designer_modify" sequence="70" groups="base.group_extended"/>
+
+  </data>
+</openerp>
+
+
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
deleted file mode 100644
index c1bb7c35270..00000000000
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <wizard string="Modify an existing report"
-            model="ir.actions.report.xml" name="base_report_designer.modify"
-            id="wizard_report_designer_modify" />
-
-        <menuitem icon="terp-graph" id="base.reporting_menu"
-            name="Reporting" sequence="30" />
-
-        <menuitem id="base.next_id_50" name="Configuration"
-            parent="base.reporting_menu" groups="base.group_system" sequence="3" />
-
-        <menuitem parent="base.next_id_50" name="Report Designer"
-            action="wizard_report_designer_modify" type="wizard"
-            id="menu_wizard_report_designer_modify" sequence="70" />
-
-    </data>
-</openerp>
-
-
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
new file mode 100644
index 00000000000..082383bde8c
--- /dev/null
+++ b/addons/base_report_designer/installer.py
@@ -0,0 +1,63 @@
+# -*- 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
+from osv import osv
+import base64
+from tools.translate import _
+import addons
+
+class base_report_designer_installer(osv.osv_memory):
+    _name = 'base_report_designer.installer'
+    _inherit = 'res.config.installer'
+
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context)
+        plugin_file = open(addons.get_module_resource('base_report_designer','plugin', 'openerp_report_designer.zip'),'rb')
+        data['plugin_file'] = base64.encodestring(plugin_file.read())
+        return data
+
+    _columns = {
+        'name':fields.char('File name', size=34),
+        'plugin_file':fields.binary('OpenObject Report Designer Plug-in', readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
+        'description':fields.text('Description', readonly=True)
+    }
+
+    _defaults = {
+        'name' : 'openerp_report_designer.zip',
+        'description' : """
+        * Save the OpenERP Report Designer plug-­in.
+        * Follow these steps to install plug-­in.
+            1. Open Extension Manager window from Menu Bar of Openoffice writer, Open Tools > Extension Menu.
+            2. Click on "Add" button.
+            3. Select path where the openerp_report_designer.zip is located.
+            4. On the completion of adding package you will get your package under 'Extension Manager' and the status of your package become 'Enabled'.
+            5. Restart openoffice writer.
+        * Follow the steps to configure OpenERP Report Designer plug-­in in Openoffice writer.
+            1. Connect OpenERP Server from Menu bar , OpenERP Report Designer > Server parameter.
+            2. Select Server url, database and provide user name and password
+            3. Click "Connect".
+            4. if your connection success, A message appears like 'You can start creating your report in current document.'.
+        """
+    }
+base_report_designer_installer()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py b/addons/base_report_designer/openerp_sxw2rml/__init__.py
similarity index 96%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
rename to addons/base_report_designer/openerp_sxw2rml/__init__.py
index ce14b22af8f..797fa7f8ccf 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
+++ b/addons/base_report_designer/openerp_sxw2rml/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-from tiny_sxw2rml import sxw2rml
+from openerp_sxw2rml import sxw2rml
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
similarity index 100%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
rename to addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
similarity index 100%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
rename to addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd b/addons/base_report_designer/openerp_sxw2rml/office.dtd
similarity index 100%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd
rename to addons/base_report_designer/openerp_sxw2rml/office.dtd
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
similarity index 96%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
rename to addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
index 1a29324fb83..c51602cd82d 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -22,17 +22,11 @@
 ##############################################################################
 #!/usr/bin/python
 """
-Tiny SXW2RML - The OpenERP's report engine
+OpenERP SXW2RML - The OpenERP's report engine
 
-Tiny SXW2RMLis part of the Tiny report project.
-Tiny Report is a module that allows you to render high quality PDF document
+OpenERP SXW2RML is part of the OpenERP Report Project.
+OpenERP Report is a module that allows you to render high quality PDF document
 from an OpenOffice template (.sxw) and any relationnal database.
-
-The whole source code is distributed under the terms of the
-GNU Public Licence.
-
-(c) 2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
-(c) 2005-TODAY, Fabien Pinckaers - Tiny sprl
 """
 __version__ = '0.9'
 
@@ -341,8 +335,8 @@ def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
 if __name__ == "__main__":
     import optparse
     parser = optparse.OptionParser(
-        version="Tiny Report v%s" % __version__,
-        usage = 'tiny_sxw2rml.py [options] file.sxw')
+        version="OpenERP Report v%s" % __version__,
+        usage = 'openerp_sxw2rml.py [options] file.sxw')
     parser.add_option("-v", "--verbose", default=False, dest="verbose", help="enable basic debugging")
     parser.add_option("-o", "--output", dest="output", default='.', help="directory of image output")
     (opt, args) = parser.parse_args()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
new file mode 100644
index 0000000000000000000000000000000000000000..22c0b7768f238401fd4ccbab4cbd9574d9f4cc9f
GIT binary patch
literal 153561
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
Q0E8~w3=H)?z)Fn)0Kr3mhyVZp

literal 0
HcmV?d00001

diff --git a/addons/base_report_designer/plugin/openerp_report_designer/README b/addons/base_report_designer/plugin/openerp_report_designer/README
new file mode 100644
index 00000000000..41e02733da1
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/README
@@ -0,0 +1,40 @@
+About OpenERP Report Designer Plugin
+===================================================================
+OpenERP Report Desinger Plugin is a Package of OpenOffice Writer.
+Using this Plugin , we can modify existing OpenERP Reports and also we can make new nice OpenERP Reports.
+
+
+How to Install OpenERP Report Designer Plugin into Openoffice 3.2 in Linux?
+=====================================================================
+- In Openoffice writer, Open Extension Manager window from Tools > Extension Menu
+
+- Click on "Add" button and select path where the openerp_report_designer.zip is located.
+
+- On the completion of adding package you will get your package
+  under 'Extension Manager' and the status of your package become 'Enabled'
+
+- Close openoffice writer.
+
+- Restart openoffice writer, Now you will find one new menu "OpenERP Report Designer" in Menubar.
+
+
+How to install the plugin with OpenOffice 2.4 on Windows
+========================================================
+
+If you get an error for the installation of the plugin, edit the pythonloader.py file
+in $(OPEN_OFFICE_DIR)\program\ and change the value of DEBUG to None.
+
+If you get an error for the uno.exe in window then just close the Quick starter
+	Openoffice.2.4.1 Too\Option\Openoffic.org in that select the Memory
+	in that Openoffice.org.QuickStarter
+	if checked mark is there then just remove it..
+
+If you are using OpenOffice 3.0 and install the Report Desinger with make all
+	command then change  path in makefile
+
+	sh /opt/openoffice.org3/program/unopkg add or remove both
+
+	And for previous version of Openoffice used
+
+	sh /usr/lib/openoffice/program/unopkg add -v $(ZIP_FILE)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
new file mode 100755
index 00000000000..d3a55804819
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
@@ -0,0 +1,42 @@
+ZIP_FILE=../../openerp_report_designer.zip
+
+all: pack uninstall install
+
+create:
+	cat script/import \
+	    script/lib/actions.py \
+	    script/lib/error.py \
+	    script/lib/functions.py \
+	    script/lib/gui.py \
+	    script/lib/tools.py \
+	    script/lib/logreport.py\
+	    script/lib/rpc.py\
+	    script/lib/tiny_socket.py\
+	    script/Repeatln.py \
+	    script/Fields.py \
+	    script/Expression.py \
+	    script/modify.py \
+	    script/ServerParameter.py \
+	    script/Change.py \
+	    script/NewReport.py \
+	    script/LoginTest.py \
+	    script/ModifyExistingReport.py \
+	    script/SendToServer.py \
+	    script/About.py \
+	    script/ConvertBracesToField.py \
+	    script/ConvertFieldsToBraces.py \
+	    script/ExportToRML.py \
+	    script/Translation.py \
+	    script/AddAttachment.py > package/OpenERPReport.py
+
+pack: clean create
+	zip $(ZIP_FILE) `find package/ | grep -v svn` 
+	
+install:
+	sh /opt/openoffice.org3/program/unopkg add -v $(ZIP_FILE)
+	
+uninstall:
+	sh /opt/openoffice.org3/program/unopkg remove -v  $(ZIP_FILE)
+
+clean:
+	rm -f $(ZIP_FILE)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
new file mode 100755
index 00000000000..a22ff96cf53
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ooffice "-accept=socket,host=localhost,port=2002;urp;"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
new file mode 100644
index 00000000000..121c49af167
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    oor:name="Addons" oor:package="org.openoffice.Office">
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeMenuBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value/>
+                    <value xml:lang="en-US">OpenERP Report Designer</value>
+                    <value xml:lang="fr_FR">OpenERP Rapport Designer</value>
+                </prop>
+                <prop oor:name="Target" oor:type="xs:string">
+                    <value>_self</value>
+                </prop>
+                <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                    <value/>
+                </prop>
+                <node oor:name="Submenu">
+                    <node oor:name="m11" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Server parameters</value>
+                            <value xml:lang="fr_FR">Paramètres serveur</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m12" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m21" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a loop</value>
+                           <value xml:lang="fr_FR"> Ajouter une boucle</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m22" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.fields?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a field</value>
+                            <value xml:lang="fr_FR">Ajouter un champ</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+
+                    <node oor:name="m23" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.expression?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add an expression</value>
+                            <value xml:lang="fr_FR">Ajouter une expression</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+
+                    <node oor:name="m24" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a lang tag</value>
+                            <value xml:lang="fr_FR">Ajouter un tag lang</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m25" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.modify?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Modify</value>
+                            <value xml:lang="fr_FR">Modifier</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m26" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m31" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Conversion Fields -> Brackets</value>
+                            <value xml:lang="fr_FR">Conversion champs -> crochets</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m32" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Conversion Brackets -> Fields</value>
+                            <value xml:lang="fr_FR">Conversion crochets -> champs</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m33" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Export to RML</value>
+                            <value xml:lang="fr_FR">Exporter en RML</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m34" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.addattachment?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add Attachment</value>
+                            <value xml:lang="fr_FR">Envoyer comme attachement</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m35" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m41" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.sendtoserver?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Send to the server</value>
+                            <value xml:lang="fr_FR">Envoyer au serveur</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m42" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.opennewreport?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Open a new report</value>
+                            <value xml:lang="fr_FR">Nouveau rapport</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m43" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.modifyreport?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Modify Existing Report</value>
+                            <value xml:lang="fr_FR">Modifier un rapport</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m45" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m51" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.about?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">About</value>
+                            <value xml:lang="fr_FR">À propos de</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+
+        <node oor:name="OfficeToolBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <node oor:name="m11" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Server parameters</value>
+                        <value xml:lang="fr_FR">Paramètres serveur</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+
+
+                <node oor:name="m12" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m21" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a loop</value>
+                        <value xml:lang="fr_FR">Ajouter une boucle</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m22" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.fields?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a field</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+
+                <node oor:name="m23" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.expression?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add an expression</value>
+                        <value xml:lang="fr_FR">Ajouter une expression</value>>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m24" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a lang tag</value>
+                        <value xml:lang="fr_FR">Ajouter un tag lang</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m25" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.modify?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Modify</value>
+                        <value xml:lang="fr_FR">Modifier</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m26" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m31" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Conversion Fields -> Brackets</value>
+                        <value xml:lang="fr_FR">Domaines de conversion -> Supports</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m32" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Conversion Brackets -> Fields</value>
+                        <value xml:lang="fr_FR">Supports de conversion -> Domaines</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m33" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Export to RML</value>
+                        <value xml:lang="fr_FR">RML à l'exportation</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m45" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m51" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.about?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">About</value>
+                        <value xml:lang="fr_FR">À propos de</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+        <node oor:name="Images">
+            <node oor:name="org.openoffice.openerp.report.image1" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.expression?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/expression_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/expression_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image2" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/loop_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/loop_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image3" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.fields?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/field_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/field_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image4" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/export_rml_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/export_rml_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image5" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/convetFtoB_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/convetFtoB_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image6" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/convetBtoF_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/convetBtoF_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image7" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.modify?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/modify_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/modify_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image8" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/logo_1.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/logo_s.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image9" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.about?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/aboutus_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/aboutus_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image10" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/lang_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/lang_b.png</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+
+    </node>
+</oor:component-data>
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
new file mode 100644
index 00000000000..319a1d6703c
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -0,0 +1,111 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+from com.sun.star.task import XJobExecutor
+
+if __name__<>'package':
+    from lib.gui import *
+
+class About(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        self.win = DBModalDialog(60, 50, 175, 115, "About OpenERP Report Designer")
+
+        fdBigFont = createUnoStruct("com.sun.star.awt.FontDescriptor")
+        fdBigFont.Width = 20
+        fdBigFont.Height = 25
+        fdBigFont.Weight = 120
+        fdBigFont.Family= 3
+
+        oLabelTitle1 = self.win.addFixedText("lblTitle1", 1, 1, 35, 30)
+        oLabelTitle1.Model.TextColor = 16056320
+        oLabelTitle1.Model.FontDescriptor = fdBigFont
+        oLabelTitle1.Model.FontRelief = 1
+        oLabelTitle1.Text = "Open"
+
+        oLabelTitle2 = self.win.addFixedText("lblTitle2", 35, 1, 30, 30)
+        oLabelTitle2.Model.TextColor = 1
+        oLabelTitle2.Model.FontDescriptor = fdBigFont
+        oLabelTitle2.Model.FontRelief = 1
+        oLabelTitle2.Text = "ERP"
+
+        oLabelProdDesc = self.win.addFixedText("lblProdDesc", 1, 30, 173, 75)
+        oLabelProdDesc.Model.TextColor = 1
+        fdBigFont.Width = 10
+        fdBigFont.Height = 11
+        fdBigFont.Weight = 76
+        oLabelProdDesc.Model.FontDescriptor = fdBigFont
+        oLabelProdDesc.Model.Align = 1
+        oLabelProdDesc.Model.FontRelief = 1
+        oLabelProdDesc.Model.MultiLine = True
+        oLabelProdDesc.Text = "This  package  helps  you  to  create  or  modify\nreports  in  OpenERP.  Once  connected  to  the\nserver, you can design your template of reports\nusing fields  and expressions  and  browsing the\ncomplete structure of OpenERP object database."
+
+        oLabelFooter = self.win.addFixedText("lblFooter", -1, -1, 173, 25)
+        oLabelFooter.Model.TextColor = 255
+        #oLabelFooter.Model.BackgroundColor = 1
+        oLabelFooter.Model.Border = 2
+        oLabelFooter.Model.BorderColor = 255
+        fdBigFont.Width = 8
+        fdBigFont.Height = 9
+        fdBigFont.Weight = 100
+        oLabelFooter.Model.FontDescriptor = fdBigFont
+        oLabelFooter.Model.Align = 1
+        oLabelFooter.Model.FontRelief = 1
+        oLabelFooter.Model.MultiLine = True
+        sMessage = "OpenERP Report Designer v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GNU Affero General Public License."
+        oLabelFooter.Text = sMessage
+
+        self.win.doModalDialog("",None)
+
+if __name__<>"package" and __name__=="__main__":
+    About(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
new file mode 100644
index 00000000000..d42cb4614aa
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -0,0 +1,277 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import os
+import uno
+import unohelper
+import xmlrpclib
+import base64
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+class AddAttachment(unohelper.Base, XJobExecutor ):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+    }
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.aSearchResult = []
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        if docinfo.getUserFieldValue(2) <> "" and docinfo.getUserFieldValue(3) <> "":
+            self.win = DBModalDialog(60, 50, 180, 70, "Add Attachment to Server")
+            self.win.addFixedText("lblResourceType", 2 , 5, 100, 10, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 25, 176, 15,True)
+            self.win.addButton('btnOkWithoutInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithoutInformation_clicked )
+        else:
+            self.win = DBModalDialog(60, 50, 180, 190, "Add Attachment to Server")
+            self.win.addFixedText("lblModuleName",2 , 9, 42, 20, "Select Module:")
+            self.win.addComboListBox("lstmodel", -2, 5, 134, 15,True)
+            self.lstModel = self.win.getControl( "lstmodel" )
+            self.dModel = {}
+
+            # Open a new connexion to the server
+
+            ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_model'),('state', '=', 'installed')])
+            if not len(ids):
+                # If the module 'base_report_model' is not installed, use the default model
+                self.dModel = {
+                    "Partner":'res.partner',
+                }
+            else:
+
+                ids =self.sock.execute(database, uid, self.password, 'base.report.model' , 'search', [])
+                res = self.sock.execute(database, uid, self.password, 'base.report.model' , 'read', ids, ['name','model_id'])
+                models = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', map(lambda x:x['model_id'][0], res), ['model'])
+                models = dict(map(lambda x:(x['id'],x['model']), models))
+                self.dModel = dict(map(lambda x: (x['name'],models[x['model_id'][0]]), res))
+
+            for item in self.dModel.keys():
+                self.lstModel.addItem(item, self.lstModel.getItemCount())
+
+            self.win.addFixedText("lblSearchName",2 , 25, 60, 10, "Enter Search String:")
+            self.win.addEdit("txtSearchName", 2, 35, 149, 15,)
+            self.win.addButton('btnSearch', -2 , 35, 25 , 15,'Search' ,actionListenerProc = self.btnSearch_clicked )
+
+            self.win.addFixedText("lblSearchRecord", 2 , 55, 60, 10, "Search Result:")
+            self.win.addComboListBox("lstResource", -2, 65, 176, 70, False )
+            self.lstResource = self.win.getControl( "lstResource" )
+
+            self.win.addFixedText("lblResourceType", 2 , 137, 100, 20, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 147, 176, 15,True )
+
+            self.win.addButton('btnOkWithInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithInformation_clicked )
+
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton('btnCancel', -2 - 27 , -5 , 30 , 15, 'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def btnSearch_clicked( self, oActionEvent ):
+        modelSelectedItem = self.win.getListBoxSelectedItem("lstmodel")
+        if modelSelectedItem == "":
+            return
+
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+
+        self.aSearchResult =self.sock.execute( database, uid, self.password, self.dModel[modelSelectedItem], 'name_search', self.win.getEditText("txtSearchName"))
+        self.win.removeListBoxItems("lstResource", 0, self.win.getListBoxItemCount("lstResource"))
+        if self.aSearchResult == []:
+            ErrorDialog("No search result found !!!", "", "Search ERROR" )
+            return
+
+        for result in self.aSearchResult:
+            self.lstResource.addItem(result[1],result[0])
+
+    def _send_attachment( self, name, data, res_model, res_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        params = {
+            'name': name,
+            'datas': base64.encodestring( data ),
+            'datas_fname': name,
+            'res_model' : res_model,
+            'res_id' : int(res_id),
+        }
+
+        return self.sock.execute( database, uid, self.password, 'ir.attachment', 'create', params )
+
+    def send_attachment( self, model, resource_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if oDoc2.getURL() == "":
+            ErrorDialog("Please save your file", "", "Saving ERROR" )
+            return None
+
+        url = oDoc2.getURL()
+        if self.Kind[self.win.getListBoxSelectedItem("lstResourceType")] == "pdf":
+            url = self.doc2pdf(url[7:])
+
+        if url == None:
+            ErrorDialog( "Ploblem in creating PDF", "", "PDF Error" )
+            return None
+
+        url = url[7:]
+        data = read_data_from_file( get_absolute_file_path( url ) )
+        return self._send_attachment( os.path.basename( url ), data, model, resource_id )
+
+    def btnOkWithoutInformation_clicked( self, oActionEvent ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog("Please select resource type", "", "Selection ERROR" )
+            return
+
+        res = self.send_attachment( docinfo.getUserFieldValue(3), docinfo.getUserFieldValue(2) )
+        self.win.endExecute()
+
+    def btnOkWithInformation_clicked(self,oActionEvent):
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog( "Please select resource type", "", "Selection ERROR" )
+            return
+
+        if self.win.getListBoxSelectedItem("lstResource") == "" or self.win.getListBoxSelectedItem("lstmodel") == "":
+            ErrorDialog("Please select Model and Resource","","Selection ERROR")
+            return
+
+        resourceid = None
+        for s in self.aSearchResult:
+            if s[1] == self.win.getListBoxSelectedItem("lstResource"):
+                resourceid = s[0]
+                break
+
+        if resourceid == None:
+            ErrorDialog("No resource selected !!!", "", "Resource ERROR" )
+            return
+
+        res = self.send_attachment( self.dModel[self.win.getListBoxSelectedItem('lstmodel')], resourceid )
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def doc2pdf(self, strFile):
+        oDoc = None
+        strFilterSubName = ''
+
+        strUrl = convertToURL( strFile )
+        desktop = getDesktop()
+        oDoc = desktop.loadComponentFromURL( strUrl, "_blank", 0, Array(self._MakePropertyValue("Hidden",True)))
+        if oDoc:
+            strFilterSubName = ""
+            # select appropriate filter
+            if oDoc.supportsService("com.sun.star.presentation.PresentationDocument"):
+                strFilterSubName = "impress_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.sheet.SpreadsheetDocument"):
+                strFilterSubName = "calc_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.WebDocument"):
+                strFilterSubName = "writer_web_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.GlobalDocument"):
+                strFilterSubName = "writer_globaldocument_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.TextDocument"):
+                strFilterSubName = "writer_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.drawing.DrawingDocument"):
+                strFilterSubName = "draw_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.formula.FormulaProperties"):
+                strFilterSubName = "math_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.chart.ChartDocument"):
+                strFilterSubName = "chart_pdf_Export"
+            else:
+                pass
+
+            filename = len(strFilterSubName) > 0 and convertToURL( os.path.splitext( strFile )[0] + ".pdf" ) or None
+
+            if len(strFilterSubName) > 0:
+                oDoc.storeToURL( filename, Array(self._MakePropertyValue("FilterName", strFilterSubName ),self._MakePropertyValue("CompressMode", "1" )))
+
+            oDoc.close(True)
+            # Can be None if len(strFilterSubName) <= 0
+            return filename
+
+    def _MakePropertyValue(self, cName = "", uValue = u"" ):
+       oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+       if cName:
+          oPropertyValue.Name = cName
+       if uValue:
+          oPropertyValue.Value = uValue
+       return oPropertyValue
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddAttachment(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
new file mode 100644
index 00000000000..7dc26c78505
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -0,0 +1,109 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.rpc import *
+
+class Change:
+    def __init__(self, aVal= None, sURL=""):
+        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
+
+        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+
+        self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
+
+        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
+
+        self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
+
+        self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True)
+        self.lstProtocol = self.win.getControl( "lstProtocol" )
+
+#        self.lstProtocol.addItem( "XML-RPC", 0)
+        #self.lstProtocol.addItem( "XML-RPC secure", 1)
+        #self.lstProtocol.addItem( "NET-RPC (faster)", 2)
+
+        self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.aVal=aVal
+        self.protocol = {
+            'XML-RPC': 'http://',
+            'XML-RPC secure': 'https://',
+            'NET-RPC': 'socket://',
+        }
+        for i in self.protocol.keys():
+            self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
+
+        sValue=self.protocol.keys()[0]
+        if sURL<>"":
+            sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])]
+
+        self.win.doModalDialog( "lstProtocol", sValue)
+
+    def btnOk_clicked(self,oActionEvent):
+        global url
+        url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
+        self.sock=RPCSession(url)
+        docinfo=doc.getDocumentInfo()        
+        docinfo.setUserFieldValue(0,url)
+        res=self.sock.listdb()
+        if res == -1:
+            self.aVal.append(url)
+        elif res == 0:
+            self.aVal.append("No Database found !!!")
+        else:
+            self.aVal.append(url)
+        self.aVal.append(res)
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
new file mode 100644
index 00000000000..d4e8b5855ff
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -0,0 +1,285 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import unohelper
+import string
+import re
+import base64
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 1
+
+
+
+class ConvertBracesToField( unohelper.Base, XJobExecutor ):
+
+    def __init__(self,ctx):
+
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        self.aReportSyntex=[]
+        self.getBraces(self.aReportSyntex)
+
+        self.setValue()
+
+
+    def setValue(self):
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=  doc.getDocumentInfo()
+        count = 0
+        regexes = [
+            ['[a-zA-Z0-9_]+\.[a-zA-Z0-9_.]+',"Field"],
+            ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+            ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"]
+            # ['\\[\\[ ([a-zA-Z0-9_]+\.[a-zA-Z1-9]) \\]\\]',"Field"],
+            # ['\\[\\[ [a-zA-Z0-9_\.]+ and ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) and .+? \\]\\]',"Field"],
+            # ['\\[\\[ .+? or ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ (.+?) and ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ .+? % ([a-zA-Z0-9_\.]+) \\]\\]',"Field"]
+        ]
+        oFieldObject = []
+        oRepeatInObjects = []
+        saRepeatInList = []
+        sHost = docinfo.getUserFieldValue(0)
+        nCount = 0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            nCount += 1
+        getList(oRepeatInObjects,sHost,nCount)
+        for ro in oRepeatInObjects:
+            if ro.find("(")<>-1:
+                saRepeatInList.append( [ ro[:ro.find("(")], ro[ro.find("(")+1:ro.find(")")] ])
+        try:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    for reg in regexes:
+                        res=re.findall(reg[0],oPar.Items[1])
+                        if len(res) <> 0:
+                            if res[0][0] == "objects":
+                                sTemp = docinfo.getUserFieldValue(3)
+                                sTemp = "|-." + sTemp[sTemp.rfind(".")+1:] + ".-|"
+                                oPar.Items=(sTemp.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            elif type(res[0]) <> type(u''):
+
+                                sObject = self.getRes(self.sock, docinfo.getUserFieldValue(3), res[0][0][res[0][0].find(".")+1:].replace(".","/"))
+                                r = self.sock.execute(database, uid, self.password, docinfo.getUserFieldValue(3) , 'fields_get')
+                                sExpr="|-." + r[res[0][0][res[0][0].rfind(".")+1:]]["string"] + ".-|"
+                                oPar.Items=(sExpr.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            else:
+
+                                obj = None
+                                for rl in saRepeatInList:
+                                    if rl[0] == res[0][:res[0].find(".")]:
+                                        obj=rl[1]
+                                try:
+                                    sObject = self.getRes(self.sock, obj, res[0][res[0].find(".")+1:].replace(".","/"))
+                                    r = self.sock.execute(database, uid, self.password, sObject , 'read',[1])
+                                except Exception,e:
+                                    r = "TTT"
+                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, str(e))
+                                if len(r) <> 0:
+                                    if r <> "TTT":
+                                        if len(res)>1:
+                                            sExpr=""
+                                            print res
+                                            if reg[1] == 'Field':
+                                                for ires in res:
+                                                    try:
+                                                        sExpr=r[0][ires[ires.rfind(".")+1:]]
+                                                        break
+                                                    except Exception,e:
+                                                        import traceback,sys
+                                                        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                        self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+                                                try:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                except:
+                                                    oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                    oPar.update()
+                                                    import traceback,sys
+                                                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, info)
+
+                                        else:
+                                            sExpr=r[0][res[0][res[0].rfind(".")+1:]]
+                                            try:
+
+                                                if sExpr:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                else:
+                                                     oPar.Items=(u"/",oPar.Items[1])
+                                                     oPar.update()
+                                            except:
+                                                oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                oPar.update()
+                                                import traceback,sys
+                                                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+
+                                    else:
+                                        oPar.Items=(u""+r,oPar.Items[1])
+                                        oPar.update()
+                                else:
+                                    oPar.Items=(u"TTT",oPar.Items[1])
+                                    oPar.update()
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+    def getRes(self,sock,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+            myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        for k in key:
+            if (res[k]['type'] in ['many2one']) and k==myval:
+                sObject = self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+        return sObject
+
+    def getBraces(self,aReportSyntex=[]):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        aSearchString=[]
+        aReplaceString=[]
+        aRes=[]
+
+        try:
+            regexes = [
+                ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+                ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"],
+                ['\\[\\[ *.+? *\\]\\]', "Expression"]
+            ]
+
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = True
+
+            for reg in regexes:
+                search.SearchString = reg[0]
+                found = doc.findFirst( search )
+                while found:
+                    res=re.findall(reg[0],found.String)
+                    print len(res)
+
+                    if found.String not in [r[0] for r in aReportSyntex] and len(res) == 1 :
+                        text=found.getText()
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if reg[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,reg[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+
+                    else:
+                        aRes.append([res,reg[1]])
+                        found = doc.findNext(found.End, search)
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = False
+
+            for res in aRes:
+                for r in res[0]:
+                    search.SearchString=r
+                    found=doc.findFirst(search)
+                    while found:
+
+                        text=found.getText()
+
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if res[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,res[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+                        found = doc.findNext(found.End, search)
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+if __name__<>"package":
+    ConvertBracesToField(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertBracesToField, "org.openoffice.openerp.report.convertBF", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
new file mode 100644
index 00000000000..05a794410b6
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -0,0 +1,85 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import unohelper
+import string
+import re
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    database="test"
+    uid = 3
+
+class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.aReportSyntex=[]
+        self.getFields()
+
+    def getFields(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.getAnchor().Text.insertString(oPar.getAnchor(),oPar.Items[1],False)
+                oPar.dispose()
+
+if __name__<>"package":
+    ConvertFieldsToBraces(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
new file mode 100644
index 00000000000..875fe210c03
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -0,0 +1,132 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import os
+import uno
+import unohelper
+import string
+import tempfile
+import base64
+import sys
+
+reload(sys)
+sys.setdefaultencoding("utf8")
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.error import *
+    from lib.tools import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+
+class ExportToRML( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        global url
+        self.sock=RPCSession(url)
+
+        # Read Data from sxw file
+        tmpsxw = tempfile.mktemp('.'+"sxw")
+
+        if not doc.hasLocation():
+            mytype = Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            doc.storeAsURL("file://"+tmpsxw,mytype)
+        data = read_data_from_file( get_absolute_file_path( doc.getURL()[7:] ) )
+        file_type = doc.getURL()[7:].split(".")[-1]
+        if docinfo.getUserFieldValue(2) == "":
+            ErrorDialog("Please Save this file on server","Use Send To Server Option in OpenERP Report Menu","Error")
+            exit(1)
+    	filename = self.GetAFileName()
+    	if not filename:
+    	    exit(1)
+        global passwd
+        self.password = passwd
+        try:
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'sxwtorml',base64.encodestring(data),file_type)
+            if res['report_rml_content']:
+                write_data_to_file( get_absolute_file_path( filename[7:] ), res['report_rml_content'] )
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ExportToRML',LOG_ERROR, info)
+            ErrorDialog("Can't save the file to the hard drive.", "Exception: %s" % e, "Error" )
+
+    def GetAFileName(self):
+        sFilePickerArgs = Array(10)
+        oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+        oFileDialog.initialize(sFilePickerArgs)
+        oFileDialog.appendFilter("OpenERP Report File Save To ....","*.rml")
+
+        f_path = "OpenERP-"+ os.path.basename( tempfile.mktemp("","") ) + ".rml"
+        initPath = tempfile.gettempdir()
+        oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+        if oUcb.exists(initPath):
+	    oFileDialog.setDisplayDirectory('file://' + ( os.name == 'nt' and '/' or '' ) + initPath )
+
+        oFileDialog.setDefaultName(f_path )
+
+        sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or None
+        oFileDialog.dispose()
+        return sPath
+
+if __name__<>"package" and __name__=="__main__":
+    ExportToRML(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ExportToRML, "org.openoffice.openerp.report.exporttorml", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
new file mode 100644
index 00000000000..43531d10168
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -0,0 +1,115 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    database="test"
+    uid = 3
+
+class Expression(unohelper.Base, XJobExecutor ):
+    def __init__(self,sExpression="",sName="", bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win = DBModalDialog(60, 50, 180, 65, "Expression Builder")
+        self.win.addFixedText("lblExpression",17 , 10, 35, 15, "Expression :")
+        self.win.addEdit("txtExpression", -5, 5, 123, 15)
+        self.win.addFixedText("lblName", 2, 30, 50, 15, "Displayed Name :")
+        self.win.addEdit("txtName", -5, 25, 123, 15)
+        self.win.addButton( "btnOK", -5, -5, 40, 15, "OK", actionListenerProc = self.btnOk_clicked )
+        self.win.addButton( "btnCancel", -5 - 40 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked )
+        self.bModify=bFromModify
+        if self.bModify==True:
+            self.win.setEditText("txtExpression",sExpression)
+            self.win.setEditText("txtName",sName)
+        self.win.doModalDialog("",None)
+
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        text = doc.Text
+        cursor = doc.getCurrentController().getViewCursor()
+        if self.bModify==True:
+            oCurObj=cursor.TextField
+            sKey=u""+self.win.getEditText("txtName")
+            sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        else:
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            if self.win.getEditText("txtName")!="" and self.win.getEditText("txtExpression")!="":
+                sKey=u""+self.win.getEditText("txtName")
+                sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+                if cursor.TextTable==None:
+                    oInputList.Items = (sKey,sValue)
+                    text.insertTextContent(cursor,oInputList,False)
+                else:
+                    oTable = cursor.TextTable
+                    oCurCell = cursor.Cell
+                    tableText = oTable.getCellByName( oCurCell.CellName )
+                    oInputList.Items = (sKey,sValue)
+                    tableText.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+            else:
+                ErrorDialog("Please Fill appropriate data in Name field or \nExpression field")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Expression()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Expression, "org.openoffice.openerp.report.expression", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
new file mode 100644
index 00000000000..4e2f40889c9
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -0,0 +1,291 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+
+class Fields(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.logobj=Logger()
+        self.win = DBModalDialog(60, 50, 200, 225, "Field Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 130, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 130, 150, False,True,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 130, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5,45,15,'Ok' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost = docinfo.getUserFieldValue(0)
+            self.count = 0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".")+1:] == tcur.TextTable.Name:
+                            VariableScope(tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component)
+                except:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('Fields', LOG_ERROR, info)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+                for anObject in self.aObjectList:
+                    if anObject[:anObject.find("(")] == sVariable:
+                        sItem = anObject
+                        self.insVariable.setText(sItem)
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+            for var in self.aVariableList:
+
+                    self.model_ids =self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+            ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+            res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+            self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('Fields', LOG_ERROR, info)
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+                    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logobj.log_write('Fields', LOG_ERROR, info)
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        for i in self.win.getListBoxSelectedItemsPos("lstFields"):
+                itemSelected = self.aListFields[i]
+                itemSelectedPos = i
+                txtUName=self.win.getEditText("txtUName")
+                sKey=u""+txtUName
+                if itemSelected != "" and txtUName != "" and self.bModify==True :
+                    txtUName=self.sGDisplayName
+                    sKey=u""+txtUName
+                    txtUName=self.sGDisplayName
+                    oCurObj=cursor.TextField
+                    sObjName=self.insVariable.getText()
+                    sObjName=sObjName[:sObjName.find("(")]
+                    sValue=u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oCurObj.Items = (sKey,sValue)
+                    oCurObj.update()
+                    self.win.endExecute()
+                elif itemSelected != "" and txtUName != "" :
+
+                    oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                    sObjName=self.win.getComboBoxText("cmbVariable")
+                    sObjName=sObjName[:sObjName.find("(")]
+
+                    widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+                    sValue = u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oInputList.Items = (sKey,sValue)
+                    widget.insertTextContent(cursor,oInputList,False)
+                    self.win.endExecute()
+                else:
+                    ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Fields()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Fields, "org.openoffice.openerp.report.fields", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
new file mode 100644
index 00000000000..507ec28efb8
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -0,0 +1,55 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+if __name__<>"package":
+    from ServerParameter import *
+    from lib.gui import *
+
+class LoginTest:
+    def __init__(self):
+        if not loginstatus:
+            ServerParameter(None)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
new file mode 100644
index 00000000000..cc1d30ba6b0
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -0,0 +1,213 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+import base64, tempfile
+
+
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+#
+class ModifyExistingReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 120, "Modify Existing Report")
+        self.win.addFixedText("lblReport", 2, 3, 60, 15, "Report Selection")
+        self.win.addComboListBox("lstReport", -1,15,178,80 , False )
+        self.lstReport = self.win.getControl( "lstReport" )
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.logobj=Logger()
+        self.hostname = docinfo.getUserFieldValue(0)
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Open a new connexion to the server
+
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'search', [('report_xsl', '=', False),('report_xml', '=', False)])
+
+        fields=['id', 'name','report_name','model']
+
+        self.reports = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', ids, fields)
+        self.report_with_id = []
+
+        for report in self.reports:
+            if report['name']<>"":
+                model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=', report['model'])])
+                model_res_other =self.sock.execute(database, uid, self.password, 'ir.model', 'read', model_ids, [ 'name', 'model' ] )
+                if model_res_other <> []:
+                    name = model_res_other[0]['name'] + " - " + report['name']
+                else:
+                    name = report['name'] + " - " + report['model']
+                self.report_with_id.append( (report['id'], name, report['model'] ) )
+
+        self.report_with_id.sort( lambda x, y: cmp( x[1], y[1] ) )
+
+        for id, report_name, model_name in self.report_with_id:
+            self.lstReport.addItem( report_name, self.lstReport.getItemCount() )
+
+        self.win.addButton('btnSave',10,-5,50,15,'Open Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-10 ,-5,50,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.addButton('btnDelete',15 -80 ,-5,50,15,'Delete Report',actionListenerProc = self.btnDelete_clicked)
+        self.win.doModalDialog("lstReport",self.report_with_id[0][1] )
+
+    def btnOk_clicked(self, oActionEvent):
+        try:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+
+            selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+            id = self.report_with_id[ selectedItemPos ][0]
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'report_get', id)
+
+            if res['file_type'] in ['sxw','odt'] :
+               file_type = res['file_type']
+            else :
+               file_type = 'sxw'
+
+            fp_name = tempfile.mktemp('.'+file_type)
+            fp_name1="r"+fp_name
+            fp_path=os.path.join(fp_name1).replace("\\","/")
+            fp_win=fp_path[1:]
+
+            filename = ( os.name == 'nt' and fp_win or fp_name )
+            if res['report_sxw_content']:
+                write_data_to_file( filename, base64.decodestring(res['report_sxw_content']))
+            url = "file:///%s" % filename
+
+            arr=Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            oDoc2 = desktop.loadComponentFromURL(url, "openerp", 55, arr)
+            docinfo2=oDoc2.getDocumentInfo()
+            docinfo2.setUserFieldValue(0, self.hostname)
+            docinfo2.setUserFieldValue(1,self.password)
+            docinfo2.setUserFieldValue(2,id)
+            docinfo2.setUserFieldValue(3,self.report_with_id[selectedItemPos][2])
+
+            oParEnum = oDoc2.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    oPar.SelectedItem = oPar.Items[0]
+                    oPar.update()
+            if oDoc2.isModified():
+                if oDoc2.hasLocation() and not oDoc2.isReadonly():
+                    oDoc2.store()
+
+            ErrorDialog("Download is Completed","Your file has been placed here :\n"+ fp_name,"Download Message")
+            obj=Logger()
+            obj.log_write('Modify Existing Report',LOG_INFO, ':successful download report  %s  using database %s' % (self.report_with_id[selectedItemPos][2], database))
+        except Exception, e:
+            ErrorDialog("Report has not been downloaded", "Report: %s\nDetails: %s" % ( fp_name, str(e) ),"Download Message")
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ModifyExistingReport', LOG_ERROR, info)
+
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnDelete_clicked( self, oActionEvent ):
+         desktop=getDesktop()
+         doc = desktop.getCurrentComponent()
+         docinfo=doc.getDocumentInfo()
+
+         selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+         name=self.win.getListBoxSelectedItem ("lstReport")
+         id = self.report_with_id[ selectedItemPos ][0]
+         temp = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'unlink', id,)
+         str_value='ir.actions.report.xml,'+str(id)
+         ids = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search',[('value','=',str_value)])
+         if ids:
+              rec = self.sock.execute(database, uid, self.password, 'ir.values', 'unlink', ids,)
+         else :
+            pass
+         if temp:
+              ErrorDialog("Report","Report has been Delete:\n "+name,"Message")
+              self.logobj.log_write('Delete Report',LOG_INFO, ':successful delete report  %s  using database %s' % (name, database))
+
+         else:
+             ErrorDialog("Report","Report has not Delete:\n"+name," Message")
+         self.win.endExecute()
+
+
+
+if __name__<>"package" and __name__=="__main__":
+    ModifyExistingReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ModifyExistingReport, "org.openoffice.openerp.report.modifyreport", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
new file mode 100644
index 00000000000..06ba55275d5
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -0,0 +1,119 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+#
+#
+#
+# Start OpenOffice.org, listen for connections and open testing document
+#
+#
+class NewReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win=DBModalDialog(60, 50, 180, 115, "Open New Report")
+        self.win.addFixedText("lblModuleSelection", 2, 2, 60, 15, "Module Selection")
+        self.win.addComboListBox("lstModule", -2,13,176,80 , False)
+        self.lstModule = self.win.getControl( "lstModule" )
+        self.aModuleName=[]
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        ids = self.sock.execute(database, uid, self.password, 'ir.model' , 'search',[])
+        fields = [ 'model','name']
+        res = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', ids, fields)
+        res.sort(lambda x, y: cmp(x['name'],y['name']))
+
+        for i in range(len(res)):
+            self.lstModule.addItem(res[i]['name'],self.lstModule.getItemCount())
+            self.aModuleName.append(res[i]['model'])
+        self.win.addButton('btnOK',-2 ,-5, 70,15,'Use Module in Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-2 - 70 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("",None)
+
+    def btnOk_clicked(self,oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        docinfo.setUserFieldValue(3,self.aModuleName[self.lstModule.getSelectedItemPos()])
+        self.logobj.log_write('Module Name',LOG_INFO, ':Module use in creating a report %s  using database %s' % (self.aModuleName[self.lstModule.getSelectedItemPos()], database))
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    NewReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( \
+            NewReport,
+            "org.openoffice.openerp.report.opennewreport",
+            ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
new file mode 100644
index 00000000000..4e26508f106
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -0,0 +1,300 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from ServerParameter import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from LoginTest import *
+
+    database="test_db1"
+    uid = 3
+
+
+#class RepeatIn:
+class RepeatIn( unohelper.Base, XJobExecutor ):
+    def __init__(self,sObject="",sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        # Interface Design
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 250, "RepeatIn Builder")
+        self.win.addFixedText("lblVariable", 2, 12, 60, 15, "Objects to loop on :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Field to loop on :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblName", 12, 187, 60, 15, "Variable name :")
+        self.win.addEdit("txtName", 180-120-2, 185, 120, 15,)
+
+        self.win.addFixedText("lblUName", 8, 207, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 205, 120, 15,)
+
+        self.win.addButton('btnOK',-2 ,-10,45,15,'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 45 - 5 ,-10,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Variable Declaration
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGVariable=sVariable
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListRepeatIn=[]
+        self.aVariableList=[]
+        # Call method to perform Enumration on Report Document
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        # Perform checking that Field-1 and Field - 4 is available or not alos get Combobox
+        # filled if condition is true
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        # Check weather Field-1 is available if not then exit from application
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find(" ")] == "List", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                            VariableScope( tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component )
+                except :
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('RepeatIn', LOG_ERROR, info)
+            self.bModify=bFromModify
+
+            if self.bModify==True:
+
+                if sObject=="":
+                    self.insVariable.setText("List of "+docinfo.getUserFieldValue(3))
+                    self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+                    self.win.setEditText("txtName", sVariable)
+                    self.win.setEditText("txtUName",sDisplayName)
+                    self.sValue= "objects"
+                else:
+                    sItem=""
+		    for anObject in self.aObjectList:
+			if anObject[:anObject.find("(")] == sObject:
+			    sItem = anObject
+			    self.insVariable.setText( sItem )
+
+		    genTree(
+			sItem[sItem.find("(")+1:sItem.find(")")],
+			self.aListRepeatIn,
+			self.insField,
+			self.sMyHost,
+			2,
+			ending=['one2many','many2many'],
+			recur=['one2many','many2many']
+		    )
+
+                    self.sValue= self.win.getListBoxItem("lstFields",self.aListRepeatIn.index(sFields))
+
+            for var in self.aVariableList:
+
+		if var[:8] <> 'List of ':
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                else:
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[8:])])
+                fields=['name','model']
+                self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                if self.model_res <> []:
+		    if var[:8]<>'List of ':
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem('List of ' + self.model_res[0]['name'] ,self.insVariable.getItemCount())
+                else:
+                    self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOpenERP -> Open a New Report")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        sItem=self.win.getListBoxSelectedItem("lstFields")
+        sMain=self.aListRepeatIn[self.win.getListBoxSelectedItemPos("lstFields")]
+
+        if self.bModify==True:
+            self.win.setEditText("txtName", self.sGVariable)
+            self.win.setEditText("txtUName",self.sGDisplayName)
+        else:
+	    self.win.setEditText("txtName",sMain[sMain.rfind("/")+1:])
+	    self.win.setEditText("txtUName","|-."+sItem[sItem.rfind("/")+1:]+".-|")
+
+    def cmbVariable_selected(self,oItemEvent):
+
+        if self.count > 0 :
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:8]=='List of ':
+		    if var[:8]==sItem[:8]:
+                        sItem = var
+		elif var[:var.find("(")+1] == sItem[:sItem.find("(")+1]:
+                    sItem = var
+            self.aListRepeatIn=[]
+
+	    data = ( sItem[sItem.rfind(" ") + 1:] == docinfo.getUserFieldValue(3) ) and docinfo.getUserFieldValue(3) or sItem[sItem.find("(")+1:sItem.find(")")]
+	    genTree( data, self.aListRepeatIn, self.insField, self.sMyHost, 2, ending=['one2many','many2many'], recur=['one2many','many2many'] )
+
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+        else:
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:8]=='List of ' and var[:8] == sItem[:8]:
+                    sItem = var
+            if sItem.find(".")==-1:
+                temp=sItem[sItem.rfind("x_"):]
+            else:
+                temp=sItem[sItem.rfind(".")+1:]
+            self.win.setEditText("txtName",temp)
+            self.win.setEditText("txtUName","|-."+temp+".-|")
+            self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+    def btnOk_clicked(self, oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        selectedItem = self.win.getListBoxSelectedItem( "lstFields" )
+        selectedItemPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtName = self.win.getEditText( "txtName" )
+        txtUName = self.win.getEditText( "txtUName" )
+        if selectedItem != "" and txtName != "" and txtUName != "":
+            sKey=u""+ txtUName
+            if selectedItem == "objects":
+                sValue=u"[[ repeatIn(" + selectedItem + ",'" + txtName + "') ]]"
+            else:
+                sObjName=self.win.getComboBoxText("cmbVariable")
+                sObjName=sObjName[:sObjName.find("(")]
+                sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+
+            if self.bModify == True:
+                oCurObj = cursor.TextField
+                oCurObj.Items = (sKey,sValue)
+                oCurObj.update()
+            else:
+                oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                if self.win.getListBoxSelectedItem("lstFields") == "objects":
+                    oInputList.Items = (sKey,sValue)
+                    doc.Text.insertTextContent(cursor,oInputList,False)
+                else:
+                    sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+                    if cursor.TextTable==None:
+                        oInputList.Items = (sKey,sValue)
+                        doc.Text.insertTextContent(cursor,oInputList,False)
+                    else:
+                        oInputList.Items = (sKey,sValue)
+                        widget = ( cursor.TextTable or selectedItem <> 'objects' ) and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text
+                        widget.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Object Field or Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    RepeatIn()
+elif __name__=="package":
+    g_ImplementationHelper = unohelper.ImplementationHelper()
+    g_ImplementationHelper.addImplementation( RepeatIn, "org.openoffice.openerp.report.repeatln", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
new file mode 100644
index 00000000000..fd8a874749d
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -0,0 +1,241 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import string
+import unohelper
+import random
+import xmlrpclib
+import base64, tempfile
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+#
+#
+class SendtoServer(unohelper.Base, XJobExecutor):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+        'HTML' : 'html'
+    }
+
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        self.ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(self.ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        report_name = ""
+        name=""
+        if docinfo.getUserFieldValue(2)<>"" :
+            try:
+                fields=['name','report_name']
+                self.res_other = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', [int(docinfo.getUserFieldValue(2))],fields)
+                name = self.res_other[0]['name']
+                report_name = self.res_other[0]['report_name']
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logob.log_write('ServerParameter', LOG_ERROR, info)
+        elif docinfo.getUserFieldValue(3) <> "":
+            name = ""
+            result =  "rnd"
+            for i in range(5):
+                result =result + random.choice('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
+
+            report_name = docinfo.getUserFieldValue(3) + "." + result
+        else:
+            ErrorDialog("Please select appropriate module...","Note: use OpenERP Report -> Open a new Report", "Module selection ERROR");
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 100, "Send To Server")
+        self.win.addFixedText("lblName",10 , 9, 40, 15, "Report Name :")
+        self.win.addEdit("txtName", -5, 5, 123, 15,name)
+        self.win.addFixedText("lblReportName", 2, 30, 50, 15, "Technical Name :")
+        self.win.addEdit("txtReportName", -5, 25, 123, 15,report_name)
+        self.win.addCheckBox("chkHeader", 51, 45, 70 ,15, "Corporate Header")
+        self.win.addFixedText("lblResourceType", 2 , 60, 50, 15, "Select Rpt. Type :")
+        self.win.addComboListBox("lstResourceType", -5, 58, 123, 15,True,itemListenerProc=self.lstbox_selected)
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        self.txtReportName=self.win.getControl( "txtReportName" )
+        self.txtReportName.Enable=False
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton( "btnSend", -5, -5, 80, 15, "Send Report to Server", actionListenerProc = self.btnOk_clicked)
+        self.win.addButton( "btnCancel", -5 - 80 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked)
+
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def lstbox_selected(self,oItemEvent):
+        pass
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnOk_clicked(self, oActionEvent):
+        if self.win.getEditText("txtName") <> "" and self.win.getEditText("txtReportName") <> "":
+            desktop=getDesktop()
+            oDoc2 = desktop.getCurrentComponent()
+            docinfo=oDoc2.getDocumentInfo()
+            self.getInverseFieldsRecord(1)
+            fp_name = tempfile.mktemp('.'+"sxw")
+            if not oDoc2.hasLocation():
+                oDoc2.storeAsURL("file://"+fp_name,Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),))
+
+            if docinfo.getUserFieldValue(2)=="":
+                name=self.win.getEditText("txtName"),
+                name_id={}
+                try:
+                    name_id = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' , 'search',[('name','=',name)])
+                    if not name_id:
+                        id=self.getID()
+                        docinfo.setUserFieldValue(2,id)
+                        rec = {
+                                'name': self.win.getEditText("txtReportName"),
+                                'key': 'action',
+                                'model': docinfo.getUserFieldValue(3),
+                                'value': 'ir.actions.report.xml,'+str(id),
+                                'key2': 'client_print_multi',
+                                'object': True
+                            }
+                        res = self.sock.execute(database, uid, self.password, 'ir.values' , 'create',rec )
+                    else :
+                        ErrorDialog(" Report Name is all ready given !!!\n\n\n Please specify other Name","","Report Name")
+                        self.logobj.log_write('SendToServer',LOG_WARNING, ':Report name all ready given DB %s' % (database))
+                        self.win.endExecute()
+                except Exception,e:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+            else:
+
+                id = docinfo.getUserFieldValue(2)
+                vId = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search', [('value','=','ir.actions.report.xml,'+str(id))])
+                rec = { 'name': self.win.getEditText("txtReportName") }
+                res = self.sock.execute(database, uid, self.password, 'ir.values' , 'write',vId,rec)
+            oDoc2.store()
+            data = read_data_from_file( get_absolute_file_path( oDoc2.getURL()[7:] ) )
+            self.getInverseFieldsRecord(0)
+            #sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
+
+            file_type = oDoc2.getURL()[7:].split(".")[-1]
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
+            params = {
+                'name': self.win.getEditText("txtName"),
+                'model': docinfo.getUserFieldValue(3),
+                'report_name': self.win.getEditText("txtReportName"),
+                'header': (self.win.getCheckBoxState("chkHeader") <> 0),
+                'report_type': self.Kind[self.win.getListBoxSelectedItem("lstResourceType")],
+            }
+            if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
+                params['report_type']=file_type
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
+            self.logobj.log_write('SendToServer',LOG_INFO, ':Report %s successfully send using %s'%(params['name'],database))
+            self.win.endExecute()
+        else:
+            ErrorDialog("Either Report Name or Technical Name is blank !!!\nPlease specify appropriate Name","","Blank Field ERROR")
+            self.logobj.log_write('SendToServer',LOG_WARNING, ':Either Report Name or Technical Name is blank')
+            self.win.endExecute()
+
+    def getID(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        params = {
+            'name': self.win.getEditText("txtName"),
+            'model': docinfo.getUserFieldValue(3),
+            'report_name': self.win.getEditText('txtReportName')
+        }
+
+
+        id=self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' ,'create', params)
+        return id
+
+    def getInverseFieldsRecord(self,nVal):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        count=0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.SelectedItem = oPar.Items[nVal]
+                if nVal==0:
+                    oPar.update()
+
+if __name__<>"package" and __name__=="__main__":
+    SendtoServer(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( SendtoServer, "org.openoffice.openerp.report.sendtoserver", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
new file mode 100644
index 00000000000..659357ef100
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -0,0 +1,208 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from Change import *
+    database="test"
+
+class ServerParameter( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        desktop=getDesktop()
+        log_detail(self)
+        self.logobj=Logger()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter")
+
+        self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL")
+        if docinfo.getUserFieldValue(0)=="":
+            docinfo.setUserFieldValue(0,"http://localhost:8069")
+        self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0))
+        self.win.addButton('btnChange',-2 ,9,30,15,'Change', actionListenerProc = self.btnChange_clicked )
+
+        self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database")
+        #self.win.addFixedText("lblMsg", -2,28,123,15)
+#        self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+#        self.lstDatabase = self.win.getControl( "lstDatabase" )
+        #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True )
+        #self.win.setEnabled("lblMsg",False)
+
+        self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login")
+        self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1))
+
+        self.win.addFixedText("lblPassword", 6, 70, 31, 15, "Password")
+        self.win.addEdit("txtPassword",-2,67,123,15,)
+        self.win.setEchoChar("txtPassword",42)
+
+
+        self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect' ,actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        sValue=""
+        if docinfo.getUserFieldValue(0)<>"":
+            global url
+            global result
+            url=docinfo.getUserFieldValue(0)
+            self.sock=RPCSession(url)
+            res=self.sock.listdb()
+            result=res
+            if res == -1:
+                self.win.addEdit("lstDatabase",-2,28,123,15)
+#                sValue="Could not connect to the server!"
+#                self.lstDatabase.addItem("Could not connect to the server!",0)
+            elif res == 0:
+                sValue="No Database found !!!"
+                self.lstDatabase.addItem("No Database found !!!",0)
+            else:
+                self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+                self.lstDatabase = self.win.getControl( "lstDatabase" )
+                self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+                for i in range(len(res)):
+                    self.lstDatabase.addItem(res[i],i)
+                sValue = database
+        if sValue:
+            self.win.doModalDialog("lstDatabase",sValue)
+        else:
+            self.win.doModalDialog("lstDatabase",None)
+
+        #self.win.doModalDialog("lstDatabase",docinfo.getUserFieldValue(2))
+
+    def btnOk_clicked(self,oActionEvent):
+
+
+        sLogin=self.win.getEditText("txtLoginName")
+        sPassword=self.win.getEditText("txtPassword")
+        global url
+        global result
+        if result==-1:
+            sDatabase=self.win.getEditText("lstDatabase")
+        else:
+            sDatabase=self.win.getListBoxSelectedItem("lstDatabase")
+        self.sock=RPCSession(url)
+        UID = self.sock.login(sDatabase,sLogin,sPassword)
+        if not UID :
+            ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
+            self.win.endExecute()
+        try:
+
+            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
+            ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
+        except :
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+
+        if not len(ids) :
+            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
+            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
+            self.win.endExecute()
+        if not len(ids_module):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
+            self.win.endExecute()
+
+        if UID not in dict_groups[0]['users']:
+            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
+            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
+            self.win.endExecute()
+        else:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            docinfo.setUserFieldValue(0,self.win.getEditText("txtHost"))
+            docinfo.setUserFieldValue(1,self.win.getEditText("txtLoginName"))
+            global passwd
+            passwd=self.win.getEditText("txtPassword")
+            global loginstatus
+            loginstatus=True
+            global database
+            database=sDatabase
+            global uid
+            uid=UID
+            #docinfo.setUserFieldValue(2,self.win.getListBoxSelectedItem("lstDatabase"))
+            #docinfo.setUserFieldValue(3,"")
+
+            ErrorDialog(" You can start creating your report in \n  \t the current document.","After Creating  sending to the server.","Message")
+            self.logobj.log_write('successful login',LOG_INFO, ':successful login from %s  using database %s' % (sLogin, sDatabase))
+            self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnChange_clicked(self,oActionEvent):
+        aVal=[]
+        url= self.win.getEditText("txtHost")
+        Change(aVal,url)
+        if aVal[1]== -1:
+           self.win.getEditText("lstDatabase")
+        elif aVal[1]==0:
+            ErrorDialog(aVal[0],"")
+        else:
+            self.win.setEditText("txtHost",aVal[0])
+            self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+            for i in range(len(aVal[1])):
+                self.lstDatabase.addItem(aVal[1][i],i)
+
+
+if __name__<>"package" and __name__=="__main__":
+    ServerParameter(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
new file mode 100644
index 00000000000..e1df582c1e5
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -0,0 +1,274 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.rpc import *
+    database="test_001"
+    uid = 3
+
+
+class AddLang(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        global passwd
+        self.password = passwd
+        self.win = DBModalDialog(60, 50, 180, 225, "Set Lang Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True,
+                            itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 120, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5, 45, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+        global url
+        self.sock=RPCSession(url)
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text=cursor.getText()
+            tcur=text.createTextCursorByRange(cursor)
+
+	    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+		anItem = self.aItemList[i][1]
+		component = self.aComponentAdd[i]
+
+                if component == "Document":
+		    sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+		    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextSection:
+                    getRecersiveSection(tcur.TextSection,self.aSectionList)
+                    if component in self.aSectionList:
+			sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+			self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextTable:
+		    if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                        VariableScope(tcur,self.insVariable,self.aObjectList,self.aComponentAdd,self.aItemList,component)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+		for anObject in self.aObjectList:
+		    if anObject[:anObject.find("(")] == sVariable:
+			sItem = anObject
+			self.insVariable.setText( sItem )
+		genTree(sItem[sItem.find("(")+1:sItem.find(")")],self.aListFields, self.insField,self.sMyHost,2,ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+
+            for var in self.aVariableList:
+
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+			self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            t=sMain.rfind('/lang')
+            if t!=-1:
+		sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+                ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+                res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+		self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+            else:
+                 ErrorDialog("Please select the Language Field")
+
+        except:
+            import traceback;traceback.print_exc()
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+		    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+		genTree(
+		    sItem[ sItem.find("(") + 1:sItem.find(")")],
+		    self.aListFields,
+		    self.insField,
+		    self.sMyHost,
+		    2,
+		    ending_excl=['one2many','many2one','many2many','reference'],
+		    recur=['many2one']
+		)
+
+            except:
+                import traceback;traceback.print_exc()
+
+    def btnOk_clicked( self, oActionEvent ):
+        self.bOkay = True
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+
+        itemSelected = self.win.getListBoxSelectedItem( "lstFields" )
+        itemSelectedPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtUName = self.win.getEditText("txtUName")
+        sKey=u""+ txtUName
+
+        if itemSelected != "" and txtUName != "" and self.bModify==True :
+            oCurObj=cursor.TextField
+            sObjName=self.insVariable.getText()
+            sObjName=sObjName[:sObjName.find("(")]
+            sValue=u"[[ setLang" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + ")" " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        elif itemSelected != "" and txtUName != "" :
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            sObjName=self.win.getComboBoxText("cmbVariable")
+            sObjName=sObjName[:sObjName.find("(")]
+
+            widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+            sValue = u"[[setLang" + "(" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") +")" " ]]"
+            oInputList.Items = (sKey,sValue)
+            widget.insertTextContent(cursor,oInputList,False)
+
+            self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddLang()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddLang, "org.openoffice.openerp.report.langtag", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
new file mode 100644
index 00000000000..af5e28965ce
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -0,0 +1,61 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import Expression
+import lib
+import Fields
+import modify
+import Repeatln
+import ServerParameter
+import NewReport
+import LoginTest
+import Change
+import About
+import AddAttachment
+import ConvertBracesToField
+import ConvertFieldsToBraces
+import ExportToRML
+import SendtoServer
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
new file mode 100644
index 00000000000..5a95c61ecae
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -0,0 +1,49 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import compileall
+
+compileall.compile_dir('package')
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/import b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/import
new file mode 100644
index 00000000000..e14c925b619
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/import
@@ -0,0 +1,2 @@
+__name__="package"
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
new file mode 100644
index 00000000000..b67392208fe
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import actions
+import error
+import functions
+import gui
+import logreport
+import rpc
+import tiny_socket
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
new file mode 100644
index 00000000000..8faec4cb5aa
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -0,0 +1,111 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import unohelper
+import os
+#--------------------------------------------------
+# An ActionListener adapter.
+# This object implements com.sun.star.awt.XActionListener.
+# When actionPerformed is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oActionEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+if __name__<>"package":
+    os.system( "ooffice '-accept=socket,host=localhost,port=2002;urp;'" )
+passwd=""
+database=""
+uid=""
+loginstatus=False
+from com.sun.star.awt import XActionListener
+class ActionListenerProcAdapter( unohelper.Base, XActionListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oActionEvent is a com.sun.star.awt.ActionEvent struct.
+    def actionPerformed( self, oActionEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oActionEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An ItemListener adapter.
+# This object implements com.sun.star.awt.XItemListener.
+# When itemStateChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oItemEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XItemListener
+class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oItemEvent is a com.sun.star.awt.ItemEvent struct.
+    def itemStateChanged( self, oItemEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oItemEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An TextListener adapter.
+# This object implements com.sun.star.awt.XTextistener.
+# When textChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oTextEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XTextListener
+class TextListenerProcAdapter( unohelper.Base, XTextListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oTextEvent is a com.sun.star.awt.TextEvent struct.
+    def textChanged( self, oTextEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oTextEvent,) + self.tParams )
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
new file mode 100644
index 00000000000..bb51a35caf1
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -0,0 +1,60 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+if __name__<>"package":
+    from gui import *
+class ErrorDialog:
+    def __init__(self,sErrorMsg, sErrorHelpMsg="",sTitle="Error Message"):
+        self.win = DBModalDialog(50, 50, 150, 90, sTitle)
+        self.win.addFixedText("lblErrMsg", 5, 5, 190, 25, sErrorMsg)
+        self.win.addFixedText("lblErrHelpMsg", 5, 30, 190, 25, sErrorHelpMsg)
+        self.win.addButton('btnOK', 55,-5,40,15,'Ok'
+                     ,actionListenerProc = self.btnOkOrCancel_clicked )
+        self.win.doModalDialog("",None)
+    def btnOkOrCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
new file mode 100644
index 00000000000..2f5f5186828
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -0,0 +1,264 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import xmlrpclib
+import re
+import socket
+import cPickle
+import marshal
+import tempfile
+if __name__<>"package":
+    from gui import *
+    from logreport import *
+    from rpc import *
+    database="test"
+    uid = 1
+
+def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur=[], root='', actualroot=""):
+    try:
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, object , 'fields_get')
+        key = res.keys()
+        key.sort()
+        for k in key:
+            if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+                insField.addItem(root+'/'+res[k]["string"],len(aList))
+                aList.append(actualroot+'/'+k)
+            if (res[k]['type'] in recur) and (level>0):
+                genTree(res[k]['relation'],aList,insField,host ,level-1, ending, ending_excl, recur,root+'/'+res[k]["string"],actualroot+'/'+k)
+    except:
+        obj=Logger()
+        import traceback,sys
+        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        obj.log_write('Function', LOG_ERROR, info)
+
+def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableName=""):
+    if sTableName.find(".") != -1:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal:
+                        insVariable.append(aObjectList[j])
+	VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList, sTableName[:sTableName.rfind(".")])
+    else:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal and sLVal!="":
+                        insVariable.append(aObjectList[j])
+
+def getList(aObjectList,host,count):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    docinfo=doc.getDocumentInfo()
+    sMain=""
+    if not count == 0:
+        if count >= 1:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    sItem=oPar.Items[1]
+                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                        sMain = sItem[sItem.find(",'")+2:sItem.find("')")]
+                        oParEnum = doc.getTextFields().createEnumeration()
+                        while oParEnum.hasMoreElements():
+                            oPar = oParEnum.nextElement()
+                            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                                sItem=oPar.Items[1]
+                                if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                                        aObjectList.append(sItem[sItem.rfind(",'")+2:sItem.rfind("')")] + "(" + docinfo.getUserFieldValue(3) + ")")
+                                    else:
+                                        sTemp=sItem[sItem.find("(")+1:sItem.find(",")]
+                                        if sMain == sTemp[:sTemp.find(".")]:
+                                            getRelation(docinfo.getUserFieldValue(3), sItem[sItem.find(".")+1:sItem.find(",")], sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+                                        else:
+                                            sPath=getPath(sItem[sItem.find("(")+1:sItem.find(",")], sMain)
+                                            getRelation(docinfo.getUserFieldValue(3), sPath, sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+    else:
+        aObjectList.append("List of " + docinfo.getUserFieldValue(3))
+
+def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, sRelName , 'fields_get')
+        key = res.keys()
+        for k in key:
+            if sItem.find(".") == -1:
+                if k == sItem:
+                    aObjectList.append(sObjName + "(" + res[k]['relation'] + ")")
+                    return 0
+	    if k == sItem[:sItem.find(".")]:
+		getRelation(res[k]['relation'], sItem[sItem.find(".")+1:], sObjName,aObjectList,host)
+
+
+def getPath(sPath,sMain):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    oParEnum = doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+            sItem=oPar.Items[1]
+	    if sPath[:sPath.find(".")] == sMain:
+                break;
+            else:
+                res = re.findall('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]',sPath)
+                if len(res) <> 0:
+		    if sItem[sItem.find(",'")+2:sItem.find("')")] == sPath[:sPath.find(".")]:
+			sPath =  sItem[sItem.find("(")+1:sItem.find(",")] + sPath[sPath.find("."):]
+                        getPath(sPath, sMain)
+    return sPath
+
+def EnumDocument(aItemList,aComponentAdd):
+    desktop = getDesktop()
+    parent=""
+    bFlag = False
+    Doc =desktop.getCurrentComponent()
+    #oVC = Doc.CurrentController.getViewCursor()
+    oParEnum = Doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.Anchor.TextTable:
+            #parent = oPar.Anchor.TextTable.Name
+            getChildTable(oPar.Anchor.TextTable,aItemList,aComponentAdd)
+        elif oPar.Anchor.TextSection:
+            parent = oPar.Anchor.TextSection.Name
+        elif oPar.Anchor.Text:
+            parent = "Document"
+        sItem=oPar.Items[1].replace(' ',"")
+        if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn" and not oPar.Items in aItemList:
+            templist=oPar.Items[0],sItem
+            aItemList.append( templist )
+        aComponentAdd.append( parent )
+
+def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
+    sNames = oPar.getCellNames()
+    bEmptyTableFlag=True
+    for val in sNames:
+        oCell = oPar.getCellByName(val)
+        oCurEnum = oCell.createEnumeration()
+        while oCurEnum.hasMoreElements():
+            try:
+                oCur = oCurEnum.nextElement()
+
+                if oCur.supportsService("com.sun.star.text.TextTable"):
+                    if sTableName=="":
+                        getChildTable(oCur,aItemList,aComponentAdd,oPar.Name)
+                    else:
+                        getChildTable(oCur,aItemList,aComponentAdd,sTableName+"."+oPar.Name)
+                else:
+                    oSecEnum = oCur.createEnumeration()
+                    while oSecEnum.hasMoreElements():
+                        oSubSection = oSecEnum.nextElement()
+                        if oSubSection.supportsService("com.sun.star.text.TextField"):
+                            bEmptyTableFlag=False
+                            sItem=oSubSection.TextField.Items[1]
+                            if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                if aItemList.__contains__(oSubSection.TextField.Items)==False:
+                                    aItemList.append(oSubSection.TextField.Items)
+                                if sTableName=="":
+                                    if  aComponentAdd.__contains__(oPar.Name)==False:
+                                        aComponentAdd.append(oPar.Name)
+                                else:
+                                    if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                                        aComponentAdd.append(sTableName+"."+oPar.Name)
+            except:
+                obj=Logger()
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                obj.log_write('Function', LOG_ERROR, info)
+    if bEmptyTableFlag==True:
+        aItemList.append((u'',u''))
+        if sTableName=="":
+            if  aComponentAdd.__contains__(oPar.Name)==False:
+                aComponentAdd.append(oPar.Name)
+        else:
+            if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                aComponentAdd.append(sTableName+"."+oPar.Name)
+    return 0
+
+def getRecersiveSection(oCurrentSection,aSectionList):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        oParEnum=doc.getText().createEnumeration()
+        aSectionList.append(oCurrentSection.Name)
+        if oCurrentSection.ParentSection:
+            getRecersiveSection(oCurrentSection.ParentSection,aSectionList)
+        else:
+            return
+
+def GetAFileName():
+    oFileDialog=None
+    iAccept=None
+    sPath=""
+    InitPath=""
+    oUcb=None
+    oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+    oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+    oFileDialog.appendFilter("OpenERP Report File","*.sxw")
+    oFileDialog.setCurrentFilter("OpenERP Report File")
+    if InitPath == "":
+        InitPath =tempfile.gettempdir()
+    #End If
+    if oUcb.exists(InitPath):
+        oFileDialog.setDisplayDirectory(InitPath)
+    #End If
+    iAccept = oFileDialog.execute()
+    if iAccept == 1:
+        sPath = oFileDialog.Files[0]
+    oFileDialog.dispose()
+    return sPath
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
new file mode 100644
index 00000000000..4210f2afe1e
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -0,0 +1,822 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import unohelper
+import pythonloader
+if __name__<>"package":
+    from actions import *
+
+
+#------------------------------------------------------------
+#   Uno ServiceManager access
+#   A different version of this routine and global variable
+#    is needed for code running inside a component.
+#------------------------------------------------------------
+
+
+# The ServiceManager of the running OOo.
+# It is cached in a global variable.
+goServiceManager = False
+pythonloader.DEBUG = 0
+def getServiceManager( cHost="localhost", cPort="2002" ):
+    """Get the ServiceManager from the running OpenOffice.org.
+        Then retain it in the global variable goServiceManager for future use.
+        This is similar to the GetProcessServiceManager() in OOo Basic.
+    """
+    global goServiceManager
+    global pythonloader
+    if not goServiceManager:
+        # Get the uno component context from the PyUNO runtime
+        oLocalContext = uno.getComponentContext()
+        # Create the UnoUrlResolver on the Python side.
+
+        # Connect to the running OpenOffice.org and get its context.
+        if __name__<>"package":
+            oLocalResolver = oLocalContext.ServiceManager.createInstanceWithContext(
+                                    "com.sun.star.bridge.UnoUrlResolver", oLocalContext )
+            oContext = oLocalResolver.resolve( "uno:socket,host=" + cHost + ",port=" + cPort + ";urp;StarOffice.ComponentContext" )
+        # Get the ServiceManager object
+            goServiceManager = oContext.ServiceManager
+        else:
+            goServiceManager=oLocalContext.ServiceManager
+
+    return goServiceManager
+
+
+#------------------------------------------------------------
+#   Uno convenience functions
+#   The stuff in this section is just to make
+#    python progrmaming of OOo more like using OOo Basic.
+#------------------------------------------------------------
+
+
+# This is the same as ServiceManager.createInstance( ... )
+def createUnoService( cClass ):
+    """A handy way to create a global objects within the running OOo.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oServiceManager = getServiceManager()
+    oObj = oServiceManager.createInstance( cClass )
+    return oObj
+
+
+# The StarDesktop object.  (global like in OOo Basic)
+# It is cached in a global variable.
+StarDesktop = None
+def getDesktop():
+    """An easy way to obtain the Desktop object from a running OOo.
+    """
+    global StarDesktop
+    if StarDesktop == None:
+        StarDesktop = createUnoService( "com.sun.star.frame.Desktop" )
+    return StarDesktop
+# preload the StarDesktop variable.
+#getDesktop()
+
+
+# The CoreReflection object.
+# It is cached in a global variable.
+goCoreReflection = False
+def getCoreReflection():
+    global goCoreReflection
+    if not goCoreReflection:
+        goCoreReflection = createUnoService( "com.sun.star.reflection.CoreReflection" )
+    return goCoreReflection
+
+
+def createUnoStruct( cTypeName ):
+    """Create a UNO struct and return it.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oCoreReflection = getCoreReflection()
+    # Get the IDL class for the type name
+    oXIdlClass = oCoreReflection.forName( cTypeName )
+    # Create the struct.
+    oReturnValue, oStruct = oXIdlClass.createObject( None )
+    return oStruct
+
+#------------------------------------------------------------
+#   API helpers
+#------------------------------------------------------------
+
+def hasUnoInterface( oObject, cInterfaceName ):
+    """Similar to Basic's HasUnoInterfaces() function, but singular not plural."""
+
+    # Get the Introspection service.
+    oIntrospection = createUnoService( "com.sun.star.beans.Introspection" )
+
+    # Now inspect the object to learn about it.
+    oObjInfo = oIntrospection.inspect( oObject )
+
+    # Obtain an array describing all methods of the object.
+    oMethods = oObjInfo.getMethods( uno.getConstantByName( "com.sun.star.beans.MethodConcept.ALL" ) )
+    # Now look at every method.
+    for oMethod in oMethods:
+        # Check the method's interface to see if
+        #  these aren't the droids you're looking for.
+        cMethodInterfaceName = oMethod.getDeclaringClass().getName()
+        if cMethodInterfaceName == cInterfaceName:
+            return True
+    return False
+
+def hasUnoInterfaces( oObject, *cInterfaces ):
+    """Similar to the function of the same name in OOo Basic."""
+    for cInterface in cInterfaces:
+        if not hasUnoInterface( oObject, cInterface ):
+            return False
+    return True
+
+#------------------------------------------------------------
+#   High level general purpose functions
+#------------------------------------------------------------
+
+
+def makePropertyValue( cName=None, uValue=None, nHandle=None, nState=None ):
+    """Create a com.sun.star.beans.PropertyValue struct and return it.
+    """
+    oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+
+    if cName != None:
+        oPropertyValue.Name = cName
+    if uValue != None:
+        oPropertyValue.Value = uValue
+    if nHandle != None:
+        oPropertyValue.Handle = nHandle
+    if nState != None:
+        oPropertyValue.State = nState
+
+    return oPropertyValue
+
+
+def makePoint( nX, nY ):
+    """Create a com.sun.star.awt.Point struct."""
+    oPoint = createUnoStruct( "com.sun.star.awt.Point" )
+    oPoint.X = nX
+    oPoint.Y = nY
+    return oPoint
+
+
+def makeSize( nWidth, nHeight ):
+    """Create a com.sun.star.awt.Size struct."""
+    oSize = createUnoStruct( "com.sun.star.awt.Size" )
+    oSize.Width = nWidth
+    oSize.Height = nHeight
+    return oSize
+
+
+def makeRectangle( nX, nY, nWidth, nHeight ):
+    """Create a com.sun.star.awt.Rectangle struct."""
+    oRect = createUnoStruct( "com.sun.star.awt.Rectangle" )
+    oRect.X = nX
+    oRect.Y = nY
+    oRect.Width = nWidth
+    oRect.Height = nHeight
+    return oRect
+
+
+def Array( *args ):
+    """This is just sugar coating so that code from OOoBasic which
+    contains the Array() function can work perfectly in python."""
+    tArray = ()
+    for arg in args:
+        tArray += (arg,)
+    return tArray
+
+
+def loadComponentFromURL( cUrl, tProperties=() ):
+    """Open or Create a document from it's URL.
+    New documents are created from URL's such as:
+        private:factory/sdraw
+        private:factory/swriter
+        private:factory/scalc
+        private:factory/simpress
+    """
+    StarDesktop = getDesktop()
+    oDocument = StarDesktop.loadComponentFromURL( cUrl, "_blank", 0, tProperties )
+    return oDocument
+
+
+#------------------------------------------------------------
+#   Styles
+#------------------------------------------------------------
+
+
+def defineStyle( oDrawDoc, cStyleFamily, cStyleName, cParentStyleName=None ):
+    """Add a new style to the style catalog if it is not already present.
+    This returns the style object so that you can alter its properties.
+    """
+
+    oStyleFamily = oDrawDoc.getStyleFamilies().getByName( cStyleFamily )
+
+    # Does the style already exist?
+    if oStyleFamily.hasByName( cStyleName ):
+        # then get it so we can return it.
+        oStyle = oStyleFamily.getByName( cStyleName )
+    else:
+        # Create new style object.
+        oStyle = oDrawDoc.createInstance( "com.sun.star.style.Style" )
+
+        # Set its parent style
+        if cParentStyleName != None:
+            oStyle.setParentStyle( cParentStyleName )
+
+        # Add the new style to the style family.
+        oStyleFamily.insertByName( cStyleName, oStyle )
+
+    return oStyle
+
+
+def getStyle( oDrawDoc, cStyleFamily, cStyleName ):
+    """Lookup and return a style from the document.
+    """
+    return oDrawDoc.getStyleFamilies().getByName( cStyleFamily ).getByName( cStyleName )
+
+#------------------------------------------------------------
+#   General Utility functions
+#------------------------------------------------------------
+
+
+def convertToURL( cPathname ):
+    """Convert a Windows or Linux pathname into an OOo URL."""
+    if len( cPathname ) > 1:
+        if cPathname[1:2] == ":":
+            cPathname = "/" + cPathname[0] + "|" + cPathname[2:]
+    cPathname = cPathname.replace( "\\", "/" )
+    cPathname = "file://" + cPathname
+    return cPathname
+
+# The global Awt Toolkit.
+# This is initialized the first time it is needed.
+#goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+goAwtToolkit = None
+
+def getAwtToolkit():
+    global goAwtToolkit
+    if goAwtToolkit == None:
+        goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+    return goAwtToolkit
+
+# This class builds dialog boxes.
+# This can be used in two different ways...
+# 1. by subclassing it (elegant)
+# 2. without subclassing it (less elegant)
+class DBModalDialog:
+    """Class to build a dialog box from the com.sun.star.awt.* services.
+    This doesn't do anything you couldn't already do using OOo's UNO API,
+     this just makes it much easier.
+    You can change the dialog box size, position, title, etc.
+    You can add controls, and listeners for those controls to the dialog box.
+    This class can be used by subclassing it, or without subclassing it.
+    """
+    def __init__( self, nPositionX=None, nPositionY=None, nWidth=None, nHeight=None, cTitle=None ):
+        self.oDialogModel = createUnoService( "com.sun.star.awt.UnoControlDialogModel" )
+        if nPositionX != None:  self.oDialogModel.PositionX = nPositionX
+        if nPositionY != None:  self.oDialogModel.PositionY = nPositionY
+        if nWidth     != None:  self.oDialogModel.Width     = nWidth
+        if nHeight    != None:  self.oDialogModel.Height    = nHeight
+        if cTitle     != None:  self.oDialogModel.Title     = cTitle
+        self.oDialogControl = createUnoService( "com.sun.star.awt.UnoControlDialog" )
+        self.oDialogControl.setModel( self.oDialogModel )
+
+    def release( self ):
+        """Release resources.
+        After calling this, you can no longer use this object.
+        """
+        self.oDialogControl.dispose()
+
+    #--------------------------------------------------
+    #   Dialog box adjustments
+    #--------------------------------------------------
+
+    def setDialogPosition( self, nX, nY ):
+        self.oDialogModel.PositionX = nX
+        self.oDialogModel.PositionY = nY
+
+    def setDialogSize( self, nWidth, nHeight ):
+        self.oDialogModel.Width = nWidth
+        self.oDialogModel.Height = nHeight
+
+    def setDialogTitle( self, cCaption ):
+        self.oDialogModel.Title = cCaption
+
+    def setVisible( self, bVisible ):
+        self.oDialogControl.setVisible( bVisible )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlButton
+    #--------------------------------------------------
+
+    # After you add a Button control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlButtonModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addButton( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       actionListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlButtonModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+    def setButtonLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlEditModel
+    #--------------------------------------------------
+    def addEdit( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cText=None,
+                        textListenerProc=None ):
+        """Add a Edit control to the window."""
+        self.addControl( "com.sun.star.awt.UnoControlEditModel",
+            cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None)
+
+        if cText != None:
+            self.setEditText( cCtrlName, cText )
+        if textListenerProc != None:
+            self.addTextListenerProc( cCtrlName, textListenerProc )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlCheckBox
+    #--------------------------------------------------
+
+    # After you add a CheckBox control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlCheckBoxModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addCheckBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       itemListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlCheckBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None,  bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def setEditText( self, cCtrlName, cText ):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getEditText( self, cCtrlName):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def setCheckBoxLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    def getCheckBoxState( self, cCtrlName ):
+        """Get the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getState();
+
+    def setCheckBoxState( self, cCtrlName, nState ):
+        """Set the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setState( nState )
+
+    def enableCheckBoxTriState( self, cCtrlName, bTriStateEnable ):
+        """Enable or disable the tri state mode of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.enableTriState( bTriStateEnable )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlFixedText
+    #--------------------------------------------------
+
+    def addFixedText( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cLabel=None ):
+        self.addControl( "com.sun.star.awt.UnoControlFixedTextModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                         bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel )
+
+        return self.getControl( cCtrlName )
+
+    #--------------------------------------------------
+    #   Add Controls to dialog
+    #--------------------------------------------------
+
+    def addControl( self, cCtrlServiceName,
+                        cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=None,
+                        bMultiSelection=None,
+                        cLabel=None,
+                        nTabIndex=None,
+                        sImagePath=None,
+                         ):
+        oControlModel = self.oDialogModel.createInstance( cCtrlServiceName )
+        self.oDialogModel.insertByName( cCtrlName, oControlModel )
+        # if negative coordinates are given for X or Y position,
+        #  then make that coordinate be relative to the right/bottom
+        #  edge of the dialog box instead of to the left/top.
+        if nPositionX < 0: nPositionX = self.oDialogModel.Width  + nPositionX - nWidth
+        if nPositionY < 0: nPositionY = self.oDialogModel.Height + nPositionY - nHeight
+        oControlModel.PositionX = nPositionX
+        oControlModel.PositionY = nPositionY
+        oControlModel.Width = nWidth
+        oControlModel.Height = nHeight
+        oControlModel.Name = cCtrlName
+
+        if bDropdown != None:
+            oControlModel.Dropdown = bDropdown
+
+        if bMultiSelection!=None:
+            oControlModel.MultiSelection=bMultiSelection
+
+        if cLabel != None:
+            oControlModel.Label = cLabel
+
+        if nTabIndex != None:
+            oControlModel.TabIndex = nTabIndex
+
+        if sImagePath != None:
+            oControlModel.ImageURL = sImagePath
+    #--------------------------------------------------
+    #   Access controls and control models
+    #--------------------------------------------------
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoContorlListBoxModel
+    #--------------------------------------------------
+
+
+    def addComboListBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        bMultiSelection=False,
+                        itemListenerProc=None,
+                        actionListenerProc=None,
+                        ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlListBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown,bMultiSelection )
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def addListBoxItems( self, cCtrlName, tcItemTexts, nPosition=0 ):
+        """Add a tupple of items to the ListBox at specified position."""
+        oControl = self.getControl( cCtrlName )
+        oControl.addItems( tcItemTexts, nPosition )
+
+    def selectListBoxItem( self, cCtrlName, cItemText, bSelect=True ):
+        """Selects/Deselects the ispecified item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItem( cItemText, bSelect )
+
+    def selectListBoxItemPos( self, cCtrlName, nItemPos, bSelect=True ):
+        """Select/Deselect the item at the specified position."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItemPos( nItemPos, bSelect )
+
+    def removeListBoxItems( self, cCtrlName, nPosition, nCount=1 ):
+        """Remove items from a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.removeItems( nPosition, nCount )
+
+    def getListBoxItemCount( self, cCtrlName ):
+        """Get the number of items in a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItemCount()
+
+    def getListBoxSelectedItem( self, cCtrlName ):
+        """Returns the currently selected item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItem()
+
+    def getListBoxItem( self, cCtrlName, nPosition ):
+        """Return the item at specified position within the ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItem( nPosition )
+
+    def getListBoxSelectedItemPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemPos()
+
+    def getListBoxSelectedItems(self,cCtrlName):
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItems()
+
+    def getListBoxSelectedItemsPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemsPos()
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlComboBoxModel
+    #--------------------------------------------------
+    def addComboBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlComboBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown)
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    def setComboBoxText( self, cCtrlName, cText ):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getComboBoxText( self, cCtrlName):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def getComboBoxSelectedText( self, cCtrlName ):
+        """Get the selected text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedText();
+
+    def getControl( self, cCtrlName ):
+        """Get the control (not its model) for a particular control name.
+        The control returned includes the service com.sun.star.awt.UnoControl,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.oDialogControl.getControl( cCtrlName )
+        return oControl
+
+    def getControlModel( self, cCtrlName ):
+        """Get the control model (not the control) for a particular control name.
+        The model returned includes the service UnoControlModel,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.getControl( cCtrlName )
+        oControlModel = oControl.getModel()
+        return oControlModel
+    #---------------------------------------------------
+    #    com.sun.star.awt.UnoControlImageControlModel
+    #---------------------------------------------------
+    def addImageControl( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        sImagePath="",
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlImageControlModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, sImagePath=sImagePath)
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    #--------------------------------------------------
+    #   Adjust properties of control models
+    #--------------------------------------------------
+
+    def setControlModelProperty( self, cCtrlName, cPropertyName, uValue ):
+        """Set the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        oControlModel.setPropertyValue( cPropertyName, uValue )
+
+    def getControlModelProperty( self, cCtrlName, cPropertyName ):
+        """Get the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        return oControlModel.getPropertyValue( cPropertyName )
+
+    #--------------------------------------------------
+    #   Sugar coated property adjustments to control models.
+    #--------------------------------------------------
+
+    def setEnabled( self, cCtrlName, bEnabled=True ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Enabled", bEnabled )
+
+    def getEnabled( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+
+        return self.getControlModelProperty( cCtrlName, "Enabled" )
+
+    def setState( self, cCtrlName, nState ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "State", nState )
+
+    def getState( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "State" )
+
+    def setLabel( self, cCtrlName, cLabel ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Label", cLabel )
+
+    def getLabel( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "Label" )
+
+    def setHelpText( self, cCtrlName, cHelpText ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "HelpText", cHelpText )
+
+    def getHelpText( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "HelpText" )
+
+
+    #--------------------------------------------------
+    #   Adjust controls (not models)
+    #--------------------------------------------------
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControl
+
+    def setDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        oControl.setDesignMode( bDesignMode )
+
+    def isDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isDesignMode()
+
+    def isTransparent( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isTransparent()
+
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControlDialogElement
+
+    def setPosition( self, cCtrlName, nPositionX, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def setPositionX( self, cCtrlName, nPositionX ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+    def setPositionY( self, cCtrlName, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def getPositionX( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionX" )
+    def getPositionY( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionY" )
+
+    def setSize( self, cCtrlName, nWidth, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def setWidth( self, cCtrlName, nWidth ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+    def setHeight( self, cCtrlName, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def getWidth( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Width" )
+    def getHeight( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Height" )
+
+    def setTabIndex( self, cCtrlName, nWidth, nTabIndex ):
+        self.setControlModelProperty( cCtrlName, "TabIndex", nTabIndex )
+    def getTabIndex( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "TabIndex" )
+
+    def setStep( self, cCtrlName, nWidth, nStep ):
+        self.setControlModelProperty( cCtrlName, "Step", nStep )
+    def getStep( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Step" )
+
+    def setTag( self, cCtrlName, nWidth, cTag ):
+        self.setControlModelProperty( cCtrlName, "Tag", cTag )
+    def getTag( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Tag" )
+
+    def setEchoChar(self, cCtrlName , cVal):
+        self.setControlModelProperty(cCtrlName, "EchoChar", cVal)
+    def getEchoChar(self, cCtrlName):
+        return self.setControlModelProperty(cCtrlName, "EchoChar")
+
+    #--------------------------------------------------
+    #   Add listeners to controls.
+    #--------------------------------------------------
+
+    # This applies to...
+    #   UnoControlButton
+    def addActionListenerProc( self, cCtrlName, actionListenerProc ):
+        """Create an com.sun.star.awt.XActionListener object and add it to a control.
+        A listener object is created which will call the python procedure actionListenerProc.
+        The actionListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlButton
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ActionListenerProcAdapter( actionListenerProc )
+        oControl.addActionListener( oActionListener )
+
+    # This applies to...
+    #   UnoControlCheckBox
+    def addItemListenerProc( self, cCtrlName, itemListenerProc ):
+        """Create an com.sun.star.awt.XItemListener object and add it to a control.
+        A listener object is created which will call the python procedure itemListenerProc.
+        The itemListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlCheckBox
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ItemListenerProcAdapter( itemListenerProc )
+        oControl.addItemListener( oActionListener )
+
+    #--------------------------------------------------
+    #   Display the modal dialog.
+    #--------------------------------------------------
+
+    def doModalDialog( self, sObjName,sValue):
+        """Display the dialog as a modal dialog."""
+        self.oDialogControl.setVisible( True )
+        if not sValue==None:
+            self.selectListBoxItem( sObjName, sValue, True )
+        self.oDialogControl.execute()
+
+    def endExecute( self ):
+        """Call this from within one of the listeners to end the modal dialog.
+        For instance, the listener on your OK or Cancel button would call this to end the dialog.
+        """
+        self.oDialogControl.endExecute()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
new file mode 100644
index 00000000000..0e47ab627fb
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+import tempfile
+LOG_DEBUG='debug'
+LOG_INFO='info'
+LOG_WARNING='warn'
+LOG_ERROR='error'
+LOG_CRITICAL='critical'
+
+def log_detail(self):
+    import os
+    logger = logging.getLogger()
+    logfile_name = os.path.join(tempfile.gettempdir(), "openerp_report_designer.log")
+    hdlr = logging.FileHandler(logfile_name)
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    hdlr.setFormatter(formatter)
+    logger.addHandler(hdlr)
+    logger.setLevel(logging.INFO)
+
+class Logger(object):
+    def log_write(self,name,level,msg):
+        log = logging.getLogger(name)
+        getattr(log,level)(msg)
+
+    def shutdown(self):
+        logging.shutdown()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
new file mode 100644
index 00000000000..446d00094b4
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
@@ -0,0 +1,204 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+import socket
+import xmlrpclib
+#import tiny_socket
+import re
+
+class RPCGateway(object):
+    def __init__(self, host, port, protocol):
+
+        self.protocol = protocol
+        self.host = host
+        self.port = port
+
+    def get_url(self):
+
+        """Get the url
+        """
+        return "%s://%s:%s/"%(self.protocol, self.host, self.port)
+
+    def listdb(self):
+        """Get the list of databases.
+        """
+        pass
+
+    def login(self, db, user, password):
+        pass
+
+    def execute(self, obj, method, *args):
+        pass
+
+
+
+class RPCSession(object):
+    def __init__(self,url):
+
+        m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+
+        host = m.group(2)
+        port = m.group(3)
+        protocol = m.group(1)
+        if not m:
+            return -1
+        if protocol == 'http://' or protocol == 'http://':
+            self.gateway = XMLRPCGateway(host, port, 'http')
+        elif protocol == 'socket://':
+
+            self.gateway = NETRPCGateway(host, port)
+
+    def listdb(self):
+        return self.gateway.listdb()
+
+    def login(self, db, user, password):
+
+        if password is None:
+            return -1
+
+        uid = self.gateway.login(db, user or '', password or '')
+
+        if uid <= 0:
+            return -1
+
+        self.uid = uid
+        self.db = db
+        self.password = password
+        self.open = True
+        return uid
+
+
+    def execute(self, obj, method, *args):
+        try:
+            result = self.gateway.execute(obj, method, *args)
+            return self.__convert(result)
+        except Exception,e:
+          import traceback,sys
+          info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+    def __convert(self, result):
+
+        if isinstance(result, basestring):
+            # try to convert into unicode string
+            try:
+                return ustr(result)
+            except Exception, e:
+                return result
+
+        elif isinstance(result, list):
+            return [self.__convert(val) for val in result]
+
+        elif isinstance(result, tuple):
+            return tuple([self.__convert(val) for val in result])
+
+        elif isinstance(result, dict):
+            newres = {}
+            for key, val in result.items():
+                newres[key] = self.__convert(val)
+
+            return newres
+
+        else:
+            return result
+
+class XMLRPCGateway(RPCGateway):
+    """XML-RPC implementation.
+    """
+    def __init__(self, host, port, protocol='http'):
+
+        super(XMLRPCGateway, self).__init__(host, port, protocol)
+        global rpc_url
+        rpc_url =  self.get_url() + 'xmlrpc/'
+
+    def listdb(self):
+        global rpc_url
+        sock = xmlrpclib.ServerProxy(rpc_url + 'db')
+        try:
+            return sock.list()
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'common')
+
+        try:
+            res = sock.login(db, user, password)
+        except Exception, e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            return -1
+
+        return res
+
+    def execute(self, sDatabase,UID,sPassword,obj, method, *args):
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'object')
+
+        return sock.execute(sDatabase,UID,sPassword, obj ,method,*args)
+
+
+
+class NETRPCGateway(RPCGateway):
+    def __init__(self, host, port):
+
+        super(NETRPCGateway, self).__init__(host, port, 'socket')
+
+    def listdb(self):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('db', 'list'))
+            res = sock.myreceive()
+            sock.disconnect()
+            return res
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+        sock =  mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('common', 'login', db, user, password))
+            res = sock.myreceive()
+            sock.disconnect()
+        except Exception, e:
+            return -1
+        return res
+    def execute(self,obj, method, *args):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            data=(('object', 'execute',obj,method,)+args)
+            sock.mysend(data)
+            res=sock.myreceive()
+            sock.disconnect()
+            return res
+
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
new file mode 100644
index 00000000000..38ed0073d68
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import socket
+import cPickle
+import cStringIO
+import marshal
+
+class Myexception(Exception):
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class mysocket:
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            protocol, buf = host.split('//')
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+    def mysend(self, msg, exception=False, traceback=None):
+
+        msg = cPickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = cStringIO.StringIO(msg)
+        unpickler = cPickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
new file mode 100644
index 00000000000..e5fa0d9f9e7
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import urllib
+
+def get_absolute_file_path( url ):
+	url_unquoted = urllib.unquote(url)
+	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
+
+# This function reads the content of a file and return it to the caller
+def read_data_from_file( filename ):
+	fp = file( filename, "rb" )
+	data = fp.read()
+	fp.close()
+	return data
+
+# This function writes the content to a file
+def write_data_to_file( filename, data ):
+	fp = file( filename, 'wb' )
+	fp.write( data )
+	fp.close()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
new file mode 100644
index 00000000000..730d5b3d33b
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -0,0 +1,138 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library 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 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import re
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from Expression import Expression
+    from Fields import Fields
+    from Repeatln import RepeatIn
+    from lib.error import *
+    database="test"
+    uid = 3
+
+class modify(unohelper.Base, XJobExecutor ):
+    def __init__( self, ctx ):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        # Variable Declaration
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        self.oVC = doc.CurrentController.getViewCursor()
+        if not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069"
+	    )
+            exit(1)
+
+        # Check weather Field-4 is available or not otherwise exit from application
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            if self.oVC.TextField:
+                self.oCurObj=self.oVC.TextField
+		item = self.oCurObj.Items[0]
+
+		kind, group1, group2 = self.getOperation(self.oCurObj.Items[1] )
+
+		start_group1 = group1[:group1.find(".")]
+		stop_group1 = group1[group1.find("."):].replace(".", "/")
+
+                if kind == "field":
+		    Fields( start_group1, stop_group1, item, True )
+                elif kind == "expression":
+                    Expression( group1, item, True )
+                elif kind == "repeatIn":
+		    RepeatIn( start_group1, group2, stop_group1, item, True )
+            else:
+                ErrorDialog(
+		    "Please place your cursor at begaining of field \n"
+		    "which you want to modify",""
+		)
+
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1 or Field-4",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069 \n"
+		"OR \n"
+		"Field-4 Eg. account.invoice"
+	    )
+            exit(1)
+
+    def getOperation(self, str):
+        #str = "[[ RepeatIn(objects, 'variable') ]]" #repeatIn
+        #str = "[[ saleorder.partner_id.name ]]" # field
+        #str = "[[ some thing complex ]]" # expression
+        method1 = lambda x: (u'repeatIn', x.group(1), x.group(2))
+        method2 = lambda x: (u'field', x.group(1), None)
+        method3 = lambda x: (u'expression', x.group(1), None)
+        regexes = [
+	    ('\\[\\[ *repeatIn\\( *(.+)*, *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', method1),
+	    ('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', method2),
+	    ('\\[\\[ *(.+) *\\]\\]', method3)
+        ]
+        for (rule,method) in regexes:
+	    res = re.match(rule, str)
+	    if res:
+		return method(res)
+
+if __name__<>"package":
+    modify(None)
+else:
+    g_ImplementationHelper.addImplementation( modify, "org.openoffice.openerp.report.modify", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/test/test.txt b/addons/base_report_designer/plugin/openerp_report_designer/test/test.txt
new file mode 100644
index 00000000000..2d054ca35dc
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/test/test.txt
@@ -0,0 +1,57 @@
+Test Case of OpenERP Report Desinger Plugin into OpenOffice Writer
+====================================================================
+1. Connecting to the OpenERP Server
+-> OpenERP server ok
+-> OpenERP server not running
+-> Warning if base_report_designer not installed.
+
+2. Creating Report
+-> List of objects in sorted order by name
+
+3. Existing Report
+-> Exception if open non modifiable report (no sxw)
+-> List of exisiting report in sorted order
+
+4. Fields to Brackets
+-> Find the data correctly.
+-> Data for things like [[ '%.2f' % o.amount ]] is completed.
+-> Test on normal Sale Order
+-> Test on normal Purchase Order
+
+5. Modifying report
+-> Adding field if no initial repeatIn
+-> Adding fields (demo data correct)
+-> Adding loop
+-> Adding field within a loop
+-> Adding loop in a section
+-> Adding loop in a table
+-> Adding a loop in a table within a loop in a section
+-> Adding fields within a loop within a loop
+-> check context correct or not
+
+6. Modifying a field
+-> modify a field.
+-> modify a loop.
+-> modify an expression corretly
+-> Display correct data in all these cases
+
+7. Sending Report
+-> send in .SXW if user forgot to save as sxw
+-> Select with/without header
+-> Select between sxw/pdf
+-> Save as .odt and send to the server (check it is converted to sxw or warning)
+
+8. Printing Report into OpenERP clients
+-> Print report 
+-> check images appears in report correctly or not.
+-> check report With or Without Header.
+-> check SXW working or not.
+-> check PDF working or not
+
+9. Print as SXW
+-> Check Send as attachment working or not and also check it is Attached to the right document.
+
+10. Miscelleanous
+-> check the translation tag working.
+-> Save to RML. 
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
new file mode 100644
index 00000000000..8afd773b3fb
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
@@ -0,0 +1,32 @@
+#
+# Use this module to retrive the fields you need according to the type
+# of the OpenOffice operation:
+#  * Insert a Field
+#  * Insert a RepeatIn
+#
+
+import xmlrpclib
+import time
+
+sock = xmlrpclib.ServerProxy('http://localhost:8069/xmlrpc/object')
+
+def get(object, level=3, ending=[], ending_excl=[], recur=[], root=''):
+	res = sock.execute('terp', 3, 'admin', 'account.invoice', 'fields_get')
+	key = res.keys()
+	key.sort()
+	for k in key:
+		if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+			print root+'/'+k
+
+		if res[k]['type'] in recur:
+			print root+'/'+k
+		if (res[k]['type'] in recur) and (level>0):
+			get(res[k]['relation'], level-1, ending, ending_excl, recur, root+'/'+k)
+
+print 'Field selection for a rields', '='*40
+get('account.invoice', level=0, ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+
+print
+print 'Field selection for a repeatIn', '='*40
+get('account.invoice', level=0, ending=['one2many','many2many'], recur=['many2one'])
+
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/security/base_report_security.xml
similarity index 100%
rename from addons/base_report_designer/base_report_data.xml
rename to addons/base_report_designer/security/base_report_security.xml
diff --git a/addons/base_report_designer/wizard/__init__.py b/addons/base_report_designer/wizard/__init__.py
index f80f87da1d5..d2b008e8c3a 100644
--- a/addons/base_report_designer/wizard/__init__.py
+++ b/addons/base_report_designer/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
new file mode 100644
index 00000000000..504f0ab2ba1
--- /dev/null
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+     
+        <record id="view_base_report_sxw" model="ir.ui.view">
+            <field name="name">Base Report sxw</field>
+            <field name="model">base.report.sxw</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Get a report">
+	            <separator string="Select your report" colspan="4"/>
+	            <field name="report_id"/>
+	             <separator string="" colspan="4"/>
+	               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
+            </form>
+            </field>
+       </record>
+
+        <record id="action_view_base_report_sxw" model="ir.actions.act_window">
+            <field name="name">Base Report sxw</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.report.sxw</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="view_base_report_file_sxw" model="ir.ui.view">
+            <field name="name">Base Report File sxw</field>
+            <field name="model">base.report.file.sxw</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Get a report">
+            <separator string="The .SXW report" colspan="4"/>
+            <field name="report_id"/>
+            <newline/>
+            <field name="file_sxw"/>
+            <newline/>
+            <field name="file_sxw_upload"/>
+            <newline/>
+            <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the OpenERP SA OpenOffice package to modify it.\nOnce it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
+              <separator string="" colspan="4"/>
+              <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+              <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward"/>
+
+            </form>
+            </field>
+       </record>
+        <record id="view_base_report_file_rml" model="ir.ui.view">
+            <field name="name">Base Report File sxw</field>
+            <field name="model">base.report.rml.save</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Save RML FIle">
+	            <separator string="The RML report" colspan="4"/>
+	            <field name="file_rml"/>
+	            <newline/>
+	             <separator string="" colspan="4"/>
+               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            </form>
+            </field>
+       </record>
+
+
+    </data>
+</openerp>
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 1af72086a24..e65a386a3f8 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -2,23 +2,23 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    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.
+#    it under the terms of the GNU 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.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import time
 import wizard
 import osv
@@ -27,246 +27,125 @@ import urllib
 import base64
 import tools
 from tools.translate import _
+from osv import osv, fields
 
-intro_form = '''<?xml version="1.0"?>
-<form string="Report designer">
-    <separator string="Report designer introduction" colspan="4"/>
-    <field name="text" colspan="4" nolabel="1"/>
-</form>'''
+class base_report_sxw(osv.osv_memory):
+    """Base Report sxw """
+    _name = 'base.report.sxw'
 
-intro_fields = {
-    'text': {
-        'string': 'Introduction',
-        'type': 'text',
-        'readonly': True,
-        'default': lambda *args: """This system must be used with the OpenERP SA OpenOffice plugin. If you
-did not installed yet, you can find this package on:
-    http://www.openerp.com
-
-This wizard will provide you the .SXW report that you can modify
-in OpenOffice. After having modified it, you will be able to reupload
-it to the OpenERP server.
-"""},
-    'operation': {
-        'string': 'Operation',
-        'type': 'selection',
-        'selection': [
-            ('create','Create a new report'),
-            ('modify','Modify an existing report')
-            ],
-        'size': 32,
-        'required': True,
-        'default': lambda *args: 'create',
-    },
-}
-
-get_form = '''<?xml version="1.0"?>
-<form string="Get a report">
-    <separator string="Select your report" colspan="4"/>
-    <field name="report_id"/>
-</form>'''
-
-get_fields = {
-    'report_id': {
-        'string': 'Report',
-        'type': 'many2one',
-        'relation': 'ir.actions.report.xml',
-        'required': True,
-        'domain': [('report_sxw_content','<>',False)],
-    },
-}
-
-get_form_result = '''<?xml version="1.0"?>
-<form string="Get a report">
-    <separator string="The .SXW report" colspan="4"/>
-    <field name="report_id"/>
-    <newline/>
-    <field name="file_sxw"/>
-    <newline/>
-    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the OpenERP SA OpenOffice package to modify it.\nOnce it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
-</form>'''
-
-get_form_fields = {
-    'report_id': {
-        'string': 'Report',
-        'type': 'many2one',
-        'relation': 'ir.actions.report.xml',
-        'readonly': True,
-    },
-    'file_sxw': {
-        'string': 'Your .SXW file',
-        'type': 'binary',
-        'readonly': True,
+    _columns = {
+        'report_id': fields.many2one('ir.actions.report.xml', "Report", required=True,domain=[('report_sxw_content','<>',False)],),
     }
-}
 
 
-send_form_result_arch = '''<?xml version="1.0"?>
-<form string="Report modified">
-    <separator string="Report modified" colspan="4"/>
-    <label string="Your report has been modified."/>
-</form>'''
+    def get_report(self, cr, uid, ids, context):
+        data=self.read(cr,uid,ids)[0]
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_sxw')
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.report.file.sxw',
+            'views': [(id2, 'form')],
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
 
-send_form_result_fields = {
-}
+base_report_sxw()
 
+class base_report_file_sxw(osv.osv_memory):
+    """Base Report File sxw """
+    _name = 'base.report.file.sxw'
 
-send_form_arch = '''<?xml version="1.0"?>
-<form string="Get a report">
-    <separator string="Upload your modified report" colspan="4"/>
-    <field name="report_id"/>
-    <newline/>
-    <field name="file_sxw"/>
-</form>'''
+    def default_get(self, cr, uid, fields, context=None):
+        """
+             To get default values for the object.
 
-send_form_fields = {
-    'report_id': {
-        'string': 'Report',
-        'type': 'many2one',
-        'relation': 'ir.actions.report.xml',
-        'required': True,
-        'domain': [('report_sxw_content','<>',False)]
-    },
-    'file_sxw': {
-        'string': 'Your .SXW file',
-        'type': 'binary',
-        'required': True
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values
+             @param context: A standard dictionary
+
+             @return: A dictionary which of fields with values.
+
+        """
+
+        res = super(base_report_file_sxw, self).default_get(cr, uid, fields, context=context)
+        report_id1 = self.pool.get('base.report.sxw').search(cr,uid,[])
+        data=self.pool.get('base.report.sxw').read(cr,uid,report_id1)[0]
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if not context:
+            context={}
+        if 'report_id' in fields:
+            res['report_id'] = data['report_id']
+            res['file_sxw'] = base64.encodestring(report.report_sxw_content)
+        return res
+
+    _columns = {
+        'report_id': fields.many2one('ir.actions.report.xml', "Report", readonly=True),
+        'file_sxw':fields.binary('Your .SXW file',readonly=True),
+        'file_sxw_upload':fields.binary('Your .SXW file',required=True)
     }
-}
 
-rml_form_arch = '''<?xml version="1.0"?>
-<form string="Save As" colspan="4">
-    <field name="file_rml"/>
-</form>
-'''
-
-rml_form_fields = {
-       'file_rml': {
-        'string': 'Save As',
-        'type': 'binary',
-    }
-}
-
-save_rml_arch = '''<?xml version="1.0"?>
-<form string="File saved">
-    <separator string="File saved" colspan="4"/>
-    <label string="Your .rml file is saved and report has been modified."/>
-</form>'''
-
-def _get_default(obj, cursor, user, data, context):
-    return {}
-
-
-class base_report_designer_modify(wizard.interface):
-    def _upload_report_clear(self, cr, uid, data, context):
-        return {'file_sxw': False}
-
-    def _upload_report(self, cr, uid, data, context):
-        import tiny_sxw2rml
+    def upload_report(self, cr, uid, ids, context):
+        from base_report_designer import  openerp_sxw2rml
         import StringIO
-        pool = pooler.get_pool(cr.dbname)
-        sxwval = StringIO.StringIO(base64.decodestring(data['form']['file_sxw']))
-        fp = tools.file_open('normalized_oo2rml.xsl',subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
-        newrmlcontent = str(tiny_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
-        report = pool.get('ir.actions.report.xml').write(cr, uid, [data['form']['report_id']], {
-            'report_sxw_content': base64.decodestring(data['form']['file_sxw']),
+        data=self.read(cr,uid,ids)[0]
+        sxwval = StringIO.StringIO(base64.decodestring(data['file_sxw_upload']))
+        fp = tools.file_open('normalized_oo2rml.xsl',subdir='addons/base_report_designer/openerp_sxw2rml')
+        newrmlcontent = str(openerp_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
+        report = self.pool.get('ir.actions.report.xml').write(cr, uid, [data['report_id']], {
+            'report_sxw_content': base64.decodestring(data['file_sxw_upload']),
             'report_rml_content': newrmlcontent
         })
-        return {'file_rml': base64.encodestring(newrmlcontent)}
+        cr.commit()
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_rml')
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.report.rml.save',
+            'views': [(id2, 'form')],
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+base_report_file_sxw()
 
-    def _get_report(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        report = pool.get('ir.actions.report.xml').browse(cr, uid, data['form']['report_id'], context)
-        try:
-            return {'file_sxw': base64.encodestring(report.report_sxw_content)}
-        except:
-            raise wizard.except_wizard(_('Error'), _('Report does not contain the sxw content!'))
+class base_report_rml_save(osv.osv_memory):
+    """Base Report file Save"""
+    _name = 'base.report.rml.save'
+    def default_get(self, cr, uid, fields, context=None):
+        """
+             To get default values for the object.
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': intro_form,
-                'fields': intro_fields,
-                'state': [
-                    ('end','Cancel'),
-                    ('get_form','Modify a report')
-                ]
-            }
-        },
-        'get_form': {
-            'actions': [_get_default],
-            'result': {
-                'type': 'form',
-                'arch': get_form,
-                'fields': get_fields,
-                'state': [
-                    ('end','Cancel'),
-                    ('get_form_result', 'Continue'),
-                ]
-            }
-        },
-        'get_form_result': {
-            'actions': [_get_report],
-            'result': {
-                'type': 'form',
-                'arch': get_form_result,
-                'fields': get_form_fields,
-                'state': [
-                    ('end','Close'),
-                    ('send_form', 'Upload the modified report'),
-                ]
-            }
-        },
-        'send_form': {
-            'actions': [_upload_report_clear],
-            'result': {
-                'type': 'form',
-                'arch': send_form_arch,
-                'fields': send_form_fields,
-                'state': [
-                    ('end','Close'),
-                    ('save_rml_to', 'Update the report'),
-                ]
-            }
-        },
-        'save_rml_to': {
-            'actions': [_upload_report],
-            'result': {
-                    'type': 'form',
-                    'arch': rml_form_arch,
-                    'fields': rml_form_fields,
-                    'state': [
-                            ('save_rml', 'Save rml'),
-                            ('send_form_result','Skip'),
-                        ]
-            }
-        },
-        'send_form_result': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': send_form_result_arch,
-                'fields': send_form_result_fields,
-                'state': [
-                    ('end','Close'),
-                ]
-            }
-        },
-        'save_rml': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': save_rml_arch, 'fields': {},
-                'state': [
-                    ('end','Close'),
-                ]
-            }
-        },
-    }
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values
+             @param context: A standard dictionary
+             @return: A dictionary which of fields with values.
 
-base_report_designer_modify('base_report_designer.modify')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        """
+        res = super(base_report_rml_save, self).default_get(cr, uid, fields, context=context)
+        report_id = self.pool.get('base.report.sxw').search(cr,uid,[])
+        data=self.pool.get('base.report.file.sxw').read(cr,uid,report_id)[0]
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if not context:
+            context={}
+        if 'file_rml' in fields:
+            res['file_rml'] =  base64.encodestring(report.report_rml_content)
+        return res
+    _columns = {
+         'file_rml':fields.binary('Save As'),
+         }
 
+base_report_rml_save()
diff --git a/addons/base_synchro/__init__.py b/addons/base_synchro/__init__.py
new file mode 100644
index 00000000000..c23ec3f2246
--- /dev/null
+++ b/addons/base_synchro/__init__.py
@@ -0,0 +1,23 @@
+# -*- 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 base_synchro_obj
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
new file mode 100644
index 00000000000..69fcb839715
--- /dev/null
+++ b/addons/base_synchro/__openerp__.py
@@ -0,0 +1,33 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+        "name":"Base Synchro",
+        "version":"0.1",
+        "author":"Tiny",
+        "category":"Generic Modules/Base",
+        "depends":["base"],
+        "demo_xml":[],
+        "update_xml":["base_synchro_wizard.xml","base_synchro_view.xml"],
+        "active":False,
+        "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py
new file mode 100755
index 00000000000..5093c8f787e
--- /dev/null
+++ b/addons/base_synchro/base_synchro_obj.py
@@ -0,0 +1,107 @@
+# -*- 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
+import tools
+import re
+import time
+
+class base_synchro_server(osv.osv):
+    '''Class to store the information regarding server'''
+    _name = "base.synchro.server"
+    _description = "Synchronized server"
+    _columns = {
+        'name': fields.char('Server name', size=64,required=True),
+        'server_url': fields.char('Server URL', size=64,required=True),
+        'server_port': fields.integer('Server Port', size=64,required=True),
+        'server_db': fields.char('Server Database', size=64,required=True),
+        'login': fields.char('User Name',size=50,required=True),
+        'password': fields.char('Password',size=64,invisible=True,required=True),
+        'obj_ids' : fields.one2many('base.synchro.obj','server_id','Models',ondelete='cascade')
+    }
+    _defaults = {
+        'server_port': lambda *args: 8069
+    }
+base_synchro_server()
+
+class base_synchro_obj(osv.osv):
+    '''Class to store the operations done by wizart'''
+    _name = "base.synchro.obj"
+    _description = "Register Class"
+    _columns = {
+        'name':fields.char('Name', size=64, select=1, required=1),
+        'domain':fields.char('Domain', size=64, select=1, required=1),
+        'server_id':fields.many2one('base.synchro.server','Server', ondelete='cascade', select=1, required=1),
+        'model_id': fields.many2one('ir.model', 'Object to synchronize',required=True),
+        'action':fields.selection([('d','Download'),('u','Upload'),('b','Both')],'Synchronisation direction', required=True),
+        'sequence': fields.integer('Sequence'),
+        'active': fields.boolean('Active'),
+        'synchronize_date':fields.datetime('Latest Synchronization', readonly=True),
+        'line_id':fields.one2many('base.synchro.obj.line','obj_id','Ids Affected',ondelete='cascade'),
+        'avoid_ids':fields.one2many('base.synchro.obj.avoid','obj_id','Fields Not Sync.'),
+    }
+    _defaults = {
+        'active': lambda *args: True,
+        'action': lambda *args: 'd',
+        'domain': lambda *args: '[]'
+    }
+    _order = 'sequence'
+    #
+    # Return a list of changes: [ (date, id) ]
+    #
+    def _get_ids(self, cr, uid, object, dt, domain=[], context={}):
+        result = []
+        if dt:
+            domain2 = domain+[('write_date','>=',dt)]
+            domain3 = domain+[('create_date','>=',dt)]
+        else:
+            domain2 = domain3 = domain
+        ids = self.pool.get(object).search(cr, uid, domain2, context=context)
+        ids += self.pool.get(object).search(cr, uid, domain3, context=context)
+        for r in self.pool.get(object).perm_read(cr, uid, ids, context, details=False):
+            result.append( (r['write_date'] or r['create_date'], r['id'], context.get('action', 'd')))
+        return result
+base_synchro_obj()
+
+class base_synchro_obj_avoid(osv.osv):
+    _name = "base.synchro.obj.avoid"
+    _description = "Fields to not synchronize"
+    _columns = {
+        'name':fields.char('Field Name', size=64, select=1, required=1),
+        'obj_id':fields.many2one('base.synchro.obj', 'Object', required=1,ondelete='cascade'),
+    }
+base_synchro_obj_avoid()
+
+
+class base_synchro_obj_line(osv.osv):
+    '''Class to store the operations done by wizard'''
+    _name = "base.synchro.obj.line"
+    _description = "Synchronized instances"
+    _columns = {
+        'name': fields.datetime('Date', required=True),
+        'obj_id': fields.many2one('base.synchro.obj', 'Object', ondelete='cascade', select=True),
+        'local_id': fields.integer('Local Id',readonly=True),
+        'remote_id':fields.integer('Remote Id',readonly=True),
+    }
+    _defaults = {
+        'name': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S')
+    }
+base_synchro_obj_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
new file mode 100755
index 00000000000..97995106070
--- /dev/null
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_transfer_line_tree" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.tree</field>
+            <field name="model">base.synchro.obj.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Transfered Ids Details">
+                    <field name="name" select="1"/>
+                    <field name="obj_id" select="1"/>
+                    <field name="local_id" select="2"/>
+                    <field name="remote_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_transfer_line_form" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.form</field>
+            <field name="model">base.synchro.obj.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Transfered Ids Details">
+                    <field name="name" select="1"/>
+                    <field name="obj_id" select="1"/>
+                    <field name="local_id" readonly="1" select="2"/>
+                    <field name="remote_id" readonly="1" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_base_synchro_obj_line_tree" model="ir.actions.act_window">
+            <field name="name">Synchronized instances</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj.line</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem id="next_id_63" name="History"  groups="base.group_extended" parent="base_synchro.next_id_62"/><menuitem action="action_base_synchro_obj_line_tree" id="menu_action_base_synchro_obj_line_tree" parent="base_synchro.next_id_63"/>
+
+<!--view_base_synchro_obj starts-->
+
+        <record id="view_transfer_form" model="ir.ui.view">
+            <field name="name">base.synchro.obj.form</field>
+            <field name="model">base.synchro.obj</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Transfer Details">
+                    <field name="name" select="1"/>
+                    <field name="active" select="2"/>
+                    <field name="server_id" select="2"/>
+                    <field name="model_id" select="1"/>
+                    <field name="action"/>
+                    <field name="sequence"/>
+                    <field colspan="4" name="domain"/>
+                    <field name="synchronize_date"/>
+                    <newline/>
+                    <field name="avoid_ids" colspan="4">
+                        <tree string="Fields" editable="bottom">
+                            <field name="name"/>
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_regclass_tree" model="ir.ui.view">
+            <field name="name">base.synchro.obj.tree</field>
+            <field name="model">base.synchro.obj</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Synchronized objects">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="server_id"/>
+                    <field name="action"/>
+                    <field name="synchronize_date"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_transfer_tree" model="ir.actions.act_window">
+            <field name="name">Synchronized objects</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <menuitem action="action_transfer_tree" id="transfer_menu_id" parent="base_synchro.next_id_63"/>
+
+
+<!--view_base_synchro_obj starts-->
+
+<!--view_base_synchro_server starts -->
+
+        <record id="view_base_synchro_server_tree" model="ir.ui.view">
+            <field name="name">base.synchro.server.tree</field>
+            <field name="model">base.synchro.server</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Synchronized server">
+                    <field name="name"/>
+                    <field name="server_url"/>
+                    <field name="server_port"/>
+                    <field name="server_db"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_base_synchro_server_form" model="ir.ui.view">
+            <field name="name">base.synchro.server.form</field>
+            <field name="model">base.synchro.server</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Synchronized server">
+                    <field name="name" select="1"/>
+                    <newline/>
+                    <field name="server_url" select="2"/>
+                    <newline/>
+                    <field name="server_port"/>
+                    <field name="server_db"/>
+                    <newline/>
+                    <field name="login" select="1"/>
+                    <field name="password"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_base_synchro_server_tree" model="ir.actions.act_window">
+            <field name="name">Synchronized Servers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.server</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <menuitem action="action_base_synchro_server_tree" id="synchro_server_tree_menu_id" parent="base_synchro.next_id_63"/>
+
+
+
+<!--view_base_synchro_server end -->
+
+
+    </data>
+</openerp>
diff --git a/addons/base_synchro/base_synchro_wizard.xml b/addons/base_synchro/base_synchro_wizard.xml
new file mode 100644
index 00000000000..b26b3bbae2b
--- /dev/null
+++ b/addons/base_synchro/base_synchro_wizard.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<wizard id="wizard_cost_account_synchro" model="account.analytic.account" name="account.analytic.account.transfer" string="Synchronize objects"/>
+		<menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/><menuitem action="wizard_cost_account_synchro" id="menu_wizard_cost_account_synchro" parent="base_synchro.next_id_62" type="wizard"/>
+
+	</data>
+</openerp>
diff --git a/addons/base_synchro/wizard/__init__.py b/addons/base_synchro/wizard/__init__.py
new file mode 100644
index 00000000000..7ff450acd76
--- /dev/null
+++ b/addons/base_synchro/wizard/__init__.py
@@ -0,0 +1,22 @@
+# -*- 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 base_synchro
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
new file mode 100644
index 00000000000..3a394d4ba3b
--- /dev/null
+++ b/addons/base_synchro/wizard/base_synchro.py
@@ -0,0 +1,279 @@
+# -*- 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 osv
+from datetime import date
+import time
+import pooler
+import xmlrpclib
+import re
+import tools
+import threading
+
+acc_synchro_form = '''<?xml version="1.0"?>
+<form string="Transfer Data To Server">
+    <field name="server_url" colspan="4"/>
+    <newline/>
+    <separator string="Control" colspan="4"/>
+    <field name="user_id"/>
+    <newline/>
+</form>'''
+
+acc_synchro_fields = {
+    'server_url': {'string':'Server URL', 'type':'many2one', 'relation':'base.synchro.server','required':True},
+    'user_id': {'string':'Send Result To', 'type':'many2one', 'relation':'res.users', 'default': lambda uid,data,state: uid},
+}
+
+finish_form ='''<?xml version="1.0"?>
+<form string="Synchronization Complited!">
+    <label string="The synchronisation has been started.\nYou will receive a request when it's done." colspan="4"/>
+</form>
+'''
+
+class RPCProxyOne(object):
+    def __init__(self, server, ressource):
+        self.server = server
+        local_url = 'http://%s:%d/xmlrpc/common'%(server.server_url,server.server_port)
+        rpc = xmlrpclib.ServerProxy(local_url)
+        self.uid = rpc.login(server.server_db, server.login, server.password)
+        local_url = 'http://%s:%d/xmlrpc/object'%(server.server_url,server.server_port)
+        self.rpc = xmlrpclib.ServerProxy(local_url)
+        self.ressource = ressource
+    def __getattr__(self, name):
+        return lambda cr, uid, *args, **kwargs: self.rpc.execute(self.server.server_db, self.uid, self.server.password, self.ressource, name, *args, **kwargs)
+
+class RPCProxy(object):
+    def __init__(self, server):
+        self.server = server
+    def get(self, ressource):
+        return RPCProxyOne(self.server, ressource)
+
+class wizard_cost_account_synchro(wizard.interface):
+    start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+    report = []
+    report_total = 0
+    report_create = 0
+    report_write = 0
+    def _synchronize(self, cr, uid, server, object, context):
+        pool = pooler.get_pool(cr.dbname)
+        self.meta = {}
+        ids = []
+        pool1 = RPCProxy(server)
+        pool2 = pool
+        #try:
+        if object.action in ('d','b'):
+            ids = pool1.get('base.synchro.obj')._get_ids(cr, uid,
+                object.model_id.model,
+                object.synchronize_date,
+                eval(object.domain),
+                {'action':'d'}
+            )
+        if object.action in ('u','b'):
+            ids += pool2.get('base.synchro.obj')._get_ids(cr, uid,
+                object.model_id.model,
+                object.synchronize_date,
+                eval(object.domain),
+                {'action':'u'}
+            )
+        ids.sort()
+        iii = 0
+        for dt, id, action in ids:
+            print 'Process', dt, id, action
+            iii +=1
+            if action=='u':
+                pool_src = pool2
+                pool_dest = pool1
+            else:
+                pool_src = pool1
+                pool_dest = pool2
+            print 'Read', object.model_id.model, id
+            fields = False
+            if object.model_id.model=='crm.case.history':
+                fields = ['email','description','log_id']
+            value = pool_src.get(object.model_id.model).read(cr, uid, [id], fields)[0]
+            value = self._data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
+            id2 = self.get_id(cr, uid, object.id, id, action, context)
+            #
+            # Transform value
+            #
+            #tid=pool_dest.get(object.model_id.model).name_search(cr, uid, value['name'],[],'=',)
+            if not (iii%50):
+                print 'Record', iii
+
+            # Filter fields to not sync
+            for field in object.avoid_ids:
+                if field.name in value:
+                    del value[field.name]
+
+            if id2:
+                #try:
+                pool_dest.get(object.model_id.model).write(cr, uid, [id2], value)
+                #except Exception, e:
+                #self.report.append('ERROR: Unable to update record ['+str(id2)+']:'+str(value.get('name', '?')))
+                self.report_total+=1
+                self.report_write+=1
+            else:
+                print value
+                idnew = pool_dest.get(object.model_id.model).create(cr, uid, value)
+                synid = pool.get('base.synchro.obj.line').create(cr, uid, {
+                    'obj_id': object.id,
+                    'local_id': (action=='u') and id or idnew,
+                    'remote_id': (action=='d') and id or idnew
+                })
+                self.report_total+=1
+                self.report_create+=1
+        self.meta = {}
+        return 'finish'
+
+    #
+    # IN: object and ID
+    # OUT: ID of the remote object computed:
+    #        If object is synchronised, read the sync database
+    #        Otherwise, use the name_search method
+    #
+    def get_id(self, cr, uid, object_id, id, action, context={}):
+        pool = pooler.get_pool(cr.dbname)
+        field_src = (action=='u') and 'local_id' or 'remote_id'
+        field_dest = (action=='d') and 'local_id' or 'remote_id'
+        rid = pool.get('base.synchro.obj.line').search(cr, uid, [('obj_id','=',object_id), (field_src,'=',id)], context=context)
+        result = False
+        if rid:
+            result  = pool.get('base.synchro.obj.line').read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
+        return result
+
+    def _relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
+        if not id:
+            return False
+        pool = pooler.get_pool(cr.dbname)
+        cr.execute('''select o.id from base_synchro_obj o left join ir_model m on (o.model_id =m.id) where
+                m.model=%s and
+                o.active''', (object,))
+        obj = cr.fetchone()
+        result = False
+        if obj:
+            #
+            # If the object is synchronised and found, set it
+            #
+            result = self.get_id(cr, uid, obj[0], id, action, context)
+        else:
+            #
+            # If not synchronized, try to find it with name_get/name_search
+            #
+            names = pool_src.get(object).name_get(cr, uid, [id], context)[0][1]
+            res = pool_dest.get(object).name_search(cr, uid, names, [], 'like')
+            if res:
+                result = res[0][0]
+            else:
+                # LOG this in the report, better message.
+                print self.report.append('WARNING: Record "%s" on relation %s not found, set to null.' % (names,object))
+        return result
+
+    def _data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
+        self.meta.setdefault(pool_src, {})
+        if not object in self.meta[pool_src]:
+            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context)
+        fields = self.meta[pool_src][object]
+
+        for f in fields:
+            if f not in data:
+                continue
+            ftype = fields[f]['type']
+
+            if ftype in ('function', 'one2many', 'one2one'):
+                del data[f]
+            elif ftype == 'many2one':
+                if data[f]:
+                    df = self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
+                    data[f] = df
+                    if not data[f]:
+                        del data[f]
+            elif ftype == 'many2many':
+                res = map(lambda x: self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], x, action, context), data[f])
+                data[f] = [(6, 0, res)]
+        del data['id']
+        return data
+
+    #
+    # Find all objects that are created or modified after the synchronize_date
+    # Synchronize these obejcts
+    #
+    def _upload_download(self, db_name, uid, data, context):
+        cr = pooler.get_db(db_name).cursor()
+        start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+        pool = pooler.get_pool(cr.dbname)
+        server = pool.get('base.synchro.server').browse(cr, uid, data['form']['server_url'], context)
+        for object in server.obj_ids:
+            dt = time.strftime('%Y-%m-%d %H:%M:%S')
+            self._synchronize(cr, uid, server, object, context)
+            if object.action=='b':
+                time.sleep(1)
+                dt = time.strftime('%Y-%m-%d %H:%M:%S')
+            pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
+            cr.commit()
+        end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+        if 'user_id' in data['form'] and data['form']['user_id']:
+            request = pooler.get_pool(cr.dbname).get('res.request')
+            if not self.report:
+                self.report.append('No exception.')
+            summary = '''Here is the synchronization report:
+
+Synchronization started: %s
+Synchronization finnished: %s
+
+Synchronized records: %d
+Records updated: %d
+Records created: %d
+
+Exceptions:
+            '''% (start_date,end_date,self.report_total, self.report_write,self.report_create)
+            summary += '\n'.join(self.report)
+            request.create(cr, uid, {
+                'name' : "Synchronization report",
+                'act_from' : uid,
+                'act_to' : data['form']['user_id'],
+                'body': summary,
+            })
+        cr.commit()
+        cr.close()
+        return 'finish'
+
+    def _upload_download_multi_thread(self, cr, uid, data, context):
+        threaded_synchronization = threading.Thread(target=self._upload_download, args=(cr.dbname, uid, data, context))
+        threaded_synchronization.start()
+        return 'finish'
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':acc_synchro_form, 'fields':acc_synchro_fields, 'state':[('end','Cancel'),('upload_download','Synchronize')]}
+        },
+        'upload_download': {
+            'actions': [],
+            'result':{'type':'choice', 'next_state': _upload_download_multi_thread}
+        },
+        'finish': {
+            'actions': [],
+            'result':{'type':'form', 'arch':finish_form,'fields':{},'state':[('end','Ok')]}
+        },
+    }
+wizard_cost_account_synchro('account.analytic.account.transfer')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From fee87161668299ad669b93c1b55c7ab22db58cd3 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Sat, 18 Sep 2010 14:43:30 +0200
Subject: [PATCH 114/118] [IMP] account_voucher: added feature for
 reconciliation on the bank statement

bzr revid: qdp-launchpad@tinyerp.com-20100918124330-d4k83ne26h0t69xf
---
 addons/account_voucher/voucher.py             | 48 +++++++++++++-
 .../voucher_payment_receipt_view.xml          | 66 +++++++++++++++++++
 addons/account_voucher/voucher_view.xml       | 14 ++++
 3 files changed, 125 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 57b74d948d8..8b944cd0e8b 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -45,7 +45,7 @@ account_move_line()
 
 class account_voucher(osv.osv):
     def _get_type(self, cr, uid, ids, context={}):
-        return context.get('type')
+        return context.get('type', False)
         
     def _get_period(self, cr, uid, context={}):
         if context.get('period_id', False):
@@ -101,7 +101,8 @@ class account_voucher(osv.osv):
     
     def _get_narration(self, cr, uid, context={}):
         return context.get('narration', False)
-        
+       
+ 
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -308,7 +309,7 @@ class account_voucher(osv.osv):
             tr_type = 'receipt'
 
         default['value']['account_id'] = account_id
-        default['value']['type'] = tr_type
+        default['value']['type'] = ttype or tr_type
         
         vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
         default['value'].update(vals.get('value'))
@@ -810,3 +811,44 @@ class account_voucher_line(osv.osv):
         })
         return values
 account_voucher_line()
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+
+    def create_move_from_st_line(self, cr, uid, st_line, company_currency_id, next_number, context=None):
+        #TODO: test me please
+        if st_line.voucher_id:
+            return self.pool.get('account.voucher').proforma_voucher(cr, uid, [st_line.voucher_id.id])
+        return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context=context)
+
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit = 'account.bank.statement.line'
+
+    def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
+        if not ids:
+            return {}
+        res_currency_obj = self.pool.get('res.currency')
+        res = {}
+        company_currency_id = False
+
+        for line in self.browse(cursor, user, ids, context=context):
+            if not company_currency_id:
+                company_currency_id = line.company_id.id
+            if line.voucher_id:
+                res[line.id] = res_currency_obj.compute(cursor, user,
+                        company_currency_id, line.statement_id.currency.id,
+                        line.voucher_id.amount, context=context)
+            else:
+                res[line.id] = 0.0
+        return res
+
+    _columns = {
+        'amount_reconciled': fields.function(_amount_reconciled,
+            string='Amount reconciled', method=True, type='float'),
+        'voucher_id': fields.many2one('account.voucher', 'Payment'),
+
+    }
+
+account_bank_statement_line()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index fd79598a286..6cca62c0d57 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -80,6 +80,72 @@
                 </search>
             </field>
         </record>
+        <record model="ir.ui.view" id="view_low_priority_payment_form">
+            <field name="name">account.voucher.payment.low.priority.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="priority">1</field>
+            <field name="arch" type="xml">
+                <form string="Bill Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
+                        <field name="journal_id"
+                            domain="[('type','in',['bank', 'cash'])]"
+                            widget="selection" select="1"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"
+                            string="Payment Method"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
+                        <field name="reference" select="1" string="Payment Ref"/>
+                        <field name="name" colspan="4"/>
+                        <field name="account_id"
+                            widget="selection"
+                            invisible="True"/>
+                        <field name="pre_line" invisible="1"/>
+                        <field name="type" invisible="True"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="line_dr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+                                <tree string="Vendor Invoices and Outstanding transactions" editable="bottom">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        />
+                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount" sum="Payment"/>
+                                </tree>
+                                <form string="Payment Information">
+                                    <label string="Form view not available for Payment Lines"/>
+                                </form>
+                            </field>
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+                                <tree string="Credits" editable="bottom">
+                                    <field name="move_line_id"/>
+                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original"/>
+                                    <field name="amount_original"/>
+                                    <field name="amount" sum="Payment"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Internal Notes" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" invisible="True"/>
+                                <field name="number"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_vendor_payment_form">
             <field name="name">account.voucher.payment.form</field>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 9291567ca24..449fefa2de5 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -179,5 +179,19 @@
             <field name="search_view_id" ref="view_voucher_filter"/>
         </record>
 
+
+        <record id="view_bank_statement_form_voucher" model="ir.ui.view">
+            <field name="name">account.bank.statement.voucher.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="amount_reconciled"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>

From 5631dcd674ad3075de7b238bad9a5ac4b395d89d Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Sat, 18 Sep 2010 14:47:12 +0200
Subject: [PATCH 115/118] [FIX] point_of_sale: removed reference and code
 related to account_bank_statement_reconcile

bzr revid: qdp-launchpad@tinyerp.com-20100918124712-78wuz66ingmii5nr
---
 addons/point_of_sale/pos.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 623163b6460..3efb4e518d7 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -128,10 +128,6 @@ class pos_order(osv.osv):
             cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
             val=cr.fetchone()
             val= val and val[0] or None
-            if not val:
-                cr.execute("select max(date) from account_bank_statement_line l, account_bank_statement_reconcile s where l.pos_statement_id=%d and l.reconcile_id=s.id"%(order.id))
-                val=cr.fetchone()
-                val=val and val[0] or None
             if val:
                 res[order.id]=val
         return res

From bef957eb8e8d6fd1bc9f178f5268e166e1d7a02c Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Sat, 18 Sep 2010 15:08:53 +0200
Subject: [PATCH 116/118] [EMP] account_voucher: removed TODO comment

bzr revid: qdp-launchpad@tinyerp.com-20100918130853-e94kfojfks5uo152
---
 addons/account_voucher/voucher.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 8b944cd0e8b..ebc709e3ff6 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -816,7 +816,6 @@ class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
 
     def create_move_from_st_line(self, cr, uid, st_line, company_currency_id, next_number, context=None):
-        #TODO: test me please
         if st_line.voucher_id:
             return self.pool.get('account.voucher').proforma_voucher(cr, uid, [st_line.voucher_id.id])
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context=context)

From 3af18d7dc239849f8930c42babb62cbecd933bd2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 19 Sep 2010 14:35:06 +0200
Subject: [PATCH 117/118] [FIX] speed improvement invoice

bzr revid: fp@tinyerp.com-20100919123506-wt2dhw2v2c8rqj6e
---
 addons/account/invoice.py | 50 ++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 44a57c2e11d..4403c80c1e5 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -138,16 +138,17 @@ class account_invoice(osv.osv):
 
         return res
 
+    # Give Journal Items related to the payment reconciled to this invoice
+    # Return ids of partial and total payments related to the selected invoices
     def _get_lines(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for id in ids:
-            move_lines = self.move_line_id_payment_get(cr, uid, [id])
-            if not move_lines:
-                res[id] = []
-                continue
+        for invoice in self.browse(cr, uid, ids, context=context):
+            id = invoice.id
             res[id] = []
-            data_lines = self.pool.get('account.move.line').browse(cr, uid, move_lines)
-            partial_ids = []# Keeps the track of ids where partial payments are done with payment terms
+            if not invoice.move_id:
+                continue
+            data_lines = invoice.move_id.line_id
+            partial_ids = []
             for line in data_lines:
                 ids_line = []
                 if line.reconcile_id:
@@ -174,17 +175,17 @@ class account_invoice(osv.osv):
     def _compute_lines(self, cr, uid, ids, name, args, context=None):
         result = {}
         for invoice in self.browse(cr, uid, ids, context):
-            moves = self.move_line_id_payment_get(cr, uid, [invoice.id])
             src = []
             lines = []
-            for m in self.pool.get('account.move.line').browse(cr, uid, moves, context):
-                temp_lines = []#Added temp list to avoid duplicate records
-                if m.reconcile_id:
-                    temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
-                elif m.reconcile_partial_id:
-                    temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
-                lines += [x for x in temp_lines if x not in lines]
-                src.append(m.id)
+            if invoice.move_id:
+                for m in invoice.move_id.line_id:
+                    temp_lines = []
+                    if m.reconcile_id:
+                        temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
+                    elif m.reconcile_partial_id:
+                        temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
+                    lines += [x for x in temp_lines if x not in lines]
+                    src.append(m.id)
 
             lines = filter(lambda x: x not in src, lines)
             result[invoice.id] = lines
@@ -389,6 +390,8 @@ class account_invoice(osv.osv):
             invoice_addr_id = res['invoice']
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if company_id:
+                print p
+                print p.property_account_receivable, p.property_account_receivable.company_id, p.property_account_payable, p.property_account_payable.company_id
                 if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id:
                     property_obj = self.pool.get('ir.property')
                     rec_pro_id = property_obj.search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
@@ -584,15 +587,24 @@ class account_invoice(osv.osv):
     # return the ids of the move lines which has the same account than the invoice
     # whose id is in ids
     def move_line_id_payment_get(self, cr, uid, ids, *args):
-        res = []
+        print '** la'
+        if not ids: return []
+        result = self.move_line_id_payment_gets(cr, uid, ids, *args)
+        return result.get(ids[0], [])
+
+    def move_line_id_payment_gets(self, cr, uid, ids, *args):
+        print '** ICI'
+        res = {}
         if not ids: return res
-        cr.execute('SELECT l.id '\
+        cr.execute('SELECT i.id, l.id '\
                    'FROM account_move_line l '\
                    'LEFT JOIN account_invoice i ON (i.move_id=l.move_id) '\
                    'WHERE i.id IN %s '\
                    'AND l.account_id=i.account_id',
                    (tuple(ids),))
-        res = map(itemgetter(0), cr.fetchall())
+        for r in cr.fetchall():
+            res.setdefault(r[0], [])
+            res[r[0]].append( r[1] )
         return res
 
     def copy(self, cr, uid, id, default={}, context=None):

From be8fcf14fbb2567db1179c6c36b63f23534330e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 19 Sep 2010 15:35:12 +0200
Subject: [PATCH 118/118] fix

bzr revid: fp@tinyerp.com-20100919133512-fy0g0jhn0drpx96h
---
 addons/account/invoice.py                        |  4 ----
 addons/account/test/account_fiscalyear_close.yml | 13 ++++++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index afd3345911d..42e4bee12b6 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -390,8 +390,6 @@ class account_invoice(osv.osv):
             invoice_addr_id = res['invoice']
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if company_id:
-                print p
-                print p.property_account_receivable, p.property_account_receivable.company_id, p.property_account_payable, p.property_account_payable.company_id
                 if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id:
                     property_obj = self.pool.get('ir.property')
                     rec_pro_id = property_obj.search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
@@ -597,13 +595,11 @@ class account_invoice(osv.osv):
     # return the ids of the move lines which has the same account than the invoice
     # whose id is in ids
     def move_line_id_payment_get(self, cr, uid, ids, *args):
-        print '** la'
         if not ids: return []
         result = self.move_line_id_payment_gets(cr, uid, ids, *args)
         return result.get(ids[0], [])
 
     def move_line_id_payment_gets(self, cr, uid, ids, *args):
-        print '** ICI'
         res = {}
         if not ids: return res
         cr.execute('SELECT i.id, l.id '\
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 3f99a66d719..59cbfdafc0b 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -21,16 +21,23 @@
 -
   I made modification in journal so it can move entries
 -
-  !record {model: account.journal, id: account.sales_journal}:
+  !record {model: account.journal, id: account.close_journal}:
+    name: End of Year
+    code: NEW
+    type: situation
+    sequence_id: sequence_journal
+    default_debit_account_id: cash
+    default_credit_account_id: cash
+    company_id: base.main_company
+    view_id: account_journal_bank_view
     centralisation: 1
-
 -
   I called the Generate Fiscalyear Opening Entries wizard
 -
   !record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
     fy2_id: account_fiscalyear_fiscalyear0
     fy_id: account.data_fiscalyear
-    journal_id: account.sales_journal
+    journal_id: account.close_journal
     period_id: account_period_jan11
     report_name: End of Fiscal Year Entry
 -