From 9048db178d4165b88cdb599f406dcac73a8c5d39 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 5 Aug 2010 15:46:26 +0200
Subject: [PATCH 001/294] [IMP] Allows longer record rules (text).

bzr revid: jth@openerp.com-20100805134626-m0roia22nc6fv7f9
---
 bin/addons/base/ir/ir_rule.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 23981458606..1104d2d3770 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -55,8 +55,8 @@ class ir_rule(osv.osv):
         'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
         'global': fields.function(_get_value, method=True, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
         'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
-        'domain_force': fields.char('Domain', size=250),
-        'domain': fields.function(_domain_force_get, method=True, string='Domain', type='char', size=250),
+        'domain_force': fields.text('Domain'),
+        'domain': fields.function(_domain_force_get, method=True, string='Domain', type='text'),
         'perm_read': fields.boolean('Apply For Read'),
         'perm_write': fields.boolean('Apply For Write'),
         'perm_create': fields.boolean('Apply For Create'),

From 6822cd8f20dfbc059adc5cb183daab20ccd72e9d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 1 Oct 2010 19:15:38 +0530
Subject: [PATCH 002/294] [IMP]: crm: Put proper context for default value in
 history tab of partner

bzr revid: rpa@tinyerp.com-20101001134538-y56zlbh0mybptw30
---
 addons/crm/res_partner_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 6ca978ea153..d8122852ca0 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -11,7 +11,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="inside">
-                    <field name="opportunity_ids" colspan="4" nolabel="1">
+                    <field name="opportunity_ids" colspan="4" nolabel="1" context="{'default_partner_id': active_id}">
                          <tree string="Leads and Opportunities"  colors="blue:state=='pending';gray:state=='cancel'">
                              <field name="create_date"/>
                              <field name="name"/>
@@ -44,7 +44,7 @@
                                  icon="gtk-cancel" />
                          </tree>
                     </field>
-                    <field name="meeting_ids" colspan="4" nolabel="1" >
+                    <field name="meeting_ids" colspan="4" nolabel="1"  context="{'default_partner_id': active_id}">
                         <tree string="Meetings" colors="gray:state in ('draft', 'cancel','done','pending')">
                             <field name="user_id" string="Responsible"/>
                             <field name="name" string="Subject" />
@@ -52,7 +52,7 @@
                             <field name="date_deadline" string="End Date"/>
                         </tree>
                     </field>
-                    <field name="phonecall_ids" colspan="4" nolabel="1">
+                    <field name="phonecall_ids" colspan="4" nolabel="1" context="{'default_partner_id': active_id}">
                         <tree string="Phone Calls" colors="gray:state in ('draft', 'cancel','done','pending')">
                             <field name="date" string="Date"/>
                             <field name="name" string="Call Summary"/>

From 4f9d58b2a52d9d86777e8d2ab6cc45693cbb26df Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 1 Oct 2010 19:16:41 +0530
Subject: [PATCH 003/294] [IMP]: base_calendar: Usability improvement in invite
 attendee wizard

bzr revid: rpa@tinyerp.com-20101001134641-0s9tmilk1denie0x
---
 .../wizard/base_calendar_invite_attendee.py   |  4 +-
 .../base_calendar_invite_attendee_view.xml    | 61 ++++++++-----------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 98369962ab7..c92a40e72b2 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -36,11 +36,11 @@ class base_calendar_invite_attendee(osv.osv_memory):
     _columns = {
         'type': fields.selection([('internal', 'Internal User'), \
               ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True),
+              ('partner', 'Partner Contacts')], 'Type', required=True, help="Select whom you want to Invite"),
         'user_ids': fields.many2many('res.users', 'invite_user_rel',
                                   'invite_id', 'user_id', 'Users'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'email': fields.char('Email', size=124),
+        'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."),
         'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel',
                                   'invite_id', 'contact_id', 'Contacts'),
         'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 494787bbf97..ef7193e05fe 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -10,42 +10,31 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Invite People">
-                    <separator string="Invite People" colspan="4" />
-					<field name="type" />
-					<field name="send_mail" />
-					<newline />
-					<group col="2" colspan="6"
-						attrs="{'invisible': [('type', '!=', 'external')]}">
-						<field name="email" colspan="4"
-							attrs="{'required': [('type', '=', 'external')]}" />
-					</group>
-					<group col="2" colspan="6"
-						attrs="{'invisible': [('type', '!=', 'internal')]}">
-						<separator string="Users" colspan="4" />
-						<field name="user_ids" select="1" colspan="4"
-							nolabel="1" />
-						<newline />
-					</group>
-					<group col="2" colspan="6"
-						attrs="{'invisible': [('type', '!=', 'partner')]}">
-						<field name="partner_id" colspan="2"
-							on_change="onchange_partner_id(partner_id)"
-							attrs="{'required': [('type', '=', 'partner')]}" />
-						<newline />
-						<separator string="Partner Contacts"
-							colspan="6" />
-						<field name="contact_ids" select="1" colspan="4"
-							nolabel="1" domain="[('partner_id', '=', partner_id)]"
-							attrs="{'readonly': [('type', '!=', 'partner')]}" />
-					</group>
-					<newline />
-					<separator string="" colspan="6" />
-					<group col="4" colspan="4">
-					<button icon='gtk-cancel' special="cancel"
-						string="Cancel" />
-					<button name="do_invite" string="Invite"
-						type="object" icon="gtk-ok" />
-					</group>
+                    <separator string="Invite People" colspan="4"/>
+					<field name="type"/>
+					<field name="send_mail"/>
+                    <notebook colspan="4">
+                        <page string="Data">
+                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
+                                <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
+                            </group>
+                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
+                                <separator string="Users" colspan="4"/>
+                                <field name="user_ids" select="1" colspan="4" nolabel="1"  height="180"/>
+                                <newline/>
+                            </group>
+                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
+                                <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
+                                <newline/>
+                                <separator string="Partner Contacts" colspan="6"/>
+                                <field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('partner_id', '=', partner_id)]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
+                            </group>
+                        </page>
+                    </notebook>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
+                    </group>
 				</form>
 			</field>
 		</record>

From 641c6edde10055bffe2506c2eeee5721e7abd7ec Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 1 Oct 2010 19:17:50 +0530
Subject: [PATCH 004/294] [IMP]: crm: Aligned tabs properly in xml

bzr revid: rpa@tinyerp.com-20101001134750-5p9k4jxznkig3axh
---
 addons/crm/report/crm_lead_report_view.xml | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c37c7bcec57..64e410e16b5 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -107,32 +107,32 @@
                         <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
-                   </group>
-                   <newline/>
-                  <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="partner_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                      <field name="categ_id" widget="selection"/>
-                      <field name="type_id" widget="selection"/>
-                      <field name="channel_id" widget="selection"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="creation_date"/>
-                      <field name="opening_date"/>
-                      <field name="date_closed"/>
-                  </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="partner_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                        <field name="categ_id" widget="selection"/>
+                        <field name="type_id" widget="selection"/>
+                        <field name="channel_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                       <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                       <filter string="Company" icon="terp-go-home"
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
@@ -154,14 +154,14 @@
                             domain="[]" context="{'group_by':'month'}" help="Month in which lead/opportunity is created"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Year in which lead/opportunity is created"/>
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
 <!--     Opportunity tree view  -->
 
-    <record id="view_report_crm_opportunity_tree" model="ir.ui.view">
+        <record id="view_report_crm_opportunity_tree" model="ir.ui.view">
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
@@ -246,11 +246,11 @@
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
             groups="base.group_extended"
-           parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
+            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
             groups="base.group_extended"
-           parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
+            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
 </openerp>

From 696233dfd628c15e1b714a1edca7c3843a361e72 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 1 Oct 2010 20:13:57 +0530
Subject: [PATCH 005/294] [IMP]: Project module-task menu :Project View-red for
 ovepassed deadline

bzr revid: ron@tinyerp.com-20101001144357-lzmauail17hoytdc
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6efc64dd494..4be52e78c1e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,7 +112,7 @@
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1">
                             <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/>
-                       </field> 
+                       </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
@@ -302,7 +302,7 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&gt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline &lt;current_date) and (state not in ('done'));" string="Tasks">
                     <field name="id"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>

From 62eaa71eb81977d74951f571cd8be091e4a578f3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:17:57 +0530
Subject: [PATCH 006/294] [IMP]: crm_claim, crm_fundraising, crm_helpdesk:
 Aligned tags properly in xml

bzr revid: rpa@tinyerp.com-20101004054757-1nls44mg0jicj1rs
---
 addons/crm_claim/crm_claim_data.xml           |   8 +-
 addons/crm_claim/crm_claim_view.xml           |  90 ++++++-------
 .../report/crm_claim_report_view.xml          |  97 +++++++-------
 .../crm_fundraising/crm_fundraising_data.xml  |  40 +++---
 .../crm_fundraising/crm_fundraising_menu.xml  |   4 +-
 .../crm_fundraising/crm_fundraising_view.xml  |   4 +-
 .../report/crm_fundraising_report_view.xml    | 124 ++++++++----------
 addons/crm_helpdesk/crm_helpdesk_menu.xml     |  62 ++++-----
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  22 ++--
 .../report/crm_helpdesk_report_view.xml       | 108 +++++++--------
 10 files changed, 267 insertions(+), 292 deletions(-)

diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index fc387658c97..cb41f1bf21e 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -31,7 +31,7 @@
         <record model="crm.case.resource.type" id="type_claim1">
             <field name="name">Corrective</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-        </record>    
+        </record>
         
         <record model="crm.case.resource.type" id="type_claim2">
             <field name="name">Preventive</field>
@@ -46,7 +46,7 @@
             <field name="name">Accepted as Claim</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-        </record>    
+        </record>
         
         <record model="crm.case.stage" id="stage_claim2">
             <field name="name">Fixed</field>
@@ -58,13 +58,13 @@
             <field name="name">Won't fix</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-        </record>    
+        </record>
         
         <record model="crm.case.stage" id="stage_claim4">
             <field name="name">Invalid</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-        </record>    
+        </record>
         
         <record model="crm.case.stage" id="stage_claim5">
             <field name="name">Awaiting Response</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6b5f21df920..5ba80dfa68e 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -251,66 +251,66 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="terp-check" string="Current" name="current"
-                       domain="[('state','in',('draft', 'open'))]"
-                       separator="1" help="Draft and Open Claims" default="1"
-                   />
-                   <filter icon="terp-camera_test"
-                       string="In Progress"
-                       domain="[('state','=','open')]"
-                       separator="1" help="In Progress Claims"
-                   />
-                   <filter icon="terp-gtk-media-pause"
-                       string="Pending"
-                       domain="[('state','=','pending')]"
-                       separator="1" help="All pending Claims"
-                   />
-                   <separator orientation="vertical"/>
-                   <field name="name" select='1'/>
-                   <field name="partner_id" select="1"/>
-                   <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-personal-"
-                               domain="[('user_id','=', False)]"
-                               help="Unassigned Claims" />
-                   </field>
-                   <field name="section_id" select="1"
-                       widget="selection">
-                       <filter icon="terp-personal+"
+                    <filter icon="terp-check" string="Current" name="current"
+                        domain="[('state','in',('draft', 'open'))]"
+                        separator="1" help="Draft and Open Claims" default="1"
+                    />
+                    <filter icon="terp-camera_test"
+                        string="In Progress"
+                        domain="[('state','=','open')]"
+                        separator="1" help="In Progress Claims"
+                    />
+                    <filter icon="terp-gtk-media-pause"
+                        string="Pending"
+                        domain="[('state','=','pending')]"
+                        separator="1" help="All pending Claims"
+                    />
+                    <separator orientation="vertical"/>
+                    <field name="name" select='1'/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-personal-"
+                                domain="[('user_id','=', False)]"
+                                help="Unassigned Claims" />
+                    </field>
+                    <field name="section_id" select="1"
+                        widget="selection">
+                        <filter icon="terp-personal+"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My section" />
                     </field>
-                   <newline/>
-                   <group expand="0" string="Group By...">
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
-                           domain="[]" help="Partner"
-                           context="{'group_by':'partner_id'}" />
+                            domain="[]" help="Partner"
+                            context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal"
-                           domain="[]" help="Responsible User"
-                           context="{'group_by':'user_id'}" />
+                            domain="[]" help="Responsible User"
+                            context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                           domain="[]" help="Sales Team"
-                           context="{'group_by':'section_id'}" />
+                            domain="[]" help="Sales Team"
+                            context="{'group_by':'section_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Stage" icon="terp-stage"
                             domain="[]" context="{'group_by':'stage_id'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                       <filter string="State"
+                        <filter string="State"
                             icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Claim Date" icon="terp-go-month"
-                           domain="[]" help="Claim Date"
-                           context="{'group_by':'date'}" />
-                       <filter string="Deadline" icon="terp-go-month"
-                           domain="[]"
-                           context="{'group_by':'date_deadline'}" />
-                       <filter string="Closure" icon="terp-go-month"
-                           domain="[]" help="Date Closed"
-                           context="{'group_by':'date_closed'}" />
-                   </group>
-               </search>
-           </field>
+                            domain="[]" help="Claim Date"
+                            context="{'group_by':'date'}" />
+                        <filter string="Deadline" icon="terp-go-month"
+                            domain="[]"
+                            context="{'group_by':'date_deadline'}" />
+                        <filter string="Closure" icon="terp-go-month"
+                            domain="[]" help="Date Closed"
+                            context="{'group_by':'date_closed'}" />
+                    </group>
+                </search>
+            </field>
         </record>
 
         <act_window
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5eeecf3d3ad..f75f9c1eb53 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -77,54 +77,54 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                           <filter string="  Year  " icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Claims created in current year"/>
+                        <filter string="  Year  " icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Claims created in current year"/>
 
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                           help="Claims created in current month"/>
+                        <filter string="   Month   " icon="terp-go-month" name="This Month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            help="Claims created in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Claims created in last month"/>
 
-                           <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="Draft"
                             domain="[('state','=','draft')]"/>
-                       <filter icon="terp-camera_test"
+                        <filter icon="terp-camera_test"
                             string="Open"
                             domain="[('state','=','open')]"/>
-                       <filter icon="terp-gtk-media-pause"
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
 
-                           <separator orientation="vertical" />
-                              <field name="section_id" string="Sales Team"
-                               default="context.get('section_id', False)"
-                               context="{'invisible_section': False}">
+                        <separator orientation="vertical" />
+                        <field name="section_id" string="Sales Team"
+                            default="context.get('section_id', False)"
+                            context="{'invisible_section': False}">
 
-                               <filter icon="terp-personal+"
-                                   context="{'invisible_section': False}"
-                                   domain="[('section_id.user_id','=',uid)]"
-                                   help="My team" />
+                            <filter icon="terp-personal+"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id','=',uid)]"
+                                help="My team" />
 
-                           </field>
-                           <field name="company_id">
-                           <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
+                        </field>
+                        <field name="company_id">
+                            <filter icon="terp-go-home"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id.company_id','=',uid)]"
+                                help="My company"/>
                         </field>
 
-                      	<field name="user_id" string="Salesman" select="1">
-	            			<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-               			</field>
-                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
+                        <field name="user_id" string="Salesman" select="1">
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
                         <filter icon="gtk-cancel"
@@ -138,33 +138,33 @@
                             <field name="priority" />
                             <field name="type_action" />
                         </group>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group  expand="1" string="Group By...">
                         <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                            
+
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
-                             context="{'group_by':'stage_id'}" />
+                            context="{'group_by':'stage_id'}" />
                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                             context="{'group_by':'priority'}" />
+                            context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
-                             context="{'group_by':'type_action'}" />
+                            context="{'group_by':'type_action'}" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        
+
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"
@@ -177,8 +177,8 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" 
                             help="Year of claim"/>
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -188,30 +188,29 @@
             <field name="name">Claims Analysis</field>
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
-              <field name="view_mode">tree,graph</field>
-              <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
-
         </record>
 
-           <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
+        <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
-           <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
+        <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_report_crm_claim_graph"/>
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
-       <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
-           groups="base.group_extended"
-           action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
+        <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
+            groups="base.group_extended"
+            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 
     </data>
diff --git a/addons/crm_fundraising/crm_fundraising_data.xml b/addons/crm_fundraising/crm_fundraising_data.xml
index 03613d87a7f..cb0cb5fd24a 100644
--- a/addons/crm_fundraising/crm_fundraising_data.xml
+++ b/addons/crm_fundraising/crm_fundraising_data.xml
@@ -3,56 +3,56 @@
 <data noupdate="1">
 
         <!--    FUNDRAISING CATEGORY(categ_id)        -->
-        
+
     <record model="crm.case.categ" id="categ_fund1">
         <field name="name">Social Rehabilitation And Rural Upliftment</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
-    
+
     <record model="crm.case.categ" id="categ_fund2">
         <field name="name">Learning And Education</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>      
-    </record>    
-    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
+
     <record model="crm.case.categ" id="categ_fund3">
         <field name="name">Healthcare</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>         
-    </record>        
-    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
+
     <record model="crm.case.categ" id="categ_fund4">
         <field name="name">Arts And Culture</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>         
-    </record>    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
 
         <!--    CASE Resource(type_id)        -->
-        
+
     <record model="crm.case.resource.type" id="type_fund1">
         <field name="name">Cash</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-       	<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>  
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
-    
+
     <record model="crm.case.resource.type" id="type_fund2">
         <field name="name">Cheque</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
-    </record>        
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
 
     <record model="crm.case.resource.type" id="type_fund3">
         <field name="name">Credit Card</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
-    
+
     <record model="crm.case.resource.type" id="type_fund4">
         <field name="name">Demand Draft</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
-    </record>    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index ea94e8be92a..cd54a11e615 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -40,8 +40,8 @@
     </record>
 
     <menuitem name="Fund Raising" id="menu_crm_case_fund_raise"
-    	parent="base.menu_fundrising"
-    	action="crm_case_category_act_fund_all1" sequence="1" />
+        parent="base.menu_fundrising"
+        action="crm_case_category_act_fund_all1" sequence="1" />
 
 </data>
 </openerp>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6bcf019dabe..c7788e0449f 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -3,8 +3,8 @@
     <data>
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
-        groups="base.group_extended"
-        parent="base.menu_base_config" sequence="8" />
+            groups="base.group_extended"
+            parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index ab90f7ad0c1..62da63c1129 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -9,15 +9,15 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Fundraising">
-	              	<field name="name" invisible="1"/>
-					<field name="month" invisible="1"/>
-					<field name="section_id" invisible="1"/>
+                <tree string="Fundraising">
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-    				<field name="company_id" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                	<field name="nbr" string='#Fundraising' sum="#Fundraising"/>
-                	<field name="planned_cost"  sum='Planned Costs'/>
+                    <field name="nbr" string='#Fundraising' sum="#Fundraising"/>
+                    <field name="planned_cost"  sum='Planned Costs'/>
                     <field name="amount_revenue"  sum='Est.Revenue'/>
                     <field name="probability" avg='Avg. Probability' widget="progressbar"/>
                     <field name="amount_revenue_prob" sum='Est. Rev*Prob.'/>
@@ -26,7 +26,7 @@
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="type_id" invisible="1"/>
-               </tree>
+                </tree>
             </field>
 
 <!-- Fundraising by user and section Form View-->
@@ -37,11 +37,11 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Cases">
+                <form string="Cases">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
+                    <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="delay_close"/>
                     <field name="amount_revenue"/>
@@ -75,78 +75,67 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                   		<filter string="  Year  " icon="terp-go-year"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                   			help="Funds raised in current year"/>
-
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                    	   help="Funds raised in current month"/>
-
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                    <group col="16" colspan="8">
+                        <filter string="  Year  " icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Funds raised in current year"/>
+                        <filter string="   Month   " icon="terp-go-month" name="This Month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            help="Funds raised in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Funds raised in last month"/>
-
-                   		<separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-camera_test"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-gtk-media-pause"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
-
-                   		<separator orientation="vertical" />
-                   		<field name="section_id" string="Sales Team"
-                   			default="context.get('section_id', False)"
-                   			context="{'invisible_section': False}">
-
-                   			<filter icon="terp-personal+"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My team" />
-
-                   		</field>
-                   		<field name="company_id">
-                           <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
+                            string="Draft"
+                            domain="[('state','=','draft')]"/>
+                        <filter icon="terp-camera_test"
+                            string="Open"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
+                            string="Pending"
+                            domain="[('state','=','pending')]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id" string="Sales Team"
+                            default="context.get('section_id', False)"
+                            context="{'invisible_section': False}">
+                            <filter icon="terp-personal+"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id','=',uid)]"
+                                help="My team" />
                         </field>
-
-                      	<field name="user_id" select="1" string="Salesman">
-	            			<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-               			</field>
-                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
+                        <field name="company_id">
+                            <filter icon="terp-go-home"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id.company_id','=',uid)]"
+                                help="My company"/>
+                        </field>
+                        <field name="user_id" select="1" string="Salesman">
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
                         <filter icon="gtk-cancel"
                             string="Cancel"
                             domain="[('state','=','cancel')]"/>
-
                         <group>
                             <separator orientation="vertical"/>
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                         </group>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
+                        </group>
+                    </group>
+                    <newline/>
+                    <group  expand="1" string="Group By...">
                         <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-
                         <separator orientation="vertical" />
-                         <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
@@ -157,20 +146,17 @@
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
-                            
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"
                             help="Date of fundraising"/>
-
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" 
                             help="Month of fundraising"/>
-
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 867c8358c83..5a4e9df19bc 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    <menuitem id="base.menu_aftersale" name="After-Sale Services"
-    	parent="base.menu_base_partner" sequence="7" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services"
+            parent="base.menu_base_partner" sequence="7" />
 
 <!-- Help Desk (menu) -->
 
-    <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
-        <field name="name">Helpdesk Requests</field>
-        <field name="res_model">crm.helpdesk</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
-        <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
-        <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
-    </record>
+        <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
+            <field name="name">Helpdesk Requests</field>
+            <field name="res_model">crm.helpdesk</field>
+            <field name="view_mode">tree,calendar,form</field>
+            <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
+            <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+            <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
+            <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
+            <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">calendar</field>
+            <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
+            <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_form_view_helpdesk"/>
+            <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+        </record>
 
-    <menuitem name="Helpdesk and Support" id="menu_help_support_main"
-    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
+        <menuitem name="Helpdesk and Support" id="menu_help_support_main"
+            parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0531092dd98..832f1f0782e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -255,14 +255,14 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
-                           domain="[]" help="Partner"
-                           context="{'group_by':'partner_id'}" />
+                            domain="[]" help="Partner"
+                            context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal"
-                           domain="[]" help="Responsible User"
-                           context="{'group_by':'user_id'}" />
+                            domain="[]" help="Responsible User"
+                            context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                           domain="[]" help="Sales Team"
-                           context="{'group_by':'section_id'}" />
+                            domain="[]" help="Sales Team"
+                            context="{'group_by':'section_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
@@ -270,11 +270,11 @@
                             context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
-                           domain="[]" help="Request Date"
-                           context="{'group_by':'date'}" />
-                       <filter string="Deadline" icon="terp-go-month"
-                           domain="[]"
-                           context="{'group_by':'date_deadline'}" />
+                            domain="[]" help="Request Date"
+                            context="{'group_by':'date'}" />
+                        <filter string="Deadline" icon="terp-go-month"
+                            domain="[]"
+                            context="{'group_by':'date_deadline'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9490172e3e8..9c3bb97d67e 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.helpdesk.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-           <tree string="Helpdesk">
+                <tree string="Helpdesk">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -38,16 +38,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cases">
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
-					<field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
-					<field name="nbr" select="1"/>
-					<field name="delay_close"/>
-					<field name="amount_revenue"/>
-					<field name="amount_revenue_prob"/>
-					<field name="probability"/>
-					<field name="state" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
@@ -75,8 +75,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="9">
-               			<filter string="  Year  " icon="terp-go-year"
+                    <group col="16" colspan="9">
+                        <filter string="  Year  " icon="terp-go-year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
@@ -85,46 +85,40 @@
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in last month"/>
-
-                   		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-check"
-                   			domain="[('state','in',('open','draft'))]" />
-
-                   		<filter string="Won" icon="terp-check"
-                   			domain="[('state','=','done')]" />
-
-                   		<filter string="Lost" icon="terp-dialog-close"
-                   			domain="[('state','=','cancel')]" />
-
-                   		<separator orientation="vertical" />
-                   		<field name="section_id" string="Sales Team"
-                   			default="context.get('section_id', False)"
-                   			context="{'invisible_section': False}">
-
-                   			<filter icon="terp-personal+"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My team" />
-
-                   		</field>
-                   		<field name="company_id">
-                        <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
+                        <separator orientation="vertical" />
+                        <filter string="Current" icon="terp-check"
+                        domain="[('state','in',('open','draft'))]" />
+                        <filter string="Won" icon="terp-check"
+                        domain="[('state','=','done')]" />
+                        <filter string="Lost" icon="terp-dialog-close"
+                        domain="[('state','=','cancel')]" />
+                        <separator orientation="vertical" />
+                        <field name="section_id" string="Sales Team"
+                            default="context.get('section_id', False)"
+                            context="{'invisible_section': False}">
+                            <filter icon="terp-personal+"
+                            context="{'invisible_section': False}"
+                            domain="[('section_id.user_id','=',uid)]"
+                            help="My team" />
                         </field>
-                         <field name="user_id" string="Salesman">
-                         <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                         </field>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                         <field name="priority" string="Priority"/>
-                         <field name="categ_id"/>
-                         <field name="date_closed" string="Close Date"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                        <field name="company_id">
+                            <filter icon="terp-go-home"
+                            context="{'invisible_section': False}"
+                            domain="[('section_id.user_id.company_id','=',uid)]"
+                            help="My company"/>
+                        </field>
+                        <field name="user_id" string="Salesman">
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                        <field name="priority" string="Priority"/>
+                        <field name="categ_id"/>
+                        <field name="date_closed" string="Close Date"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
@@ -134,21 +128,17 @@
                         <filter string="Partner" icon="terp-partner"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
-                            
                         <separator orientation="vertical" />
                         <filter string="Channel" icon="terp-call-start"
                             domain="[]"
-                            context="{'group_by':'canal_id'}" />
-                            
+                        context="{'group_by':'canal_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
-                       
                         <separator orientation="vertical" />
                         <filter string="Company" icon="terp-go-home" 
                             domain="[]"
                             context="{'group_by':'company_id'}" />
-                            
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
@@ -156,8 +146,8 @@
                             domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 

From db4cff544283adad0af2a53b06fa502aa8c5def0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:33:16 +0530
Subject: [PATCH 007/294] [IMP]: crm_claim: Improvement in claims reporting
 search view

bzr revid: rpa@tinyerp.com-20101004060316-gpjo32q7eruxxn0j
---
 addons/crm_claim/report/crm_claim_report.py   |  4 +++-
 .../report/crm_claim_report_view.xml          | 24 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 65e9f3e7e08..f03a5f75d12 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -70,7 +70,8 @@ class crm_claim_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
-        'date_closed': fields.date('Closed', readonly=True), 
+        'date_closed': fields.date('Close Date', readonly=True), 
+        'date_deadline': fields.date('Deadline', readonly=True), 
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
     }
 
@@ -89,6 +90,7 @@ class crm_claim_report(osv.osv):
                     to_char(c.date, 'MM') as month,
                     to_char(c.date, 'YYYY-MM-DD') as day,
                     to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
+                    to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline,
                     c.state,
                     c.user_id,
                     c.stage_id,
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index f75f9c1eb53..35333e03360 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -130,14 +130,17 @@
                         <filter icon="gtk-cancel"
                             string="Cancel"
                             domain="[('state','=','cancel')]"/>
-                        <group>
-                            <separator orientation="vertical"/>
-                            <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                            <separator orientation="vertical"/>
-                            <field name="priority" />
-                            <field name="type_action" />
-                        </group>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="priority" />
+                        <field name="type_action" />
+                        <newline/>
+                        <field name="date_closed" />
+                        <field name="date_deadline" />
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
@@ -146,7 +149,8 @@
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-
+                        <filter string="Partner" name="partner" icon="terp-partner"
+                            domain="[]" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
                             context="{'group_by':'stage_id'}" />
@@ -157,7 +161,7 @@
 
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'type_action'}" />
+                            context="{'group_by':'type_action'}" help="Action Type"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />

From b6e10c5eb31b58c4c1500edbfa46902e196c94a0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:47:01 +0530
Subject: [PATCH 008/294] [IMP,REM]: crm: Aligned tags properly + Removed type
 field from extended options

bzr revid: rpa@tinyerp.com-20101004061701-w8xc8rc0n3fz3rji
---
 .../crm/report/crm_phonecall_report_view.xml  | 70 +++++++++----------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 0f5452ad736..9ba923b2d3b 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.phonecall.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree string="Phone calls">
+                <tree string="Phone calls">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -41,7 +41,7 @@
                     <field name="user_id" select="1"/>
                     <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
-                   <field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -73,20 +73,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                           <filter string="  Year  " icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                           help="Phone calls made in current month"/>
-
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                    <group col="16" colspan="8">
+                        <filter string="  Year  " icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Phone calls made in current year"/>
+                        <filter string="   Month   " icon="terp-go-month" name="This Month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            help="Phone calls made in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
-
-                           <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
@@ -99,40 +96,37 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                      <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
-                            context="{'invisible_section': False}">               
-                       <filter icon="terp-personal+"
-                           context="{'invisible_section': False}"
-                           domain="[('section_id.user_id','=',uid)]"
-                           help="My team" />
-                        </field>   
-                          <field name="user_id" string="Salesman" select="1">
+                            context="{'invisible_section': False}">
+                            <filter icon="terp-personal+"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id','=',uid)]"
+                                help="My team" />
+                        </field>
+                        <field name="user_id" string="Salesman" select="1">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                           </field>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                      <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="categ_id" widget="selection" string="Type"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]" />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                        <field name="partner_id"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
-                           <newline/>
+                        <newline/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection"
@@ -150,8 +144,8 @@
                             domain="[]" context="{'group_by':'month'}" help="Month of call"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Year of call"/>
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -168,7 +162,7 @@
             <field name="help">Get an anlysis of Phone Calls number and delay to close, stage, user suits to different groups for a global or a fine grained analysis.</field>
         </record>
 
-           <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
+        <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>

From 8bd51e471cd0c5d9798f73d793551b54200b7c2d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:50:49 +0530
Subject: [PATCH 009/294] [IMP]: crm_helpdesk: Minor improvement in helpdesk
 report search view

bzr revid: rpa@tinyerp.com-20101004062049-17d2y52qht1ct1bj
---
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9c3bb97d67e..2274b0cc8a6 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -115,6 +115,7 @@
                     <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
+                        <newline/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
                     <newline/>

From 38b850825ce6c074d7c120c305ed9c1b3e076c16 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:52:35 +0530
Subject: [PATCH 010/294] [IMP]: crm: Minor improvement in leads search view

bzr revid: rpa@tinyerp.com-20101004062235-wpxoz0ev6re012q7
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c1e37445c6c..3afea6c5081 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -348,7 +348,7 @@
                     <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
                     <filter string="Campaign" icon="terp-stock_symbol-selection"
                         domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-stock_symbol-selection"
+                    <filter string="Channel" icon="terp-call-start"
                         domain="[]" context="{'group_by':'channel_id'}" />
                     <separator orientation="vertical"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>

From e345b7702f2aa6d5c818a345180a12e646493b26 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 12:42:42 +0530
Subject: [PATCH 011/294] [IMP]: event: Event menus should also be displayed in
 "Association Application"

bzr revid: rpa@tinyerp.com-20101004071242-q2kmys4kkgeuaz1n
---
 addons/event/event_view.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f58a948fad2..b016dbef9f9 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
+
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
+        <menuitem name="Events Organisation" id="base.menu_event_association" parent="base.menu_association" />
 
     <!-- EVENTS  -->
 
@@ -34,7 +38,10 @@
             <field name="view_type">form</field>
         </record>
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
+        <menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
+
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
+        <menuitem name="Types of Events" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -277,6 +284,7 @@
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
+       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_event_association" />
 
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -500,6 +508,12 @@
             name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
             action="action_registration"/>
+
+        <menuitem
+            name="Registrations"
+            id="menu_action_registration_association" parent="base.menu_event_association"
+            action="action_registration"/>
+
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
     </data>
 </openerp>

From d5b94c8d65264b4aa437c2dc011ee8a6bae2ced1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 14:32:10 +0530
Subject: [PATCH 012/294] [FIX]: base_calendars: Fixed queries

bzr revid: rpa@tinyerp.com-20101004090210-5ulpavop0kavjwfl
---
 addons/base_calendar/base_calendar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index b71e2daa447..49393f76349 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -724,7 +724,7 @@ true, it will allow you to hide the event alarm information without removing it.
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
                 cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
-                            where id=%%d' % model_obj._table,(datas.id,))
+                            where id=%%s' % model_obj._table,(datas.id,))
         return True
 
 res_alarm()
@@ -978,7 +978,7 @@ class calendar_event(osv.osv):
         if not context:
             context = {}
         for event_id in ids:
-            cr.execute('select id from %s  where recurrent_uid=%s' % (self._table, event_id))
+            cr.execute('select id from %s  where recurrent_uid=%s' , (self._table, event_id))
             r_ids = map(lambda x: x[0], cr.fetchall())
             self.unlink(cr, uid, r_ids, context=context)
         return True

From d910cbd863048ea22236b42136e574c9cb8499df Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 15:11:09 +0530
Subject: [PATCH 013/294] [FIX]: crm: Corrected typo in crm data

bzr revid: rpa@tinyerp.com-20101004094109-91ce7ri65b0kcg48
---
 addons/crm/crm_opportunity_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index 6726714fd04..c2f750c29d1 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -2,12 +2,12 @@
 <openerp>
 <data noupdate="1">
     <record model="crm.case.categ" id="categ_oppor1">
-        <field name="name">Interrest in Computer</field>
+        <field name="name">Interest in Computer</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor2">
-        <field name="name">Interrest in Accessories</field>
+        <field name="name">Interest in Accessories</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>

From 43642c4ca6456da85f101e4d3a818ae706665bc0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 18:32:04 +0530
Subject: [PATCH 014/294] [FIX]: base_calendar: Fixed sql query

bzr revid: rpa@tinyerp.com-20101004130204-kbj85avouuq4d0oc
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 49393f76349..88ee1a8ec33 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -978,7 +978,7 @@ class calendar_event(osv.osv):
         if not context:
             context = {}
         for event_id in ids:
-            cr.execute('select id from %s  where recurrent_uid=%s' , (self._table, event_id))
+            cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,))
             r_ids = map(lambda x: x[0], cr.fetchall())
             self.unlink(cr, uid, r_ids, context=context)
         return True

From fdc839079f63171745b9dc18d86035d74b6c0a2c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 4 Oct 2010 18:40:33 +0530
Subject: [PATCH 015/294] [FIX]:Issue Menu:-Issue will be Convert Task Only
 when Issue in To Do State  -- progressbar on issue to related with task
 progressbar >> Long Term Planning Menu:The Gantt View Display Phase Name
 ---calender view and Gantt View Display All Phases

bzr revid: ron@tinyerp.com-20101004131033-czvqbsgeebo2wu0w
---
 addons/project/project.py                     | 15 ++-
 addons/project_issue/project_issue.py         | 95 +++++++++++--------
 .../project_long_term_view.xml                |  8 +-
 3 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 996e79a1f8b..75be42823bd 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -316,7 +316,7 @@ class project(osv.osv):
             if child_ids:
                 self.setActive(cr, uid, child_ids, value, context=None)
         return True
-    
+
 project()
 
 class users(osv.osv):
@@ -523,7 +523,7 @@ class task(osv.osv):
         if not project_id: return False
         task = self.browse(cr, uid, project_id, context=context)
         project = task.project_id
-        res = self.do_close(cr, uid, [project_id], context=context) 
+        res = self.do_close(cr, uid, [project_id], context=context)
         if project.warn_manager or project.warn_customer:
            return {
                 'name': _('Send Email after close task'),
@@ -534,7 +534,7 @@ class task(osv.osv):
                 'target': 'new',
                 'nodestroy': True,
                 'context': {'active_id': task.id}
-           } 
+           }
         return res
 
     def do_close(self, cr, uid, ids, context=None):
@@ -576,6 +576,8 @@ class task(osv.osv):
         if context is None:
             context = {}
         request = self.pool.get('res.request')
+        p_issue = self.pool.get('project.issue')
+
         for task in self.browse(cr, uid, ids, context=context):
             project = task.project_id
             if project and project.warn_manager and project.user_id.id and (project.user_id.id != uid):
@@ -590,10 +592,15 @@ class task(osv.osv):
                 })
 
             self.write(cr, uid, [task.id], {'state': 'open'})
+            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
+            p_issue.write(cr, uid,issue_id, {'progress':0.0})
+
         return True
 
     def do_cancel(self, cr, uid, ids, *args):
         request = self.pool.get('res.request')
+        p_issue = self.pool.get('project.issue')
+        print "Cancel"
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
             project = task.project_id
@@ -609,7 +616,9 @@ class task(osv.osv):
                 })
             message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
             self.log(cr, uid, task.id, message)
+            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
             self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
+            p_issue.write(cr, uid,issue_id, {'progress':100.0})
         return True
 
     def do_open(self, cr, uid, ids, *args):
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2788b59ed7d..6496e93f2e9 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -141,7 +141,7 @@ class project_issue(crm.crm_case, osv.osv):
                 else:
                     res[issue.id][field] = abs(float(duration))
         return res
-    
+
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=128, required=True),
@@ -220,48 +220,59 @@ class project_issue(crm.crm_case, osv.osv):
         data_obj = self.pool.get('ir.model.data')
         task_obj = self.pool.get('project.task')
 
-        if context is None:
-            context = {}
 
-        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
-        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        for curr_task in case_obj.browse(cr, uid,ids):
+            if curr_task.state in ['open']:
+                if context is None:
+                    context = {}
+                result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+                res = data_obj.read(cr, uid, result, ['res_id'])
+                id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+                id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+                if id2:
+                    id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                if id3:
+                    id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-        for bug in case_obj.browse(cr, uid, ids, context=context):
-            new_task_id = task_obj.create(cr, uid, {
-                'name': bug.name,
-                'partner_id': bug.partner_id.id,
-                'description':bug.description,
-                'date': bug.date,
-                'project_id': bug.project_id.id,
-                'priority': bug.priority,
-                'user_id': bug.assigned_to.id,
-                'planned_hours': 0.0,
-            })
+                for bug in case_obj.browse(cr, uid, ids, context=context):
+                    new_task_id = task_obj.create(cr, uid, {
+                        'name': bug.name,
+                        'partner_id': bug.partner_id.id,
+                        'description':bug.description,
+                        'date': bug.date,
+                        'project_id': bug.project_id.id,
+                        'priority': bug.priority,
+                        'user_id': bug.assigned_to.id,
+                        'planned_hours': 0.0,
+                    })
 
-            vals = {
-                'task_id': new_task_id,
-                'state':'open'
-            }
-            case_obj.write(cr, uid, [bug.id], vals)
+                    vals = {
+                        'task_id': new_task_id,
+                        'state':'open'
+                    }
+                    case_obj.write(cr, uid, [bug.id], vals)
+
+                return  {
+                    'name': _('Tasks'),
+                    'view_type': 'form',
+                    'view_mode': 'form,tree',
+                    'res_model': 'project.task',
+                    'res_id': int(new_task_id),
+                    'view_id': False,
+                    'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                    'type': 'ir.actions.act_window',
+                    'search_view_id': res['res_id'],
+                    'nodestroy': True
+                        }
+            elif curr_task.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
+Issue Could not convert into Task"))
+                return True
+            else:
+                raise osv.except_osv(_("Warning !"), _("Issue should be in \
+\'To Do\'  state before converting to Task."))
+                return True
 
-        return  {
-            'name': _('Tasks'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'project.task',
-            'res_id': int(new_task_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'],
-            'nodestroy': True
-        }
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
         data_obj = self.pool.get('ir.model.data')
@@ -288,11 +299,11 @@ class project_issue(crm.crm_case, osv.osv):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{}}
-    
+
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
         if context is None:
             context = {}
-        result = {}    
+        result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context)
@@ -442,7 +453,7 @@ class project_issue(crm.crm_case, osv.osv):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not context:
             context={}
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3412ba7ca08..c7122726f75 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -15,7 +15,7 @@
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                   <field name="useability" string="Availability"/>
+                   <field name="phase_id" string="Phase Name"/>
                 </level>
               </gantt>
             </field>
@@ -326,7 +326,7 @@
     # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
-    
+
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
@@ -348,8 +348,8 @@
                     <field name="phase_id" select="1"/>
                 </field>
             </field>
-        </record>   
-    
+        </record>
+
     <act_window
         id="project_phase_task_list"
         name="Related Tasks"

From 88bb23100c3157e01aebeae02c05c92c8f5fcac2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 5 Oct 2010 11:25:23 +0530
Subject: [PATCH 016/294] [FIX]: crm: Fixed error on group by Creation

bzr revid: rpa@tinyerp.com-20101005055523-iaz0qyjrld74wth6
---
 addons/crm/crm_phonecall_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index afc6edd5295..8b8578f28a7 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -31,6 +31,7 @@
                 <field name="partner_phone"/>
                 <field name="user_id"/>
                 <field name="categ_id" string="Type"/>
+                <field name="create_date" invisible="1"/>
                 <button string="Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"

From 7dc1dca97eeda249b926767a984400ea7ac08cc3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 5 Oct 2010 12:18:31 +0530
Subject: [PATCH 017/294] [IMP]: crm*: Added filter button of My Sales Team in
 extended view + Put proper tooltip for My Sales Team

bzr revid: rpa@tinyerp.com-20101005064831-6t6oxw79ow16b21l
---
 addons/crm/crm_lead_view.xml                                | 4 ++--
 addons/crm/crm_meeting_view.xml                             | 2 +-
 addons/crm/crm_opportunity_view.xml                         | 4 ++--
 addons/crm/crm_phonecall_view.xml                           | 2 +-
 addons/crm/report/crm_lead_report_view.xml                  | 6 +++---
 addons/crm/report/crm_phonecall_report_view.xml             | 4 ++--
 addons/crm_claim/crm_claim_view.xml                         | 4 ++--
 addons/crm_claim/report/crm_claim_report_view.xml           | 4 ++--
 addons/crm_fundraising/crm_fundraising_view.xml             | 4 ++--
 .../crm_fundraising/report/crm_fundraising_report_view.xml  | 4 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml                   | 4 ++--
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml     | 4 ++--
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3afea6c5081..fc7a7dfdb73 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -315,11 +315,11 @@
                 </field>
                 <field name="section_id" default="context.get('section_id', False)" widget="selection"
                     context="{'invisible_section': False}">
-                    <filter icon="terp-personal+"
+                    <filter icon="terp-personal+" groups="base.group_extended"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team(s)"/>
-                    <filter icon="terp-personal+"
+                    <filter icon="terp-personal+" groups="base.group_extended"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 2821024bfbf..98376da43a1 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -311,7 +311,7 @@
                            <separator orientation="vertical"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
-                               <filter icon="terp-personal+"
+                               <filter icon="terp-personal+" groups="base.group_extended"
                                    domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b52694d8b20..52aedec68df 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -302,11 +302,11 @@
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}"
                             widget="selection">
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                                 domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                 context="{'invisible_section': False}"
                                 help="My Sales Team(s)" />
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
                                 domain="[]"
                                 help="Show Sales Team"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 8b8578f28a7..d5a63c7c9e6 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -272,7 +272,7 @@
                </field>
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
+                   <filter icon="terp-personal+" groups="base.group_extended"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 64e410e16b5..aa0b437aa83 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -99,10 +99,10 @@
                         <field name="section_id"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My team" />
+                                help="My Sales Team(s)" />
                         </field>
                         <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
@@ -128,7 +128,7 @@
                         <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
+                            domain="[]" 
                             context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 9ba923b2d3b..d3c513ad143 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -100,10 +100,10 @@
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My team" />
+                                help="My Sales Team(s)" />
                         </field>
                         <field name="user_id" string="Salesman" select="1">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 5ba80dfa68e..ea1d9e543ff 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -275,9 +275,9 @@
                     </field>
                     <field name="section_id" select="1"
                         widget="selection">
-                        <filter icon="terp-personal+"
+                        <filter icon="terp-personal+" groups="base.group_extended"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My section" />
+                            help="My Sales Team(s)" />
                     </field>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 35333e03360..893efdfac46 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -105,10 +105,10 @@
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
 
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My team" />
+                                help="My Sales Team(s)" />
 
                         </field>
                         <field name="company_id">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index c7788e0449f..0cd8f7aae49 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -273,9 +273,9 @@
                                     help="Unassigned" />
                             </field>
                             <field name="section_id" select="1" widget="selection" string="Sales Team">
-                                <filter icon="terp-personal+"
+                                <filter icon="terp-personal+" groups="base.group_extended"
                                     domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="My section" />
+                                    help="My Sales Team(s)" />
                             </field>
                         </group>
                         <newline/>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 62da63c1129..3e4064614fe 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -99,10 +99,10 @@
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My team" />
+                                help="My Sales Team(s)" />
                         </field>
                         <field name="company_id">
                             <filter icon="terp-go-home"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 832f1f0782e..bc4e9c61008 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -248,9 +248,9 @@
                     <field name="partner_id" />
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
+                        <filter icon="terp-personal+" groups="base.group_extended"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My section" />
+                            help="My Sales Team(s)" />
                     </field>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2274b0cc8a6..125f977d333 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -96,10 +96,10 @@
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                            <filter icon="terp-personal+" groups="base.group_extended"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
-                            help="My team" />
+                            help="My Sales Team(s)" />
                         </field>
                         <field name="company_id">
                             <filter icon="terp-go-home"

From c4526df82a16634d09c34f2943e384140c51e6ab Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Oct 2010 13:01:06 +0530
Subject: [PATCH 018/294] [ADD]:Project->Time Tracking->Add Partner Invoices
 Menu

bzr revid: ron@tinyerp.com-20101005073106-4x1lvc7kcaztzb60
---
 addons/account/account_invoice_view.xml   | 19 +++++++++++++++++++
 addons/hr_timesheet/hr_timesheet_view.xml |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1db17ed16cf..634caa86e75 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
+        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
+                  parent="base.menu_main_pm" sequence="3"/>
 
         <!--
         Invoices
@@ -436,6 +439,20 @@
             <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
 
+        <record id="action_invoice_tree_partner" model="ir.actions.act_window">
+            <field name="name">Partner Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field eval="False" name="view_id"/>
+            <field name="domain">[('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
+        </record>
+
+
+
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
@@ -448,7 +465,9 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
+
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
+        <menuitem action="action_invoice_tree_partner" id="menu_action_invoice_tree1_project" parent="base.menu_project_management_time_tracking" sequence="100"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Vendor Invoices</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 4165f71d73f..d7138f9137f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -81,8 +81,8 @@
                         <filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>                        
-                    </group>                     
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
 

From f1294bdcd6bba05145c3562dd2499857992f0204 Mon Sep 17 00:00:00 2001
From: "ssi (Open ERP)" <ssi@tinyerp.com>
Date: Tue, 5 Oct 2010 14:53:08 +0530
Subject: [PATCH 019/294] [IMP] knowledge modifications

bzr revid: ssi@tinyerp.com-20101005092308-2nx7eohcm12o6rux
---
 addons/document_ftp/test_easyftp.py                   | 2 +-
 addons/document_ftp/wizard/ftp_configuration_view.xml | 2 +-
 addons/knowledge/installer.py                         | 2 +-
 addons/knowledge/knowledge_installer.xml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index c5526371065..1f7324b821e 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -31,7 +31,7 @@ def get_plain_ftp(timeout=10.0):
     ftp = FTP()
     host = config.get('ftp_server_host', '127.0.0.1')
     port = config.get('ftp_server_port', '8021')
-    ftp.connect(host, port, timeout=timeout)
+    ftp.connect(host, port,timeout)
     return ftp
 
 def get_ftp_login(cr, uid, ormobj):
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 0319c69823e..151e2ce49c6 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -21,7 +21,7 @@
             	<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>
+            <attribute name="string">Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself..</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
   				<attribute name='rowspan'>12</attribute>
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index 7840ffbc276..e74c37f80d0 100644
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -38,7 +38,7 @@ class knowledge_installer(osv.osv_memory):
             help="Lets you create wiki pages and page groups in order "
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
-        # Templates of Content
+        # Content templates
         'wiki_faq':fields.boolean('Internal FAQ',
             help="Creates a skeleton internal FAQ pre-filled with "
                  "documentation about OpenERP's Document Management "
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 681bf2253d5..26e1c79123f 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -27,7 +27,7 @@
             <field name="document_ftp"/>
             <field name="document_webdav"/>
             <field name="wiki"/>
-            <separator string="Templates of Content" colspan="4"/>
+            <separator string="Content templates" colspan="4"/>
             <field name="wiki_faq"/>
             <field name="wiki_quality_manual"/>
           </group>

From 8ddedb36f0e7157985d7af10eb50f8a47069309c Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 5 Oct 2010 15:43:48 +0530
Subject: [PATCH 020/294] [IMP] sale_crm:-changes to get the salesteam from the
 Prefernces of the user in the search view of sales order

bzr revid: mtr@mtr-20101005101348-ojrg1w568c1czbzj
---
 addons/sale_crm/sale_crm_view.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 391d4141969..74990c68572 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -43,5 +43,14 @@
 	        </field>
 	    </record>
 
+        <record id="sale.action_order_form" model="ir.actions.act_window">
+            <field name="name">Sales Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="context">{'search_default_section_id':section_id}</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+        </record>
 	</data>
 </openerp>
\ No newline at end of file

From 2694e39ff16cc0831fc72b6aab2a0f4341add804 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 5 Oct 2010 17:32:25 +0530
Subject: [PATCH 021/294] [FIX]: base_calendar: Fixed sql query

bzr revid: rpa@tinyerp.com-20101005120225-pkp2ty7ieb0ajukz
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 88ee1a8ec33..722ac5cb0a8 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1065,7 +1065,7 @@ class calendar_event(osv.osv):
             'rule_type': rrule_type,
             'id': id,
         })
-        cr.execute(qry, val) # Hopefully psycopg2 works with dicts. But, FIXME
+        cr.execute(qry % val)
         return True
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):

From d31b4e3d0bbb161ee3afdd25be2067d70034d630 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 5 Oct 2010 18:34:34 +0530
Subject: [PATCH 022/294] [FIX]: project_issue: Fixed problem of domain in
 issue report search view

bzr revid: rpa@tinyerp.com-20101005130434-0apnl0ms9l3jknae
---
 addons/project_issue/report/project_issue_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 39564c90896..9b13e02154c 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -100,8 +100,8 @@
                        <field name="priority" />
                        <separator orientation="vertical"/>
                        <field name="version_id" widget="selection" />
-                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                       <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
+                       <field name="categ_id" widget="selection"/>
+                       <field name="type_id" widget="selection"/>
                        <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        <newline/>

From 9cad752f27f07cba4c87613ccad86d6a1539a3fc Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 5 Oct 2010 18:38:02 +0530
Subject: [PATCH 023/294] [ADD] project_scrum : added charts on Scrum Dashboard
 [REM/FIX] project_planning,project : removed my button from planning
 statistics and change domin on projects button

bzr revid: jas@tinyerp.com-20101005130802-fcs0m27g8l9pk7o2
---
 addons/project/report/project_report_view.xml |  2 +-
 .../project_planning_view.xml                 |  6 ++-
 .../board_project_scrum_view.xml              | 44 ++++++++++++++++++-
 addons/project_scrum/project_scrum.py         |  1 +
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9521d321000..ea454aced03 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -91,7 +91,7 @@
 	                    <field name="project_id">
 	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
-	                        		help="My Projects" domain="[('project_id','=',uid)]"/>
+	                        		help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                           </field>
 
                           <field name="user_id" widget="selection">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 9363413e4a2..ff8e42ec7b8 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -277,8 +277,6 @@
             <field name="arch" type="xml">
                 <search string="Planning statistics">
                     <group col="10" colspan="4">
-                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
-                        <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="account_id" select="1" groups="base.group_extended"/>
@@ -300,6 +298,10 @@
             parent="hr.menu_hr_reporting" />
         <menuitem action="action_account_analytic_planning_stat_form"
             id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+            <menuitem  action="action_account_analytic_planning_stat_form"
+                       icon="terp-graph"
+                       id="menu_board_planning"
+                       parent="project.next_id_86"/>
 
 <!--        Analytic account Form -->
 
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 8b22233558b..5859121c3c5 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -26,6 +26,43 @@
              	</tree>
             </field>
         </record>
+        <record id="view_project_task_graph" model="ir.ui.view">
+            <field name="name">project.task.graph</field>
+            <field name="model">project.task</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Task Progress" type="bar">
+                    <field name="project_id"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="delay_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_project_task_graph" model="ir.actions.act_window">
+            <field name="name">Task Progress</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+        </record>
+
+        <record id="view_backlog_progress_graph" model="ir.ui.view">
+            <field name="name">project.scrum.sprint.graph</field>
+            <field name="model">project.scrum.product.backlog</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Backlog Progress" type="bar">
+                    <field name="sprint_id"/>
+                    <field name="effective_hours" operator="+"/>
+                    <field name="expected_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_backlog_progress_graph" model="ir.actions.act_window">
+            <field name="name">Backlog Progress</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+        </record>
         <record id="action_sprint_all_dashboard_tree" model="ir.actions.act_window">
             <field name="name">Sprint's List</field>
             <field name="res_model">project.scrum.sprint</field>
@@ -41,8 +78,13 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                   				 <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
+               				 <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
+                             <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
+                        <child2>
+                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progess" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progess" width="510"/>
+                        </child2>
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index f472369211b..2a4ea180d47 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -237,6 +237,7 @@ class project_scrum_product_backlog(osv.osv):
         return True
 
     def button_postpone(self, cr, uid, ids, context=None):
+        raise osv.except_osv(_('Warning!'), _( "Are you sure to postpone Backlog ?"))
         if context is None:
             context = {}
         for product in self.browse(cr, uid, ids, context=context):

From 0a65ae1625240fe19486645f6c6d57c63f3782cf Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Oct 2010 18:40:44 +0530
Subject: [PATCH 024/294] [ADD]:Project->Scrum->Scrum mitting->Add a Email
 wizard  button

bzr revid: ron@tinyerp.com-20101005131044-gqmhbf136rpmebns
---
 addons/project_scrum/__openerp__.py         |  1 +
 addons/project_scrum/project_scrum_view.xml | 11 ++++++-----
 addons/project_scrum/wizard/__init__.py     |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 3e18db77f68..dea267e41f5 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -54,6 +54,7 @@
         'project_scrum_report.xml',
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
+        "wizard/project_scrum_email_view.xml",
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
         'process/project_scrum_process.xml',
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..f2b56041d49 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -192,7 +192,7 @@
         <!--
               Scrum Sprint
        -->
-        
+
         <record id="view_scrum_sprint_calendar" model="ir.ui.view">
             <field name="name">project.scrum.sprint.calendar</field>
             <field name="model">project.scrum.sprint</field>
@@ -204,7 +204,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
             <field name="name">project.scrum.sprint.tree</field>
             <field name="model">project.scrum.sprint</field>
@@ -357,7 +357,7 @@
         <!--
               Daily Meeting
        -->
-        
+
         <record id="view_scrum_meeting_calendar" model="ir.ui.view">
             <field name="name">project.scrum.meeting.calendar</field>
             <field name="model">project.scrum.meeting</field>
@@ -369,7 +369,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">project.scrum.meeting.tree</field>
             <field name="model">project.scrum.meeting</field>
@@ -389,10 +389,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Meeting">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="8">
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
                         <field name="user_id"/>
+                        <button name="%(action_project_scrum_email)d"  string="Send Email" type="action" icon="terp-mail-message-new" />
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 92ed57d7d7e..69e6ecc0969 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -22,6 +22,7 @@
 import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
+import project_scrum_email
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 615bce075bb91e19d00c32128b2334b32a568fe7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 5 Oct 2010 18:43:07 +0530
Subject: [PATCH 025/294] [REM]: crm*: Removed unused fields(perc_done,
 perc_cancel, avg_answers) + code in reporting

bzr revid: rpa@tinyerp.com-20101005131307-4o487rfg3gynn3sx
---
 addons/crm/report/crm_lead_report.py          | 41 ------------------
 addons/crm/report/crm_lead_report_view.xml    |  1 -
 addons/crm/report/crm_phonecall_report.py     | 42 -------------------
 addons/hr_recruitment/i18n/en_US.po           | 15 -------
 addons/hr_recruitment/i18n/fr.po              | 15 -------
 addons/hr_recruitment/i18n/hr_recruitment.pot | 10 -----
 addons/hr_recruitment/i18n/mn.po              | 15 -------
 .../report/hr_recruitment_report.py           | 16 -------
 addons/project_issue/i18n/en_US.po            | 15 -------
 addons/project_issue/i18n/fr.po               | 15 -------
 addons/project_issue/i18n/nl.po               | 15 -------
 addons/project_issue/i18n/pl.po               | 15 -------
 addons/project_issue/i18n/project_issue.pot   | 10 -----
 .../report/project_issue_report.py            | 25 +----------
 14 files changed, 1 insertion(+), 249 deletions(-)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 9cef18594a0..5f469da1574 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -37,41 +37,6 @@ class crm_lead_report(osv.osv):
     _auto = False
     _description = "CRM Lead Report"
 
-    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of case and section Data’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        res = {}
-        avg_ans = 0.0
-
-        for case in self.browse(cr, uid, ids, context):
-            if field_name != 'avg_answers':
-                state = field_name[5:]
-                cr.execute("select count(id) from crm_lead where \
-                    section_id =%s and state='%s'"%(case.section_id.id, state))
-                state_cases = cr.fetchone()[0]
-                perc_state = (state_cases / float(case.nbr)) * 100
-
-                res[case.id] = perc_state
-            else:
-                model_name = self._name.split('report.')
-                if len(model_name) < 2:
-                    res[case.id] = 0.0
-                else:
-                    model_name = model_name[1]
-
-                    cr.execute("select count(id) from crm_case_log l, ir_model m \
-                         where l.model_id=m.id and m.model = '%s'" , model_name)
-                    logs = cr.fetchone()[0]
-
-                    avg_ans = logs / case.nbr
-                    res[case.id] = avg_ans
-
-        return res
-
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
@@ -80,9 +45,6 @@ class crm_lead_report(osv.osv):
         'channel_id':fields.many2one('res.partner.canal', 'Channel', readonly=True),
         'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
-        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
-        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -147,9 +109,6 @@ class crm_lead_report(osv.osv):
                     c.planned_revenue,
                     c.planned_revenue*(c.probability/100) as probable_revenue, 
                     1 as nbr,
-                    0 as avg_answers,
-                    0.0 as perc_done,
-                    0.0 as perc_cancel,
                     (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index aa0b437aa83..249f4c144bb 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -29,7 +29,6 @@
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
-                <field name="avg_answers"/>
              </tree>
             </field>
         </record>
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 9502c39ad06..1ee4ce8d0b7 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -39,42 +39,6 @@ class crm_phonecall_report(osv.osv):
     _description = "Phone calls by user and section"
     _auto = False
     
-    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of case and section Data’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        res = {}
-        state_perc = 0.0
-        avg_ans = 0.0
-
-        for case in self.browse(cr, uid, ids, context):
-            if field_name != 'avg_answers':
-                state = field_name[5:]
-                cr.execute("select count(*) from crm_lead where \
-                    section_id =%s and state='%s'"%(case.section_id.id, state))
-                state_cases = cr.fetchone()[0]
-                perc_state = (state_cases / float(case.nbr)) * 100
-
-                res[case.id] = perc_state
-            else:
-                model_name = self._name.split('report.')
-                if len(model_name) < 2:
-                    res[case.id] = 0.0
-                else:
-                    model_name = model_name[1]
-
-                    cr.execute("select count(*) from crm_case_log l, ir_model m \
-                         where l.model_id=m.id and m.model = '%s'" , model_name)
-                    logs = cr.fetchone()[0]
-
-                    avg_ans = logs / case.nbr
-                    res[case.id] = avg_ans
-
-        return res
-
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
@@ -82,9 +46,6 @@ class crm_phonecall_report(osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
-        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
-        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -131,9 +92,6 @@ class crm_phonecall_report(osv.osv):
                     c.company_id,
                     c.priority,
                     1 as nbr,
-                    0 as avg_answers,
-                    0.0 as perc_done,
-                    0.0 as perc_cancel,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open
diff --git a/addons/hr_recruitment/i18n/en_US.po b/addons/hr_recruitment/i18n/en_US.po
index e4065c4a94d..7bd8e6c1b96 100644
--- a/addons/hr_recruitment/i18n/en_US.po
+++ b/addons/hr_recruitment/i18n/en_US.po
@@ -254,11 +254,6 @@ msgstr "Convert To Partner"
 msgid "Recruitments Statistics"
 msgstr "Recruitments Statistics"
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_done:0
-msgid "%Done"
-msgstr "%Done"
-
 #. module: hr_recruitment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -312,11 +307,6 @@ msgstr "Email"
 msgid "Availability (Days)"
 msgstr "Availability (Days)"
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr "Avg. Answers"
-
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Available"
@@ -464,11 +454,6 @@ msgstr "Stage of Recruitment"
 msgid "Stages"
 msgstr "Stages"
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_cancel:0
-msgid "%Cancel"
-msgstr "%Cancel"
-
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index becba8296cd..16e1782e223 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/i18n/fr.po
@@ -257,11 +257,6 @@ msgstr ""
 msgid "Recruitments Statistics"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_done:0
-msgid "%Done"
-msgstr ""
-
 #. module: hr_recruitment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -315,11 +310,6 @@ msgstr ""
 msgid "Availability (Days)"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Available"
@@ -467,11 +457,6 @@ msgstr ""
 msgid "Stages"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_cancel:0
-msgid "%Cancel"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 9ab2d5b02df..27e32ce7f71 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -254,11 +254,6 @@ msgstr ""
 msgid "Recruitments Statistics"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_done:0
-msgid "%Done"
-msgstr ""
-
 #. module: hr_recruitment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -464,11 +459,6 @@ msgstr ""
 msgid "Stages"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_cancel:0
-msgid "%Cancel"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
diff --git a/addons/hr_recruitment/i18n/mn.po b/addons/hr_recruitment/i18n/mn.po
index 9f1704c7112..ab849b831c8 100644
--- a/addons/hr_recruitment/i18n/mn.po
+++ b/addons/hr_recruitment/i18n/mn.po
@@ -258,11 +258,6 @@ msgstr ""
 msgid "Recruitments Statistics"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_done:0
-msgid "%Done"
-msgstr ""
-
 #. module: hr_recruitment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -316,11 +311,6 @@ msgstr ""
 msgid "Availability (Days)"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr ""
-
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Available"
@@ -468,11 +458,6 @@ msgstr ""
 msgid "Stages"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,perc_cancel:0
-msgid "%Cancel"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 2a2ab8fce2b..405897e95f4 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -36,26 +36,10 @@ class hr_recruitment_report(osv.osv):
     _auto = False
     _rec_name = 'date'
 
-    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of case and section Data’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        res = {}
-        state_perc = 0.0
-        avg_ans = 0.0
-        #TODO: Calculate avg_answer, perc_done, perc_cancel
-        return res
-
     _columns = {
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
-        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
-        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/project_issue/i18n/en_US.po b/addons/project_issue/i18n/en_US.po
index 1f4a96616e2..20af7b04708 100644
--- a/addons/project_issue/i18n/en_US.po
+++ b/addons/project_issue/i18n/en_US.po
@@ -230,11 +230,6 @@ msgstr "Invalid model name in the action definition."
 msgid "Section"
 msgstr "Section"
 
-#. module: project_issue
-#: field:project.issue.report,perc_done:0
-msgid "%Done"
-msgstr "%Done"
-
 #. module: project_issue
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -291,11 +286,6 @@ msgstr "Email"
 msgid "Channel"
 msgstr "Channel"
 
-#. module: project_issue
-#: field:project.issue.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr "Avg. Answers"
-
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -399,11 +389,6 @@ msgstr "The channels represent the different communication modes available with
 msgid "Tasks"
 msgstr "Tasks"
 
-#. module: project_issue
-#: field:project.issue.report,perc_cancel:0
-msgid "%Cancel"
-msgstr "%Cancel"
-
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 8da8b573b87..02404eab350 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -235,11 +235,6 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,perc_done:0
-msgid "%Done"
-msgstr ""
-
 #. module: project_issue
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -296,11 +291,6 @@ msgstr ""
 msgid "Channel"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr ""
-
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -407,11 +397,6 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,perc_cancel:0
-msgid "%Cancel"
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index 59019439416..f2f86f499a1 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -236,11 +236,6 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,perc_done:0
-msgid "%Done"
-msgstr ""
-
 #. module: project_issue
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -297,11 +292,6 @@ msgstr ""
 msgid "Channel"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr ""
-
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -408,11 +398,6 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,perc_cancel:0
-msgid "%Cancel"
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index be144507e7e..52c4443a77a 100644
--- a/addons/project_issue/i18n/pl.po
+++ b/addons/project_issue/i18n/pl.po
@@ -240,11 +240,6 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 msgid "Section"
 msgstr "Sekcja"
 
-#. module: project_issue
-#: field:project.issue.report,perc_done:0
-msgid "%Done"
-msgstr "%Wykonano"
-
 #. module: project_issue
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -301,11 +296,6 @@ msgstr "E-mail"
 msgid "Channel"
 msgstr "Kanał"
 
-#. module: project_issue
-#: field:project.issue.report,avg_answers:0
-msgid "Avg. Answers"
-msgstr "Åšred. odpowiedzi"
-
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
@@ -414,11 +404,6 @@ msgstr ""
 msgid "Tasks"
 msgstr "Zadania"
 
-#. module: project_issue
-#: field:project.issue.report,perc_cancel:0
-msgid "%Cancel"
-msgstr "%Anulowanych"
-
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 521eefb19c8..ec99de96b06 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -230,11 +230,6 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,perc_done:0
-msgid "%Done"
-msgstr ""
-
 #. module: project_issue
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -399,11 +394,6 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#. module: project_issue
-#: field:project.issue.report,perc_cancel:0
-msgid "%Cancel"
-msgstr ""
-
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 55096869306..ba4c2850c6e 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -35,34 +35,11 @@ class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
 
-    def _get_data(self, cr, uid, ids, field_names, arg, context=None):
-        if context is None:
-            context = {}
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current users ID for security checks,
-            @param ids: List of case and section Datas IDs
-            @param context: A standard dictionary for contextual values """
-
-        res = {}
-
-        for report in self.browse(cr, uid, ids, context):
-            res[report.id]= {
-                'avg_answers': 0.0,
-                'perc_done' : 0.0,
-                'perc_cancel': 0.0
-            }
-            #TODO: Calculate
-
-        return res
-
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data, group_operator='avg', string='Avg. Answers', multi='avg_answers', method=True, type="integer"),
-        'perc_done': fields.function(_get_data, group_operator='avg', string='%Done', multi='perc_done', method=True, type="float"),
-        'perc_cancel': fields.function(_get_data, group_operator='avg', string='%Cancel', multi='perc_cancel', method=True, type="float"),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -75,7 +52,7 @@ class project_issue_report(osv.osv):
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
-        'type_id': fields.many2one ('project.task.type', 'Stage'),
+        'type_id': fields.many2one('project.task.type', 'Stage'),
         'nbr': fields.integer('# of Issues', readonly=True),
         'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True),
         'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True),

From 4ec92089ec43ec71bfeaf9add7c60b8e24410560 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Oct 2010 18:48:04 +0530
Subject: [PATCH 026/294] [ADD]:Project->Scrum->Scrum mitting->Add Wizard File

bzr revid: ron@tinyerp.com-20101005131804-m4q8hup6zozdihz4
---
 .../wizard/project_scrum_email.py             | 133 ++++++++++++++++++
 .../wizard/project_scrum_email_view.xml       |  39 +++++
 2 files changed, 172 insertions(+)
 create mode 100644 addons/project_scrum/wizard/project_scrum_email.py
 create mode 100644 addons/project_scrum/wizard/project_scrum_email_view.xml

diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
new file mode 100644
index 00000000000..d10746ee83f
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -0,0 +1,133 @@
+# -*- 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 lxml import etree
+from osv import fields, osv
+from tools.translate import _
+from datetime import datetime
+
+class project_scrum_email(osv.osv_memory):
+    _name = 'project.scrum.email'
+
+    def _get_master_email(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+#        res='master@gmail.com'
+        if active_id:
+            res = self.pool.get('project.scrum.meeting').browse(cr,uid,active_id,context=context).sprint_id.scrum_master_id.user_email
+        return res
+
+    def _get_owner_email(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+#        res='owner@gmail.com'
+        if active_id:
+            res = self.pool.get('project.scrum.meeting').browse(cr, uid,active_id,context=context).sprint_id.product_owner_id.user_email
+        return res
+
+    def _get_subject(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+
+#        res='owner@gmail.com'
+        if active_id:
+            res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
+            res=" Scrum Meeting  of " + res1
+            print res
+        return res
+
+    def _get_message(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+
+#        res='owner@gmail.com'
+        if active_id:
+
+            res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
+            cnv_date = datetime.strptime(res1,'%Y-%m-%d')
+            weekfordate=datetime.strftime(cnv_date,'%W')
+            res2= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).sprint_id.project_id.name
+            res=" Scrum Meeting  of "+res1+" on Sprint Week "+weekfordate+" of Project "+res2
+        return res
+
+
+    _columns = {
+        'scrum_master_id': fields.char('Scrum Master Email', size=220,help="The person who is maintains the processes for the product"),
+        'product_owner_id': fields.char('Product Owner Email', size=220,help="The person who is responsible for the product"),
+        'subject':fields.char('Subject',size=220),
+        'message':fields.text('Message'),
+
+               }
+
+    _defaults = {
+        'scrum_master_id': _get_master_email,
+        'product_owner_id': _get_owner_email,
+        'subject': _get_subject,
+        'message': _get_message,
+
+    }
+
+#    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+#        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+#        users_pool = self.pool.get('res.users')
+#        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
+#        time_mode_name = time_mode and time_mode.name or 'Hours'
+#        if time_mode_name in ['Hours','Hour']:
+#            return res
+#
+#        eview = etree.fromstring(res['arch'])
+#
+#        def _check_rec(eview):
+#            if eview.attrib.get('widget','') == 'float_time':
+#                eview.set('widget','float')
+#            for child in eview:
+#                _check_rec(child)
+#            return True
+#
+#        _check_rec(eview)
+#
+#        res['arch'] = etree.tostring(eview)
+#
+#        for field in res['fields']:
+#            if 'Hours' in res['fields'][field]['string']:
+#                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
+#        return res
+
+#    def compute_hours(self, cr, uid, ids, context=None):
+#        if context is None:
+#            context = {}
+#        data = self.browse(cr, uid, ids, context=context)[0]
+#        task_pool = self.pool.get('project.task')
+#        task_id = context.get('active_id', False)
+#        if task_id:
+#            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
+#            if context.get('button_reactivate', False):
+#                task_pool.do_reopen(cr, uid, [task_id], context=context)
+#        return {}
+project_scrum_email()
diff --git a/addons/project_scrum/wizard/project_scrum_email_view.xml b/addons/project_scrum/wizard/project_scrum_email_view.xml
new file mode 100644
index 00000000000..1552192b02c
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_email_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <record id="view_project_scrum_email" model="ir.ui.view">
+            <field name="name">Meeting E-mail</field>
+            <field name="model">project.scrum.email</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Meeting Email">
+                    <separator colspan="4" string="Scrum Meeting Email"/>
+                    <group col="2" colspan="4">
+	                    <field name="scrum_master_id"/>
+	                    <field name="product_owner_id"/>
+	                    <field name="subject"/>
+                    </group>
+					<notebook colspan="4">
+						<page string="Message">
+                    		<field name="message" nolabel="1"/>
+                    	</page>
+                    </notebook>
+
+                    <separator string="" colspan="4"/>
+                    <button icon="gtk-close" special="cancel" string="_Cancel"/>
+                    <button icon="gtk-go-forward"  string="_Send" type="object" default_focus="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_project_scrum_email" model="ir.actions.act_window">
+            <field name="name">Meeting E-mail</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">project.scrum.email</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+ </data>
+</openerp>

From 24ac6d3ccd20bc19b0d6180939b56bace6788681 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 5 Oct 2010 19:09:47 +0530
Subject: [PATCH 027/294] [FIX]: event: Fixed group by User

bzr revid: rpa@tinyerp.com-20101005133947-qw77bc4lzk2cp4rn
---
 addons/event/event_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b016dbef9f9..f20d9e9aa81 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -179,6 +179,7 @@
                     <field name="register_min"/>
                     <field name="register_current"/>
                     <field name="state"/>
+                    <field name="user_id"/>
                     <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                     <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
                     <button string="Event Done" help="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>

From 0fcbc54bd345e510ad4fe77480f798dfde53489b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 09:59:36 +0530
Subject: [PATCH 028/294] [IMP]: project_issue: Fixed domain on report

bzr revid: rpa@tinyerp.com-20101006042936-cp5apsnbp19t6k5p
---
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 9b13e02154c..365f217dee4 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -100,7 +100,7 @@
                        <field name="priority" />
                        <separator orientation="vertical"/>
                        <field name="version_id" widget="selection" />
-                       <field name="categ_id" widget="selection"/>
+                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                        <field name="type_id" widget="selection"/>
                        <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>

From dce4e7401055390d5d7eb1259553f9332ac6949d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 10:56:12 +0530
Subject: [PATCH 029/294] [FIX]: email_template: Fixed pylint warnings

bzr revid: rpa@tinyerp.com-20101006052612-33okvdgjmbirw02j
---
 addons/email_template/email_template.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index ee82c917351..4e53a895587 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -31,10 +31,9 @@ TEMPLATE_ENGINES = []
 
 from osv import osv, fields
 from tools.translate import _
-from mako.template import Template  #For backward combatibility
+
 try:
     from mako.template import Template as MakoTemplate
-    from mako import exceptions
     TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
 except:
     LOGGER.notifyChannel(
@@ -302,7 +301,6 @@ This is useful for CRM leads for example"),
 
     def unlink_action(self, cr, uid, ids, context):
         for template in self.browse(cr, uid, ids, context):
-            obj = self.pool.get(template.object_name.model)
             try:
                 if template.ref_ir_act_window:
                     self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)

From 4d38257ab8aec5b69d44e0e2fa8e818c374b280f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 11:01:07 +0530
Subject: [PATCH 030/294] [FIX]: crm: Fixed pylint warnings

bzr revid: rpa@tinyerp.com-20101006053107-mc1xaquqo4f6587x
---
 addons/crm/crm_opportunity.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 2b0062eb9d5..9bc4efda0f8 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime
-from osv import fields,osv,orm
+from osv import fields, osv
 from tools.translate import _
 import crm
 import time
@@ -121,7 +120,7 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'stage_id': False})
-        return True
+        return res
    
  
     def case_open(self, cr, uid, ids, *args):

From fa5db5c01e82d1469008c4358667c6d3619c51aa Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 11:05:30 +0530
Subject: [PATCH 031/294] [FIX]: event: Fixed pylint warnings

bzr revid: rpa@tinyerp.com-20101006053530-dojgii3u4q2734nb
---
 addons/event/event.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 88910f01914..addf2539eea 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -22,8 +22,6 @@
 from crm import crm
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-import pooler
 import time
 import tools
 import decimal_precision as dp
@@ -354,11 +352,6 @@ class event_registration(osv.osv):
 
         val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
         val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-        partner_address_id = val_invoice['value']['address_invoice_id']
-
-        value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-
-        l = inv_lines_pool.read(cr, uid, lines)
 
         val_invoice['value'].update({
                 'origin': reg.event_product,
@@ -595,7 +588,6 @@ class event_registration(osv.osv):
         addr_obj = self.pool.get('res.partner.address')
         job_obj = self.pool.get('res.partner.job')
 
-        contact_id = contact_obj.browse(cr, uid, contact)
         if partner:
             partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)])
             job_ids = job_obj.search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])
@@ -667,7 +659,6 @@ class event_registration(osv.osv):
                     data['contact_id'] = job_obj.browse(cr, uid, job_ids[0]).contact_id.id
                     d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
                     data.update(d['value'])
-        partner_data = res_obj.browse(cr, uid, part)
         return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):

From 4388a5815b68ed901de733a8a63c6ad7df264655 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 6 Oct 2010 11:40:16 +0530
Subject: [PATCH 032/294] [ADD]: project_scrum: added wizard on Postpone button
 of the Product Backlogs

bzr revid: jas@tinyerp.com-20101006061016-zns1izbah5uwqxzx
---
 addons/project_scrum/__openerp__.py         |  1 +
 addons/project_scrum/project_scrum.py       | 18 ------------------
 addons/project_scrum/project_scrum_view.xml | 10 +++++-----
 addons/project_scrum/wizard/__init__.py     |  1 +
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 3e18db77f68..30b9f84276b 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -56,6 +56,7 @@
         'wizard/project_scrum_backlog_merger_view.xml',
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
+        'wizard/project_scrum_postpone_view.xml',
         'process/project_scrum_process.xml',
         "board_project_scrum_view.xml",
     ],
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 2a4ea180d47..d4c8911c459 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -236,24 +236,6 @@ class project_scrum_product_backlog(osv.osv):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
-    def button_postpone(self, cr, uid, ids, context=None):
-        raise osv.except_osv(_('Warning!'), _( "Are you sure to postpone Backlog ?"))
-        if context is None:
-            context = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            tasks_id = []
-            for task in product.tasks_id:
-                if task.state != 'done':
-                    tasks_id.append(task.id)
-
-            clone_id = self.copy(cr, uid, product.id, {
-                'name': 'PARTIAL:'+ product.name ,
-                'sprint_id':False,
-                'tasks_id':[(6, 0, tasks_id)],
-                                })
-        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-        return True
-
     _columns = {
         'name' : fields.char('Feature', size=64, required=True),
         'note' : fields.text('Note'),
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..14a1c84e1d9 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -62,7 +62,7 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
-      					<button name="button_postpone" string="Postpone" type="object"
+     					<button name="%(action_postpone_wizard)d" string="Postpone" type="action"
 							help="Postpone backlog" colspan="2"
                          icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
                         <field name="user_id" select="1"/>
@@ -192,7 +192,7 @@
         <!--
               Scrum Sprint
        -->
-        
+
         <record id="view_scrum_sprint_calendar" model="ir.ui.view">
             <field name="name">project.scrum.sprint.calendar</field>
             <field name="model">project.scrum.sprint</field>
@@ -204,7 +204,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
             <field name="name">project.scrum.sprint.tree</field>
             <field name="model">project.scrum.sprint</field>
@@ -357,7 +357,7 @@
         <!--
               Daily Meeting
        -->
-        
+
         <record id="view_scrum_meeting_calendar" model="ir.ui.view">
             <field name="name">project.scrum.meeting.calendar</field>
             <field name="model">project.scrum.meeting</field>
@@ -369,7 +369,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">project.scrum.meeting.tree</field>
             <field name="model">project.scrum.meeting</field>
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 92ed57d7d7e..22865e7c83e 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -22,6 +22,7 @@
 import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
+import project_scrum_postpone
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 8d3313526ed3c1d42e4cb1025b16b0b4445e217d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 12:18:50 +0530
Subject: [PATCH 033/294] [IMP]: crm: Members of sales team should visible only
 in extended view

bzr revid: rpa@tinyerp.com-20101006064850-dfw7k54i4fotcp6h
---
 addons/crm/crm_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index daafc19a621..8985d87f21e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -45,8 +45,10 @@
                                 <field name="allow_unlink" select="2"/>
                                 <field name="change_responsible"/>
                             </group>
-                            <separator string="Team Members" colspan="4"/>
-                            <field name="member_ids" nolabel="1" colspan="4"/>
+                            <group col="1" colspan="4" groups="base.group_extended">
+                                <separator string="Team Members" colspan="4"/>
+                                <field name="member_ids" nolabel="1" colspan="4"   height="250"/>
+                            </group>
                         </page>
                         <page string="Stages">
                             <separator string="Select stages for this Sales Team" colspan="4"/>

From dca6b9b2589b086fc6eb64783910d42a0d1764d4 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 6 Oct 2010 14:57:31 +0530
Subject: [PATCH 034/294] [IMP] Added New Features 1. Open Conatct 2.Web Server
 Configuration 3.Search Dialog for Partner in Open Contact and New Contact 4.
 Search Doialog for State and Country in Open Contact and New Contact

bzr revid: jam@tinyerp.com-20101006092731-650ecaivksgyr2ut
---
 .../Register-plugin.bat                       |   2 +-
 .../Unregister-plugin.bat                     |   4 +-
 .../plugin/openerp-outlook-plugin/addin.py    |  81 ++-
 .../plugin/openerp-outlook-plugin/chilkat.py  |  11 +-
 .../dialogs/__init__.py                       |   0
 .../dialogs/dialog_map.py                     | 504 +++++++++++++++---
 .../openerp-outlook-plugin/dialogs/dlgcore.py |   0
 .../dialogs/dlgutils.py                       |   0
 .../dialogs/opt_processors.py                 |   0
 .../dialogs/processors.py                     |   0
 .../dialogs/resources/OpenERP_Logo.bmp        | Bin
 .../dialogs/resources/__init__.py             |   0
 .../dialogs/resources/dialogs.h               |  31 ++
 .../dialogs/resources/dialogs.py              |  14 +-
 .../dialogs/resources/dialogs.rc              | 112 +++-
 .../dialogs/resources/openerp_logo.png        | Bin
 .../dialogs/resources/openerp_logo1.bmp       | Bin
 .../dialogs/resources/rc2py.py                |   0
 .../dialogs/resources/rcparser.py             |   0
 .../plugin/openerp-outlook-plugin/eml.py      |   1 +
 .../plugin/openerp-outlook-plugin/manager.py  |   0
 .../openerp-outlook-plugin/tiny_xmlrpc.py     |  96 +++-
 22 files changed, 742 insertions(+), 114 deletions(-)
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/addin.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/eml.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/manager.py
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
index 6e024b39d35..aa3c0dac378 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
+++ b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
@@ -1,2 +1,2 @@
 python addin.py
-pause
+pause
\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
index 1fcc6a95563..0f821974661 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
+++ b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
@@ -1,2 +1,2 @@
-python addin.py --unregister
-pause
+python addin.py --unregister
+pause
\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
old mode 100755
new mode 100644
index f8f96dcb962..67334e0ac7f
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -61,14 +61,14 @@ def GetConn():
     return d
 
 class ButtonEvent:
-    def OnClick(self, button, cancel):
-        import win32ui
-        try:
-            mngr = manager.GetManager()
-            mngr.ShowManager()
-        except Exception,e:
-            win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
-        return cancel
+	def OnClick(self, button, cancel):
+		import win32ui
+		try:
+			mngr = manager.GetManager()
+			mngr.ShowManager()
+		except Exception,e:
+			win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
+		return cancel
 #
 class ViewPartners:
     def OnClick(self, button, cancel):
@@ -89,6 +89,47 @@ class ViewPartners:
                 win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Open Contact",win32con.MB_ICONINFORMATION)
         return cancel
 #
+class OpenPartner:
+	def OnClick(self, button, cancel):
+		import win32ui
+		from manager import ustr
+		mngr = manager.GetManager()
+		data=mngr.LoadConfig()
+		outlook = Dispatch("Outlook.Application")
+		ex = outlook.ActiveExplorer()
+		if ex:
+			is_login = str(data['login'])
+			if is_login == 'False':
+				win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
+			elif ex.Selection.Count == 1:
+				mngr = manager.GetManager()
+				mngr.ShowManager("IDD_OPEN_PARTNER_DIALOG")
+			elif ex.Selection.Count == 0:
+				win32ui.MessageBox("No mail selected to push to OpenERP","Push to OpenERP",win32con.MB_ICONINFORMATION)
+			elif ex.Selection.Count > 1:
+				win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Push to OpenERP",win32con.MB_ICONINFORMATION)
+		return cancel
+#
+class OpenDocument:
+    def OnClick(self, button, cancel):
+        from win32com.client import Dispatch
+        import win32con
+        import win32ui
+        mngr = manager.GetManager()
+        data=mngr.LoadConfig()
+        outlook = Dispatch("Outlook.Application")
+        ex = outlook.ActiveExplorer()
+        if ex:
+            is_login = str(data['login'])
+            if is_login == 'False':
+                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
+            elif ex.Selection.Count == 1 or ex.Selection.Count == 0:
+                mngr = manager.GetManager()
+                mngr.ShowManager("IDD_OPEN_DOCUEMNT_DIALOG")
+            elif ex.Selection.Count > 1:
+                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Open Document",win32con.MB_ICONINFORMATION)
+        return cancel
+#
 class ArchiveEvent:
     def OnClick(self, button, cancel):
         from win32com.client import Dispatch
@@ -151,7 +192,22 @@ class OutlookAddin:
             item.Enabled = True
 
             # Adding Menu in Menu Bar to the Web Menu of the Outlook
+            toolbaradvance = bars.Item("Advanced")
             toolbarweb = bars.Item("Web")
+
+            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = self.toolbarButtonPOpenPartner = DispatchWithEvents(item, OpenPartner)
+            item.Caption = "Open Partners"
+            item.TooltipText = "Click to Open OpenERP Partner Contact Information."
+            item.Enabled = True
+
+
+#            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+#            item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
+#            item.Caption = "Open Document"
+#            item.TooltipText = "Click to Open Document that ha been pushed to server."
+#            item.Enabled = True
+
             # Hook events for the item
             item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
             item = self.toolbarButtonPartner = DispatchWithEvents(item, ViewPartners)
@@ -159,6 +215,7 @@ class OutlookAddin:
             item.TooltipText = "Click to Open OpenERP Partner Contact Information."
             item.Enabled = True
 
+
             item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.menu_bar_viewpartner_Button = DispatchWithEvents(item, ViewPartners)
@@ -166,6 +223,14 @@ class OutlookAddin:
             item.TooltipText = "Click to Open Partner detail"
             item.Enabled = True
 
+            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
+            # Hook events for the item
+            item = self.menu_bar_openpartner_Button = DispatchWithEvents(item, OpenPartner)
+            item.Caption = "Open Partner"
+            item.TooltipText = "Click to Open Partner detail"
+            item.Enabled = True
+
+
     def OnDisconnection(self, mode, custom):
         mngr = manager.GetManager()
         mngr.config['login'] = False
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
old mode 100755
new mode 100644
index 14e9741d09b..1afd9f85fdd
--- a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
@@ -635,6 +635,8 @@ class CkSocket(_object):
     def GetSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_GetSslAcceptableClientCaDn(self, *args)
     def getSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_getSslAcceptableClientCaDn(self, *args)
     def AddSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_AddSslAcceptableClientCaDn(self, *args)
+    def get_ReceivedCount(self): return _chilkat.CkSocket_get_ReceivedCount(self)
+    def put_ReceivedCount(self, *args): return _chilkat.CkSocket_put_ReceivedCount(self, *args)
     def UnlockComponent(self, *args): return _chilkat.CkSocket_UnlockComponent(self, *args)
     def IsUnlocked(self): return _chilkat.CkSocket_IsUnlocked(self)
     def AsyncSendBytes(self, *args): return _chilkat.CkSocket_AsyncSendBytes(self, *args)
@@ -2173,6 +2175,11 @@ class CkMailMan(_object):
     def put_Pop3Stls(self, *args): return _chilkat.CkMailMan_put_Pop3Stls(self, *args)
     def AddPfxSourceData(self, *args): return _chilkat.CkMailMan_AddPfxSourceData(self, *args)
     def AddPfxSourceFile(self, *args): return _chilkat.CkMailMan_AddPfxSourceFile(self, *args)
+    def SmtpSendRawCommand(self, *args): return _chilkat.CkMailMan_SmtpSendRawCommand(self, *args)
+    def smtpSendRawCommand(self, *args): return _chilkat.CkMailMan_smtpSendRawCommand(self, *args)
+    def Pop3SendRawCommand(self, *args): return _chilkat.CkMailMan_Pop3SendRawCommand(self, *args)
+    def pop3SendRawCommand(self, *args): return _chilkat.CkMailMan_pop3SendRawCommand(self, *args)
+    def Pop3EndSessionNoQuit(self): return _chilkat.CkMailMan_Pop3EndSessionNoQuit(self)
     def lastErrorText(self): return _chilkat.CkMailMan_lastErrorText(self)
     def lastErrorXml(self): return _chilkat.CkMailMan_lastErrorXml(self)
     def lastErrorHtml(self): return _chilkat.CkMailMan_lastErrorHtml(self)
@@ -3155,7 +3162,7 @@ class CkHttp(_object):
     def put_UseBgThread(self, *args): return _chilkat.CkHttp_put_UseBgThread(self, *args)
     def BgResponseObject(self): return _chilkat.CkHttp_BgResponseObject(self)
     def BgTaskAbort(self): return _chilkat.CkHttp_BgTaskAbort(self)
-    def ClearEventLog(self): return _chilkat.CkHttp_ClearEventLog(self)
+    def ClearBgEventLog(self): return _chilkat.CkHttp_ClearBgEventLog(self)
     def EventLogName(self, *args): return _chilkat.CkHttp_EventLogName(self, *args)
     def eventLogName(self, *args): return _chilkat.CkHttp_eventLogName(self, *args)
     def EventLogValue(self, *args): return _chilkat.CkHttp_EventLogValue(self, *args)
@@ -3759,6 +3766,8 @@ class CkSpider(_object):
     def put_ProxyPassword(self, *args): return _chilkat.CkSpider_put_ProxyPassword(self, *args)
     def get_ProxyPort(self): return _chilkat.CkSpider_get_ProxyPort(self)
     def put_ProxyPort(self, *args): return _chilkat.CkSpider_put_ProxyPort(self, *args)
+    def get_VerboseLogging(self): return _chilkat.CkSpider_get_VerboseLogging(self)
+    def put_VerboseLogging(self, *args): return _chilkat.CkSpider_put_VerboseLogging(self, *args)
     def put_UserAgent(self, *args): return _chilkat.CkSpider_put_UserAgent(self, *args)
     def userAgent(self): return _chilkat.CkSpider_userAgent(self)
     def get_UserAgent(self, *args): return _chilkat.CkSpider_get_UserAgent(self, *args)
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
old mode 100755
new mode 100644
index 26f0bed01ce..760a59929e0
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -31,7 +31,7 @@ import addin
 from dialogs import ShowDialog, MakePropertyPage
 
 import win32ui
-
+import webbrowser
 import commctrl
 import win32con
 import win32gui
@@ -168,6 +168,19 @@ global name
 name=''
 global email
 email=''
+global web_server
+web_server = 'localhost'
+global web_server_port
+web_server_port = '8080'
+global country_ref
+country_ref = ""
+global state_ref
+state_ref = ""
+global new_con_country
+new_con_country= ""
+global new_con_state
+new_con_state= ""
+
 
 def check():
     server = NewConn.getitem('_server')
@@ -251,7 +264,6 @@ class OKButtonProcessor(ButtonProcessor):
         try:
             port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
         except ValueError, e:
-            print "Exception : %s"%str(e)
             win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)
             return
         except Exception,e:
@@ -277,6 +289,27 @@ class DoneButtonProcessor(ButtonProcessor):
         self.window.manager.SaveConfig()
         win32gui.EndDialog(self.window.hwnd, id)
 
+class WEBOKButtonProcessor(ButtonProcessor):
+    def __init__(self, window, control_ids):
+        self.mngr = window.manager
+        ControlProcessor.__init__(self, window, control_ids)
+
+    def OnClicked(self, id):
+        global web_server
+        global web_server_port
+        server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
+        try:
+            port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
+        except ValueError, e:
+            win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)
+            return
+        if server.strip() == "" or server.strip() == "http:\\\\":
+            win32ui.MessageBox("Invalid web Server address.", "OpenERP Connection", flag_excl)
+            return
+        web_server = server
+        web_server_port = port
+        win32gui.EndDialog(self.window.hwnd, id)
+
 class MessageProcessor(ControlProcessor):
     def Init(self):
         text = "  This Outlook Plugin for OpenERP has been developed by OpenERP s.a.\n\n \
@@ -784,6 +817,8 @@ def CreateContact(btnProcessor,*args):
     street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
     city = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7])
     zip = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8])
+    state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
+    country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
     if not name:
         win32ui.MessageBox("Please enter name.", "Create Contact", flag_stop)
         return
@@ -798,9 +833,10 @@ def CreateContact(btnProcessor,*args):
            'street':ustr(street),
            'street2':ustr(street2),
            'city':ustr(city),
-           'zip':ustr(zip)
+           'zip':ustr(zip),
+           'state_id':ustr(state),
+           'country_id':ustr(country)
        }
-
     try:
         id = NewConn.CreateContact(str(res))
         if not partner:
@@ -818,6 +854,10 @@ def CreateContact(btnProcessor,*args):
 
 def SetAllText(txtProcessor,*args):
     # Set values for url, uname, pwd from config file
+    global web_server
+    global web_server_port
+    serverBox = txtProcessor.GetControl(txtProcessor.other_ids[2])
+    win32gui.SendMessage(serverBox, win32con.WM_SETTEXT, 0, "http:\\\\"+str(web_server)+":"+str(web_server_port))
     url = NewConn.getitem('_uri')
     tbox = txtProcessor.GetControl()
     win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url))
@@ -893,10 +933,22 @@ def SetDefaultContact(txtProcessor,*args):
     global name
     global email
     global partner_ref
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1],partner_ref)
+    global new_con_country
+    global new_con_state
+    state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
+    country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
     if txtProcessor.init_done:
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1],partner_ref)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2],new_con_state)
+        state_val = NewConn.FindCountryForState(str(state_ref))
+        if state_val == None:
+            new_con_country = country
+        new_con_country =  state_val
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3],new_con_country)
+        new_con_country = ""
+        new_con_state = ""
         return
     #
     try:
@@ -978,7 +1030,7 @@ def CreatePartner(btnProcessor,*args):
     b = check()
     if not b:
         return
-
+    global partner_ref
     partner_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     if not partner_name:
         win32ui.MessageBox("Please enter Partner name.", "Create Partner", flag_excl)
@@ -992,6 +1044,7 @@ def CreatePartner(btnProcessor,*args):
         return
     if id:
         win32ui.MessageBox("New Partner '%s' created."%partner_name, "Create Partner", flag_info)
+        partner_ref = str(partner_name)
         win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
     else:
         win32ui.MessageBox("Partner '%s' already Exists."%partner_name, "Create Partner", flag_info)
@@ -1016,7 +1069,29 @@ def GetDefaultEmail(txtProcessor,*args):
     import win32con
     b = check()
     global partner_ref
+    global country_ref
+    global state_ref
+    partner_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0])
+    state_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10])
+    country_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11])
+    if partner_ref == "":
+        partner_ref = partner_n
+    if country_ref == "":
+        country_ref = country_n
+    if state_ref == "":
+        state_ref = state_n
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(partner_ref))
+    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(state_ref))
+    state_val = NewConn.FindCountryForState(str(state_ref))
+    partner_ref = ""
+    country_ref = ""
+    state_ref = ""
+
+    if state_val == None:
+        country_ref = country_n
+    country_ref = state_val
+    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
+
     if not b:
         return
     #Acquiring control of the text box
@@ -1167,6 +1242,8 @@ def WritePartner(btnProcessor,*args):
     street = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
     street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
     city = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4])
+    state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5])
+    country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
     phone = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7])
     mobile = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8])
     fax = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
@@ -1185,6 +1262,9 @@ def WritePartner(btnProcessor,*args):
     new_vals.append(['email',email])
     new_vals.append(['fax',fax])
     new_vals.append(['zip',zip])
+    new_vals.append(['state',state])
+    new_vals.append(['country',country])
+    new_vals.append(['state',state])
     flag = 0
     try:
         #writing the updated values to the Server.
@@ -1198,7 +1278,7 @@ def WritePartner(btnProcessor,*args):
     elif flag == 0:
         win32ui.MessageBox("Error in Updating the Changes.\n Please check the Database Connection.", "Open Contact", flag_error)
     elif flag == -1:
-        win32ui.MessageBox("Contact can not be Save.\nFirst select contact using Search.","Open Contact", flag_info)
+        win32ui.MessageBox("Contact can not be Save.\nFirst select partner using Search.","Open Contact", flag_info)
 
 def SetPartnerNameColumn(listProcessor,*args):
     hwndList = listProcessor.GetControl()
@@ -1235,7 +1315,7 @@ def SelectPartnerFromList(btnProcessor,*args):
                 sel_text = nombre[0:size]
         global partner_ref
         if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid Partner Selected.","Search Partner")
+            win32ui.MessageBox("Invalid partner selected.","Search Partner")
             return
         try:
             partner_ref = str(sel_text)
@@ -1244,10 +1324,10 @@ def SelectPartnerFromList(btnProcessor,*args):
         win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
         return
     elif sel_count < 1:
-        win32ui.MessageBox("You should Select atleast one partner.","Search Partner")
+        win32ui.MessageBox("You should select one partner.","Search Partner")
         return
     else:
-        win32ui.MessageBox("Multiple Selection is not allowded.","Search Partner")
+        win32ui.MessageBox("Multiple Selection is not allowed.","Search Partner")
         return
 
 def SearchPartnerList(btnProcessor,*args):
@@ -1275,82 +1355,350 @@ def SearchPartnerList(btnProcessor,*args):
         win32ui.MessageBox(msg, "Search Partner", flag_error)
         pass
 
+def ConnectWebServer(btnProcessor, *args):
+	b = check()
+	if not b:
+		return
+	server = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+	webbrowser.open_new(str(server)+"\\openerp\\")
+
+
+def OpenPartnerForm(txtProcessor,*args):
+    from win32com.client import Dispatch
+    import win32con
+    b = check()
+    if not b:
+    	return
+    #Acquiring control of the text box
+    partner_link = txtProcessor.GetControl()
+    #Reading Current Selected Email.
+    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
+    assert ex.Selection.Count == 1
+    mail = ex.Selection.Item(1)
+    partner_text = ""
+    try:
+    	partner_text = ustr(mail.SenderName).encode('iso-8859-1')
+    except Exception,e:
+    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
+    	pass
+    vals = NewConn.SearchPartner(partner_text)
+    if vals == None:
+    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< No Partner with named "+str(partner_text)+" found.>")
+    	txtProcessor.init_done=True
+    	return
+    global web_server
+    global web_server_port
+    if web_server.strip() == "" or web_server.strip() == "http:\\\\":
+    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
+    	txtProcessor.init_done=True
+    	return
+    try:
+    	linktopartner = "http:\\\\"+web_server+":"+str(web_server_port)+"\\openerp\\form\\view?model=res.partner&id="+str(vals)
+    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, linktopartner)
+    except Exception,e:
+    	win32ui.MessageBox("Error While Opening Partner.\n"+str(e),"Open Partner", flag_error)
+    webbrowser.open_new(linktopartner)
+    txtProcessor.init_done=True
+
+def SerachOpenDocuemnt(txtProcessor,*args):
+    from win32com.client import Dispatch
+    import win32con
+    b = check()
+    if not b:
+        return
+    global web_server
+    global web_server_port
+    #Acquiring control of the text box
+    link_box = txtProcessor.GetControl()
+    if web_server.strip() == "" or web_server.strip() == "http:\\\\":
+        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
+        txtProcessor.init_done=True
+        return
+    linktodoc = ""
+    #Reading Current Selected Email.
+    vals = []
+
+    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
+    assert ex.Selection.Count == 1
+    mail = ex.Selection.Item(1)
+    e_id = ustr(mail.EntryID).encode('iso-8859-1')
+    vals = list(NewConn.SearchEmailResources(mail))
+
+    if vals == None:
+        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, "< Mail is still not archived.>")
+        txtProcessor.init_done=True
+        return
+    try:
+        linktodoc = web_server+":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
+        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, linktodoc)
+    except Exception,e:
+        win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)
+    webbrowser.open_new(linktodoc)
+    txtProcessor.init_done=True
+
+def SearchCountry(btnProcessor, *args):
+    b = check()
+    if not b:
+        return
+    try :
+        search_country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+        if not search_country:
+            win32ui.MessageBox("Please enter country name to search for.", "Search Country", flag_excl)
+            return
+        #Searching the contact.
+        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
+        countries = list(NewConn.GetCountry(search_country))
+        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
+        if not countries:
+            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
+            win32ui.MessageBox("No country found with name {0}.".format(search_country),"Search Country",flag_error)
+        for country in countries:
+            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
+            item = LVITEM(text=country[1],iItem = num_items)
+            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
+    except Exception,e:
+        msg = getMessage(e)
+        win32ui.MessageBox(msg, "Search Country", flag_error)
+        pass
+
+def SetCountryList(listProcessor,*args):
+
+    hwndList = listProcessor.GetControl()
+    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
+    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
+    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
+
+    # set header row
+    lvc =  LVCOLUMN(
+                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
+                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
+                    )
+    lvc.fmt = commctrl.LVCFMT_LEFT
+    lvc.iSubItem = 1
+    lvc.text = "Country Name"
+    lvc.cx = 275
+    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
+    listProcessor.init_done = True
+
+def SelectCountryFromList(btnProcessor,*args):
+
+    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
+    sel_text = ''
+    if sel_count == 1:
+        sel=-1
+        for i in range(0,sel_count):
+            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
+            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
+            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
+            sel_text = ''
+            for n in extra:
+                nombre = n.tostring()
+                sel_text = nombre[0:size]
+        global country_ref
+        global new_con_country
+        if str(sel_text).strip() == "":
+            win32ui.MessageBox("Invalid country selected.","Search Country")
+            return
+        try:
+            country_ref = str(sel_text)
+            new_con_country = str(sel_text)
+        except Exception,e:
+            pass
+        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
+        return
+    elif sel_count < 1:
+        win32ui.MessageBox("You must one country.","Search Country")
+        return
+    else:
+        win32ui.MessageBox("Multiple selection is not allowed.","Search Country")
+        return
+
+def SearchState(btnProcessor, *args):
+    b = check()
+    if not b:
+        return
+    try :
+        search_state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+        if not search_state:
+            win32ui.MessageBox("Please enter state name to search for.", "Search Fed.State", flag_excl)
+            return
+        #Searching the contact.
+        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
+        states = list(NewConn.GetStates(search_state))
+        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
+        if not states:
+            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
+            win32ui.MessageBox("No state found with name {0}.".format(search_state),"Search Fed.State",flag_error)
+        for state in states:
+            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
+            item = LVITEM(text=state[1],iItem = num_items)
+            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
+    except Exception,e:
+        msg = getMessage(e)
+        win32ui.MessageBox(msg, "Search Fed.State", flag_error)
+        pass
+
+def SetStateList(listProcessor,*args):
+    hwndList = listProcessor.GetControl()
+    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
+    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
+    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
+
+    # set header row
+    lvc =  LVCOLUMN(
+                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
+                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
+                    )
+    lvc.fmt = commctrl.LVCFMT_LEFT
+    lvc.iSubItem = 1
+    lvc.text = "Fed.State Name"
+    lvc.cx = 275
+    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
+    listProcessor.init_done = True
+
+def SelectStateFromList(btnProcessor,*args):
+
+    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
+    sel_text = ''
+    if sel_count == 1:
+        sel=-1
+        for i in range(0,sel_count):
+            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
+            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
+            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
+            sel_text = ''
+            for n in extra:
+                nombre = n.tostring()
+                sel_text = nombre[0:size]
+        global state_ref
+        global new_con_state
+        if str(sel_text).strip() == "":
+            win32ui.MessageBox("Invalid fed. state selected.","Search Fed.State")
+            return
+        try:
+            state_ref = str(sel_text)
+            new_con_state = str(sel_text)
+            win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
+        except Exception,e:
+            pass
+
+        return
+    elif sel_count < 1:
+        win32ui.MessageBox("You must select state.","Search Fed.State")
+        return
+    else:
+        win32ui.MessageBox("Multiple selection is not allowed.","Search Fed.State")
+        return
+
+
 
 dialog_map = {
-            "IDD_MANAGER" :            (
-                (CancelButtonProcessor,    "IDCANCEL", resetConnAttribs, ()),
-                (TabProcessor,             "IDC_TAB IDC_LIST",
-                                           """IDD_GENERAL IDD_OBJECT_SETTINGS IDD_ABOUT"""),
-                (DoneButtonProcessor,      "ID_DONE"),
-            ),
+                "IDD_MANAGER" :            (
+                    (CancelButtonProcessor,    "IDCANCEL", resetConnAttribs, ()),
+                    (TabProcessor,             "IDC_TAB IDC_LIST",
+                                               """IDD_GENERAL IDD_OBJECT_SETTINGS IDD_ABOUT"""),
+                    (DoneButtonProcessor,      "ID_DONE"),
+                ),
 
-            "IDD_GENERAL":             (
-                (DBComboProcessor,          "ID_DB_DROPDOWNLIST", GetConn, ()),
-                (TextProcessor,             "ID_SERVER_PORT ID_USERNAME ID_PASSWORD", SetAllText, ()),
-                (CommandButtonProcessor,    "ID_BUT_TESTCONNECTION ID_DB_DROPDOWNLIST ID_USERNAME \
-                                            ID_PASSWORD", TestConnection, ()),
-                (CommandButtonProcessor,    "IDC_RELOAD", ReloadAllControls, ()),
-                (DialogCommand,             "IDC_BUT_SET_SERVER_PORT", "IDD_SERVER_PORT_DIALOG"),
-            ),
+                "IDD_GENERAL":             (
+                    (DBComboProcessor,          "ID_DB_DROPDOWNLIST", GetConn, ()),
+                    (TextProcessor,             "ID_SERVER_PORT ID_USERNAME ID_PASSWORD IDET_WED_SERVER", SetAllText, ()),
+                    (CommandButtonProcessor,    "ID_BUT_TESTCONNECTION ID_DB_DROPDOWNLIST ID_USERNAME \
+                                                ID_PASSWORD", TestConnection, ()),
+                    (CommandButtonProcessor,    "IDC_RELOAD", ReloadAllControls, ()),
+                    (DialogCommand,             "IDC_BUT_SET_SERVER_PORT", "IDD_SERVER_PORT_DIALOG"),
+                    (DialogCommand,            "ID_SET_WEB_CONNECTION", "IDD_WEB_SERVER_PORT_DIALOG" ),
+                	(CommandButtonProcessor,	"IDPB_WEB_CONNECTION IDET_WED_SERVER",  ConnectWebServer, ()),
+                ),
 
-            "IDD_OBJECT_SETTINGS" :    (
-                (CommandButtonProcessor,   "IDC_BUT_LOAD_IMAGE IDC_IMAGE_PATH", GetImagePath, ()),
-                (CommandButtonProcessor,   "IDC_BUT_SAVE_OBJECT IDC_OBJECT_TITLE IDC_OBJECT_NAME \
-                                            IDC_IMAGE_PATH IDC_LIST", AddNewObject, ()),
-                (CommandButtonProcessor,   "IDC_BUT_DEL_OBJECT IDC_LIST", DeleteSelectedObjects, ()),
-                (ListBoxProcessor,         "IDC_LIST", SetDefaultList, ())
-            ),
+                "IDD_OBJECT_SETTINGS" :    (
+                    (CommandButtonProcessor,   "IDC_BUT_LOAD_IMAGE IDC_IMAGE_PATH", GetImagePath, ()),
+                    (CommandButtonProcessor,   "IDC_BUT_SAVE_OBJECT IDC_OBJECT_TITLE IDC_OBJECT_NAME \
+                                                IDC_IMAGE_PATH IDC_LIST", AddNewObject, ()),
+                    (CommandButtonProcessor,   "IDC_BUT_DEL_OBJECT IDC_LIST", DeleteSelectedObjects, ()),
+                    (ListBoxProcessor,         "IDC_LIST", SetDefaultList, ())
+                ),
 
-            "IDD_ABOUT" :              (
-                (ImageProcessor,          "IDB_OPENERPLOGO"),
-                (MessageProcessor,        "IDC_ABOUT"),
-            ),
+                "IDD_ABOUT" :              (
+                    (ImageProcessor,          "IDB_OPENERPLOGO"),
+                    (MessageProcessor,        "IDC_ABOUT"),
+                ),
 
-            "IDD_SERVER_PORT_DIALOG" : (
-                (CloseButtonProcessor,    "IDCANCEL"),
-                (OKButtonProcessor,  "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL"),
-                (RadioButtonProcessor, "IDR_XML_PROTOCOL", GetConn, ()),
-                (RadioButtonProcessor, "IDR_XMLS_PROTOCOL", GetConn, ()),
-                (RadioButtonProcessor, "IDR_NETRPC_PROTOCOL", GetConn, ()),
-            ),
+                "IDD_SERVER_PORT_DIALOG" : (
+                    (CloseButtonProcessor,    "IDCANCEL"),
+                    (OKButtonProcessor,  "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL"),
+                #                (RadioButtonProcessor, "IDR_XML_PROTOCOL", GetConn, ()),
+                #                (RadioButtonProcessor, "IDR_XMLS_PROTOCOL", GetConn, ()),
+                #                (RadioButtonProcessor, "IDR_NETRPC_PROTOCOL", GetConn, ()),
+                ),
 
-            "IDD_SYNC" :               (
-                (CommandButtonProcessor,    "ID_SEARCH ID_SEARCH_TEXT IDC_NAME_LIST", SearchObjectsForText,()),
-                (GroupProcessor,            "IDC_STATIC_GROUP", setCheckList, ()),
-                (CSComboProcessor,          "ID_ATT_METHOD_DROPDOWNLIST", GetConn,()),
-                (TextProcessor,             "ID_SEARCH_TEXT", GetSearchText, ()),
-                (DialogCommand,             "ID_CREATE_CONTACT ID_SEARCH_TEXT", "IDD_NEW_CONTACT_DIALOG", set_search_text, ()),
-                (CloseButtonProcessor,      "IDCANCEL"),
-                (CommandButtonProcessor,    "ID_MAKE_ATTACHMENT IDC_NAME_LIST IDD_SYNC", MakeAttachment, ()),
-                (CommandButtonProcessor,    "ID_CREATE_CASE ID_ATT_METHOD_DROPDOWNLIST IDC_NAME_LIST", CreateCase, ()),
-                (ListBoxProcessor,          "IDC_NAME_LIST", SetNameColumn, ())
-            ),
+                "IDD_SYNC" :               (
+                    (CommandButtonProcessor,    "ID_SEARCH ID_SEARCH_TEXT IDC_NAME_LIST", SearchObjectsForText,()),
+                    (GroupProcessor,            "IDC_STATIC_GROUP", setCheckList, ()),
+                    (CSComboProcessor,          "ID_ATT_METHOD_DROPDOWNLIST", GetConn,()),
+                    (TextProcessor,             "ID_SEARCH_TEXT", GetSearchText, ()),
+                    (DialogCommand,             "ID_CREATE_CONTACT ID_SEARCH_TEXT", "IDD_NEW_CONTACT_DIALOG", set_search_text, ()),
+                    (CloseButtonProcessor,      "IDCANCEL"),
+                    (CommandButtonProcessor,    "ID_MAKE_ATTACHMENT IDC_NAME_LIST IDD_SYNC", MakeAttachment, ()),
+                    (CommandButtonProcessor,    "ID_CREATE_CASE ID_ATT_METHOD_DROPDOWNLIST IDC_NAME_LIST", CreateCase, ()),
+                    (ListBoxProcessor,          "IDC_NAME_LIST", SetNameColumn, ())
+                ),
 
-            "IDD_NEW_CONTACT_DIALOG" : (
-                (CloseButtonProcessor,      "IDCANCEL"),
-                (CommandButtonProcessor,    "ID_CONTACT_SAVE_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_CONTACT_OFFICE_TEXT ID_CONTACT_MOBILE_TEXT ID_FAX_TEXT ID_STREET_TEXT ID_STREET2_TEXT ID_PARTNER_CITY_TEXT ID_ZIP_TEXT ID_PARTNER_TEXT", CreateContact, ()),
-                (TextProcessor,             "ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_PARTNER_TEXT" , SetDefaultContact, ()),
-                (DialogCommand,             "ID_NEW_PARTNER_BUTTON", "IDD_SELECT_PARTNER"),
-            ),
+                "IDD_NEW_CONTACT_DIALOG" : (
+                    (CloseButtonProcessor,      "IDCANCEL"),
+                    (CommandButtonProcessor,    "ID_CONTACT_SAVE_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_CONTACT_OFFICE_TEXT ID_CONTACT_MOBILE_TEXT ID_FAX_TEXT ID_STREET_TEXT ID_STREET2_TEXT ID_PARTNER_CITY_TEXT ID_ZIP_TEXT ID_PARTNER_TEXT IDET_NC_PARTNER_STATE IDET_NC_PARTNER_COUNTRY", CreateContact, ()),
+                    (TextProcessor,             "ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_PARTNER_TEXT IDET_NC_PARTNER_STATE IDET_NC_PARTNER_COUNTRY" , SetDefaultContact, ()),
+                    (DialogCommand,             "ID_NEW_PARTNER_BUTTON", "IDD_SELECT_PARTNER"),
+                    (DialogCommand,             "IDPB_NEW_PARTNER_BUTTON", "IDD_NEW_PARTNER_DIALOG"),
+                    (DialogCommand,             "IDPB_NC_SEARCH_STATE1", "IDD_SELECT_STATE"),
+                    (DialogCommand,             "IDPB_NC_SEARCH_COUNTRY1", "IDD_SELECT_COUNTRY"),
+                ),
 
-            "IDD_NEW_PARTNER_DIALOG" : (
-                (CloseButtonProcessor,      "IDCANCEL"),
-                (CommandButtonProcessor,    "ID_SAVE_PARTNER_BUTTON ID_PARTNER_NAME_TEXT", CreatePartner, ()),
-            ),
+                "IDD_NEW_PARTNER_DIALOG" : (
+                    (CloseButtonProcessor,      "IDCANCEL"),
+                    (CommandButtonProcessor,    "ID_SAVE_PARTNER_BUTTON ID_PARTNER_NAME_TEXT", CreatePartner, ()),
+                ),
 
-            "IDD_VIEW_PARTNER_DIALOG" : (
-                (TextProcessor,             "IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", GetDefaultEmail, ()),
-                (CommandButtonProcessor,    "IDPB_SEARCH_PARTNER IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", SearchPartner, ()),
-                (CommandButtonProcessor,    "IDPB_WRITE_CHANGES IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_STATE IDET_PARTNER_COUNTRY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP", WritePartner, ()),
-                (CloseButtonProcessor,      "IDCANCEL"),
-                (DialogCommand,             "ID_NEW_PART_BUTTON", "IDD_SELECT_PARTNER" ),
-                (DialogCommand,             "IDPB_NEWPARTNER_BUTTON" , "IDD_NEW_CONTACT_DIALOG")
-            ),
-            "IDD_SELECT_PARTNER" : (
-                (CloseButtonProcessor,      "IDCANCEL"),
-                (ListBoxProcessor,          "IDC_LIST_PARTNER" ,SetPartnerNameColumn, ()),
-                (CommandButtonProcessor,    "IDPB_PARTNER_SEARCH IDET_PARTNER_SEARCH_NAME IDC_LIST_PARTNER", SearchPartnerList,()),
-                (CommandButtonProcessor,    "IDPB_SELECT_PARTNER IDC_LIST_PARTNER IDD_SELECT_PARTNER" , SelectPartnerFromList,()),
-                (DialogCommand,             "IDPB_CREATE_NEW_PARTNER" , "IDD_NEW_PARTNER_DIALOG")
-            ),
+                "IDD_VIEW_PARTNER_DIALOG" : (
+                    (TextProcessor,             "IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", GetDefaultEmail, ()),
+                    (CommandButtonProcessor,    "IDPB_SEARCH_PARTNER IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", SearchPartner, ()),
+                    (CommandButtonProcessor,    "IDPB_WRITE_CHANGES IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_STATE IDET_PARTNER_COUNTRY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP", WritePartner, ()),
+                    (CloseButtonProcessor,      "IDCANCEL"),
+                    (DialogCommand,             "ID_NEW_PART_BUTTON", "IDD_SELECT_PARTNER" ),
+                    (DialogCommand,             "IDPB_NEWPARTNER_BUTTON" , "IDD_NEW_CONTACT_DIALOG"),
+                    (DialogCommand,             "IDPB_NEW_PART_BUTTON", "IDD_NEW_PARTNER_DIALOG"),
+                    (DialogCommand,             "IDPB_SEARCH_COUNTRY1", "IDD_SELECT_COUNTRY"),
+                    (DialogCommand,             "IDPB_SEARCH_STATE1", "IDD_SELECT_STATE"),
+
+                ),
+                "IDD_SELECT_PARTNER" : (
+                    (ListBoxProcessor,          "IDC_LIST_PARTNER" ,SetPartnerNameColumn, ()),
+                    (CommandButtonProcessor,    "IDPB_PARTNER_SEARCH IDET_PARTNER_SEARCH_NAME IDC_LIST_PARTNER", SearchPartnerList,()),
+                    (CommandButtonProcessor,    "IDPB_SELECT_PARTNER IDC_LIST_PARTNER IDD_SELECT_PARTNER" , SelectPartnerFromList,()),
+                    (DialogCommand,             "IDPB_CREATE_NEW_PARTNER" , "IDD_NEW_PARTNER_DIALOG")
+                ),
+                "IDD_OPEN_PARTNER_DIALOG" : (
+                    (CloseButtonProcessor,      "IDCANCEL"),
+                	(TextProcessor,             "IDET_PARTNER_LINK_TEXT", OpenPartnerForm, ()),
+                ),
+                "IDD_OPEN_DOCUEMNT_DIALOG" : (
+                    (CloseButtonProcessor,      "IDCANCEL"),
+                    (TextProcessor,             "IDEB_OPENDOC_LINK_TEXT", SerachOpenDocuemnt,()),
+                ),
+                "IDD_WEB_SERVER_PORT_DIALOG" :(
+                     (CloseButtonProcessor,      "IDCANCEL"),
+                     (WEBOKButtonProcessor,      "ID_WEB_OK IDET_WEB_SERVER IDET_WEB_PORT")
+                ),
+                "IDD_SELECT_COUNTRY" : (
+                    (CommandButtonProcessor,     "IDPB_SEARCH_COUNTRY IDET_COUNTRY_SEARCH_NAME IDC_LIST_COUNTRY" , SearchCountry, ()),
+                    (ListBoxProcessor,           "IDC_LIST_COUNTRY" ,SetCountryList, ()),
+                    (CommandButtonProcessor,    "IDPB_SELECT_COUNTRY IDC_LIST_COUNTRY IDD_SELECT_COUNTRY" , SelectCountryFromList,()),
+                ),
+                "IDD_SELECT_STATE" : (
+                    (CommandButtonProcessor,     "IDPB_STATE_SEARCH IDET_STATE_SEARCH_NAME IDC_LIST_STATE" , SearchState, ()),
+                    (ListBoxProcessor,           "IDC_LIST_STATE" ,SetStateList, ()),
+                    (CommandButtonProcessor,     "IDPB_SELECT_STATE IDC_LIST_STATE IDD_SELECT_STATE" , SelectStateFromList,()),
+                ),
 }
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
old mode 100755
new mode 100644
index bb028c0da90..a816b9838ab
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
@@ -177,6 +177,37 @@
 #define IDPB_PARTNER_SEARCH				2077
 #define IDPB_CREATE_NEW_PARTNER			2078
 #define ID_PARTNER_TEXT					2079
+#define IDET_WED_SERVER					2080
+#define IDET_WEB_PORT					2081
+#define ID_SET_WEB_CONNECTION			2082
+#define IDPB_WEB_CONNECTION				2083
+#define IDD_OPEN_PARTNER_DIALOG			2084
+#define IDET_PARTNER_LINK_TEXT			2085
+#define IDEB_OPENDOC_LINK_TEXT			2086
+#define IDD_OPEN_DOCUEMNT_DIALOG		2087
+#define IDD_WEB_SERVER_PORT_DIALOG		2088
+#define IDET_WEB_SERVER					2089
+#define IDET_WEB_PORT					2090
+#define ID_WEB_OK						2091
+#define IDPB_NEW_PARTNER_BUTTON			2092
+#define IDPB_NEW_PART_BUTTON			2093
+#define	IDD_SELECT_COUNTRY				2094
+#define IDET_COUNTRY_SEARCH_NAME		2095
+#define IDC_LIST_COUNTRY				2096
+#define IDPB_SELECT_COUNTRY				2097
+#define IDPB_SEARCH_COUNTRY				2098
+#define	IDD_SELECT_STATE				2099
+#define IDET_STATE_SEARCH_NAME			2100
+#define IDC_LIST_STATE					2101
+#define IDPB_SELECT_STATE				2102
+#define IDPB_SEARCH_STATE				2103
+#define IDPB_SEARCH_STATE1				2104
+#define IDPB_SEARCH_COUNTRY1			2105
+
+#define IDET_NC_PARTNER_STATE			2106
+#define IDPB_NC_SEARCH_STATE1			2107
+#define IDET_NC_PARTNER_COUNTRY			2108
+#define IDPB_NC_SEARCH_COUNTRY1			2109
 // Next default values for new objects
 //
 #ifdef APSTUDIO_INVOKED
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
old mode 100755
new mode 100644
index 3dac98b5fb0..4c4aabab683
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,11 +1,11 @@
-#C:\Documents and Settings\TinyERP\Desktop\OpenERP-Outlook-PlugIn\openerp-outlook-plugin\dialogs\resources\dialogs.py
-#This is a generated file. Please edit C:\Documents and Settings\TinyERP\Desktop\OpenERP-Outlook-PlugIn\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
-_rc_size_=11883
-_rc_mtime_=1285738756
+#C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
+#This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
+_rc_size_=16024
+_rc_mtime_=1286276397
 class FakeParser:
-	dialogs = {'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 200, 12), 1350568064], [128, 'Search Partner', 2070, (280, 41, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 100, 12), 1350568064], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 100, 12), 1350568064], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 150), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 200, 12), 1350568064], [128, 'Search Partner', 2033, (280, 17, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 90), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [128, 'Communication ', 2024, (188, 35, 150, 90), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 130, 45, 14), 1342242816], [128, 'Save', 40009, (240, 130, 45, 14), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (130, 230, 40, 14), 1342242816], [128, 'Cancel', 2, (175, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]]}
-	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDC_FOLDER_HAM': 1083, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, '_APS_NEXT_RESOURCE_VALUE': 128, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'IDET_PARTNER_CONTACT_NAME': 2046, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'ID_CONTACT_NAME_TEXT': 40005, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'ID_SEARCH_TEXT': 40003, 'ID_SEARCH': 40004, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012}
-	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 1083: 'IDC_FOLDER_HAM', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 40004: 'ID_SEARCH', 2046: 'IDET_PARTNER_CONTACT_NAME', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
+	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
+	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
+	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
 def ParseDialogs(s):
 	return FakeParser()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
old mode 100755
new mode 100644
index fb060ecdab3..62e8b26ca4a
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
@@ -57,6 +57,12 @@ BEGIN
     LTEXT           "Password : ",IDC_STATIC,30,90,100,17
     EDITTEXT        ID_PASSWORD,85,90,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
     PUSHBUTTON      "Connect",ID_BUT_TESTCONNECTION,179,110,60,13, WS_VISIBLE | WS_TABSTOP
+
+	GROUPBOX		"WebServer Parameters",IDC_STATIC_GROUP, 270, 10,150,130
+    LTEXT           "Server : ",IDC_STATIC, 280, 30, 50, 15
+    EDITTEXT        IDET_WED_SERVER,310, 29, 90, 12,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "Change",ID_SET_WEB_CONNECTION, 295, 50, 50, 12 , WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON      "Connect",IDPB_WEB_CONNECTION, 350, 50, 50, 12 , WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_OBJECT_SETTINGS DIALOGEX 0, 0, 430, 210
@@ -131,7 +137,7 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,385,300,60,14,WS_TABSTOP
 END
 
-IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 150
+IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 180
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Create a New Contact"
@@ -139,10 +145,11 @@ FONT 8, "Tahoma", 1000, 0, 0x0
 BEGIN
 
 	LTEXT           "Select Partner : ",IDC_STATIC,13,20,50,17
-	EDITTEXT        ID_PARTNER_TEXT, 70, 18, 200, 12 , ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON   	"Search Partner",ID_NEW_PARTNER_BUTTON,280,17,60,14, WS_TABSTOP
+	EDITTEXT        ID_PARTNER_TEXT, 70, 18, 150, 12 , ES_AUTOHSCROLL |ES_READONLY
+	PUSHBUTTON   	"Search Partner",ID_NEW_PARTNER_BUTTON,225,17,60,14, WS_TABSTOP
+	PUSHBUTTON   	"New Partner",IDPB_NEW_PARTNER_BUTTON,290, 17, 50, 14, WS_TABSTOP
 
-    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,35,175,90
+    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,35,175,123
 	LTEXT           "Contact Name : ",IDC_STATIC, 18, 53, 100, 17
 	EDITTEXT        ID_CONTACT_NAME_TEXT, 76, 52, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
 	LTEXT           "Street : ",IDC_STATIC, 18, 67, 40, 17
@@ -153,9 +160,15 @@ BEGIN
     EDITTEXT		ID_ZIP_TEXT,76, 93, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
     LTEXT           "City : ",IDC_STATIC, 18,106, 50, 17
     EDITTEXT		ID_PARTNER_CITY_TEXT,76,107,100,12,ES_AUTOHSCROLL | WS_TABSTOP
+    LTEXT           "Fed. State : ",IDC_STATIC,18,121,50,17
+    EDITTEXT		IDET_NC_PARTNER_STATE, 76, 122, 54, 12,ES_AUTOHSCROLL |ES_READONLY
+    PUSHBUTTON 		"Search", IDPB_NC_SEARCH_STATE1 ,135, 121, 40, 12, WS_TABSTOP
+	LTEXT           "Country :",IDC_STATIC, 18, 134, 35, 17
+    EDITTEXT		IDET_NC_PARTNER_COUNTRY, 76, 135, 54, 12,ES_AUTOHSCROLL |ES_READONLY
+	PUSHBUTTON 		"Search", IDPB_NC_SEARCH_COUNTRY1, 135, 136, 40, 12, WS_TABSTOP
 
 
-    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 35, 150, 90
+    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 35, 150, 123
 	LTEXT           "Office : ",IDC_STATIC,194, 53, 30, 17
 	EDITTEXT        ID_CONTACT_OFFICE_TEXT, 224, 52, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
 	LTEXT           "Mobile : ",IDC_STATIC,194, 67, 30, 17
@@ -165,8 +178,8 @@ BEGIN
 	LTEXT           "Email  : ",IDC_STATIC, 194, 95, 30, 17
 	EDITTEXT        ID_CONTACT_EMAIL_TEXT, 224, 94, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
 
-	PUSHBUTTON   	"Cancel",IDCANCEL,290,130,45,14, WS_TABSTOP
-	PUSHBUTTON   	"Save",ID_CONTACT_SAVE_BUTTON,240,130,45,14, WS_TABSTOP
+	PUSHBUTTON   	"Cancel",IDCANCEL,290,162,45,13, WS_TABSTOP
+	PUSHBUTTON   	"Save",ID_CONTACT_SAVE_BUTTON,240,162,45,13, WS_TABSTOP
 END
 
 IDD_NEW_PARTNER_DIALOG DIALOGEX 0, 0, 140,40
@@ -192,8 +205,9 @@ BEGIN
     PUSHBUTTON   	"Search Contact ",IDPB_SEARCH_PARTNER,280,15,60,14,WS_TABSTOP
 
     LTEXT           "Partner Name : ",IDC_STATIC,13,42,50,17
-	EDITTEXT		IDET_PARTNER,70, 42, 200, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON   	"Search Partner",ID_NEW_PART_BUTTON,280,41,60,14, WS_TABSTOP
+	EDITTEXT		IDET_PARTNER,70, 42, 150, 12,ES_AUTOHSCROLL |ES_READONLY
+	PUSHBUTTON   	"Search Partner",ID_NEW_PART_BUTTON,225,41,60,14, WS_TABSTOP
+	PUSHBUTTON   	"New Partner",IDPB_NEW_PART_BUTTON,290,41,50,14, WS_TABSTOP
 
     GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,65,175,125
     LTEXT           "Contact Name : ",IDC_STATIC,18,83,50,17
@@ -206,10 +220,14 @@ BEGIN
 	EDITTEXT		IDET_ZIP, 76, 125, 100, 12 , ES_AUTOHSCROLL | WS_TABSTOP
     LTEXT           "City : ",IDC_STATIC,18,140,50,17
     EDITTEXT		IDET_PARTNER_CITY,76,139,100,12,ES_AUTOHSCROLL | WS_TABSTOP
+
     LTEXT           "Fed. State : ",IDC_STATIC,18,154,50,17
-    EDITTEXT		IDET_PARTNER_STATE, 76, 153, 100, 12,ES_AUTOHSCROLL |ES_READONLY
+    EDITTEXT		IDET_PARTNER_STATE, 76, 153, 54, 12,ES_AUTOHSCROLL |ES_READONLY
+    PUSHBUTTON 		"Search", IDPB_SEARCH_STATE1 ,135, 153, 40, 12, WS_TABSTOP
+
 	LTEXT           "Country :",IDC_STATIC, 18, 169, 35, 17
-    EDITTEXT		IDET_PARTNER_COUNTRY, 76, 168, 100, 12,ES_AUTOHSCROLL |ES_READONLY
+    EDITTEXT		IDET_PARTNER_COUNTRY, 76, 168, 54, 12,ES_AUTOHSCROLL |ES_READONLY
+	PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY1, 135, 168, 40, 12, WS_TABSTOP
 
     GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 65, 152, 125
     LTEXT           "Phone : ",IDC_STATIC, 194, 83, 30, 17
@@ -240,7 +258,75 @@ BEGIN
     CONTROL         "List1",IDC_LIST_PARTNER,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
             		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
 	PUSHBUTTON 		"Create New Partner", IDPB_CREATE_NEW_PARTNER, 10, 230, 100, 14, WS_TABSTOP
-	PUSHBUTTON 		"Select", IDPB_SELECT_PARTNER, 130, 230, 40, 14, WS_TABSTOP
-    PUSHBUTTON      "Cancel", IDCANCEL, 175, 230, 40, 14, WS_TABSTOP
+	PUSHBUTTON 		"Select", IDPB_SELECT_PARTNER, 170, 230, 40, 14, WS_TABSTOP
+END
+
+IDD_OPEN_PARTNER_DIALOG DIALOGEX 0, 0, 200,65
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Open Partner"
+FONT 8, "Tahoma", 400, 0, 0x0
+BEGIN
+    LTEXT           "Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ",IDC_STATIC,5,3,190,25
+    EDITTEXT        IDET_PARTNER_LINK_TEXT,5,31,190,12,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Ok",IDCANCEL,150,45,45,13,WS_TABSTOP
+
+END
+
+IDD_OPEN_DOCUEMNT_DIALOG DIALOGEX 0, 0, 200,65
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Open Document"
+FONT 8, "Tahoma", 400, 0, 0x0
+BEGIN
+    LTEXT           "Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ",IDC_STATIC,5,3,190,25
+    EDITTEXT        IDEB_OPENDOC_LINK_TEXT,5,31,190,12,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Ok",IDCANCEL,150,45,45,14,WS_TABSTOP
+END
+
+IDD_WEB_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 55
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "OpenERP Connection"
+FONT 8, "Tahoma", 400, 0, 0x0
+BEGIN
+    LTEXT           "Server : ",IDC_STATIC,5,3,150,17
+    EDITTEXT        IDET_WEB_SERVER,40,3,100,12,ES_AUTOHSCROLL | WS_TABSTOP
+    LTEXT           "Port   : ",IDC_STATIC,5,18,100,17
+    EDITTEXT        IDET_WEB_PORT,40,18,100,12,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Close",IDCANCEL,110,35,45,14,WS_TABSTOP
+    DEFPUSHBUTTON   "OK",ID_WEB_OK,60,35,45,14,WS_TABSTOP
+END
+
+IDD_SELECT_COUNTRY DIALOGEX 0, 0, 220, 250
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Search Country"
+FONT 8, "Tahoma", 400, 0, 0x0
+BEGIN
+
+    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
+    EDITTEXT		IDET_COUNTRY_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY, 160, 10, 50, 14, WS_TABSTOP
+
+    CONTROL         "List1",IDC_LIST_COUNTRY,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
+            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
+	PUSHBUTTON 		"Select", IDPB_SELECT_COUNTRY, 170, 230, 40, 14, WS_TABSTOP
+END
+
+IDD_SELECT_STATE DIALOGEX 0, 0, 220, 250
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Search Country"
+FONT 8, "Tahoma", 400, 0, 0x0
+BEGIN
+
+    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
+    EDITTEXT		IDET_STATE_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON 		"Search", IDPB_STATE_SEARCH, 160, 10, 50, 14, WS_TABSTOP
+
+    CONTROL         "List1",IDC_LIST_STATE,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
+            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
+	PUSHBUTTON 		"Select", IDPB_SELECT_STATE, 170, 230, 40, 14, WS_TABSTOP
 END
 
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
old mode 100755
new mode 100644
index e18b7c5414d..14d674aef3a
--- a/addons/outlook/plugin/openerp-outlook-plugin/eml.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
@@ -90,4 +90,5 @@ def generateEML(mail):
         print email.lastErrorText()
         sys.exit()
 
+    print "Saved EML!",eml_path
     return eml_path
\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
old mode 100755
new mode 100644
index 45fdeaa5d82..6393c357af6
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -58,7 +58,8 @@ class XMLRpcConn(object):
     _public_methods_ = ['GetDBList', 'login', 'GetAllObjects', 'GetObjList', 'InsertObj', 'DeleteObject', 'GetCSList', \
                         'ArchiveToOpenERP', 'IsCRMInstalled', 'GetPartners', 'GetObjectItems', \
                         'CreateCase', 'MakeAttachment', 'CreateContact', 'CreatePartner', 'getitem', 'setitem', \
-                        'SearchPartnerDetail', 'WritePartnerValues', 'GetAllState', 'GetAllCountry' ]
+                        'SearchPartnerDetail', 'WritePartnerValues', 'GetAllState', 'GetAllCountry', 'SearchPartner', 'SearchEmailResources', \
+                        'GetCountry', 'GetStates', 'FindCountryForState']
     _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER
     _reg_clsid_ = "{C6399AFD-763A-400F-8191-7F9D0503CAE2}"
     _reg_progid_ = "Python.OpenERP.XMLRpcConn"
@@ -262,9 +263,10 @@ class XMLRpcConn(object):
             msg =fp.read()
             fp.close()
             new_mail =  email.message_from_string(str(msg))
+            execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(new_mail))
         except Exception,e:
             win32ui.MessageBox(str(e),"Mail Reading Error")
-        execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(new_mail))
+            pass
 
     def MakeAttachment(self, recs, mail):
         attachments = mail.Attachments
@@ -303,12 +305,19 @@ class XMLRpcConn(object):
         return result
 
     def CreateContact(self, res=None):
-        import win32ui
         res=eval(str(res))
         partner = res['partner_id']
+        state = res['state_id']
+        country = res['country_id']
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
         res.update({'partner_id' : partner_id[0]})
+        if not state == "":
+            country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country))])
+            res.update({'country_id' : country_id[0]})
+        if not country == "":
+            state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state))])
+            res.update({'state_id' : state_id[0]})
         id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner.address','create',res)
         return id
 
@@ -340,10 +349,14 @@ class XMLRpcConn(object):
         new_dict = dict(new_vals)
         email=new_dict['email']
         partner = new_dict['partner']
+        country_val = new_dict['country']
+        state_val = new_dict['state']
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
+        country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country_val))])
+        state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state_val))])
         address_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(email))])
-        if not address_id:
+        if not partner_id or not address_id or not country_id or not state_id:
             return flag
         address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','state_id','country_id'])
         vals_res_address={
@@ -356,6 +369,8 @@ class XMLRpcConn(object):
                            'mobile' : new_dict['mobile'],
                            'fax' : new_dict['fax'],
                            'zip' : new_dict['zip'],
+                           'country_id' : country_id[0],
+                           'state_id' : state_id[0]
                          }
         temp = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'write', address_id, vals_res_address)
         if temp:
@@ -385,3 +400,76 @@ class XMLRpcConn(object):
             obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country','read', [country_id], ['id','name'])[0]
             country_list.append((obj['id'], ustr(obj['name'])))
         return country_list
+
+    def SearchPartner(self, partner = ""):
+        import win32ui
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
+        if not partner_id:
+        	return None
+        return partner_id[0]
+
+    def SearchEmailResources(self, mail):
+        import win32ui
+        import eml
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        sub = ""
+        res_vals = []
+        try:
+            parse_mail = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','parse_message',mail)
+            win32ui.MessageBox(str(parse_mail),"Temp")
+            eml_path=eml.generateEML(mail)
+            fp = open(eml_path, 'rb')
+            msg =fp.read()
+            fp.close()
+            new_mail =  email.message_from_string(str(msg))
+            sub = new_mail.get('Subject')
+            win32ui.MessageBox(str(sub),"Sub")
+        except Exception,e:
+            win32ui.MessageBox(str(e),"Mail Reading Error")
+            return None
+        mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('name','=',sub)])
+        if not mail_id:
+            return None
+        address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message','read',mail_id[0],['model','res_id'])
+        for key, vals in address.items():
+            res_vals.append([key,vals])
+        return res_vals
+
+
+    def GetCountry(self, country_search=''):
+        import win32ui
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        ids=[]
+        obj_list=[]
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',[('name','ilike',ustr(country_search))])
+        if ids:
+            ids.sort()
+            for id in ids:
+                object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','read',[id],['id','name'])[0]
+                obj_list.append((object['id'], ustr(object['name'])))
+            obj_list.sort(lambda x, y: cmp(x[1],y[1]))
+        return obj_list
+
+    def GetStates(self, state_search=''):
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        ids=[]
+        obj_list=[]
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','ilike',ustr(state_search))])
+        if ids:
+            ids.sort()
+            for id in ids:
+                object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',[id],['id','name'])[0]
+                obj_list.append((object['id'], ustr(object['name'])))
+            obj_list.sort(lambda x, y: cmp(x[1],y[1]))
+        return obj_list
+    def FindCountryForState(self, state_search=''):
+        import win32ui
+        res_vals = []
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))])
+        if not ids:
+            return None
+        object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',ids)[0]
+        country = object['country_id'][1]
+        return country

From f63146eed99df772b78f09f837c059bc3865cfa1 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 6 Oct 2010 15:09:32 +0530
Subject: [PATCH 035/294] [IMP] project_scrum : improved view of postpone
 wizard

bzr revid: jas@tinyerp.com-20101006093932-ong6vxgir7i50tvt
---
 addons/project_scrum/__openerp__.py               | 2 +-
 addons/project_scrum/board_project_scrum_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 30b9f84276b..accbae25604 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -54,9 +54,9 @@
         'project_scrum_report.xml',
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
+        'wizard/project_scrum_postpone_view.xml',
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
-        'wizard/project_scrum_postpone_view.xml',
         'process/project_scrum_process.xml',
         "board_project_scrum_view.xml",
     ],
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 5859121c3c5..e9581fa9707 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -82,8 +82,8 @@
                              <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
                         <child2>
-                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progess" width="510"/>
-                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progess" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progress" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progress" width="510"/>
                         </child2>
                     </hpaned>
                 </form>

From 641df72bc5fde89910b0a4add9bcf9a8a842625c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 17:21:26 +0530
Subject: [PATCH 036/294] [FIX]: mail_gateway: Put proper domain on Emails in
 partner histoty tab

bzr revid: rpa@tinyerp.com-20101006115126-njke94u46bo0hiah
---
 addons/mail_gateway/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/res_partner_view.xml b/addons/mail_gateway/res_partner_view.xml
index 3cb1bb7fe5a..dbae434d46f 100644
--- a/addons/mail_gateway/res_partner_view.xml
+++ b/addons/mail_gateway/res_partner_view.xml
@@ -11,7 +11,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                  <page string="History" position="inside">
-                      <field name="emails" colspan="4" nolabel="1"/>
+                      <field name="emails" colspan="4" nolabel="1" domain="[('history', '=', True)]"/>
                  </page>
             </field>
        </record>

From 61b776b330a1d2fcdc6be3bd7cad5f0ca09001eb Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 6 Oct 2010 17:41:46 +0530
Subject: [PATCH 037/294] [IMP]: crm*: Improvement in section and stage
 relation, Improved domain of stage_id

bzr revid: rpa@tinyerp.com-20101006121146-pua39253fb2rcgp1
---
 addons/crm/crm.py                   | 10 +++++++++-
 addons/crm/crm_lead_view.xml        |  4 ++--
 addons/crm/crm_opportunity_view.xml |  3 +--
 addons/crm_claim/crm_claim_view.xml |  7 +++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 76ac424f1e0..6631413033d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -538,7 +538,7 @@ class crm_case_section(osv.osv):
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16,2 )), 
-        'stage_ids':fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
+        'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
     }
 
     _defaults = {
@@ -628,6 +628,14 @@ class crm_case_categ(osv.osv):
 crm_case_categ()
 
 
+class crm_case_stage(osv.osv):
+    _inherit = "crm.case.stage"
+    _columns = {
+        'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
+    }
+crm_case_stage()
+
+
 class crm_case_resource_type(osv.osv):
     """ Resource Type of case """
     _name = "crm.case.resource.type"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fc7a7dfdb73..702cddeaf16 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -55,7 +55,7 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" readonly="1"/>
+                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
                             states="open,pending,draft" type="object"
@@ -234,7 +234,7 @@
                 <field name="referred" invisible="1"/>
                 <field name="channel_id" invisible="1"/>
 
-                <field name="stage_id" readonly="1"/>
+                <field name="stage_id"/>
                 <button name="stage_previous" string="Previous Stage"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next Stage"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 86bb99633ac..5b45af19398 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,9 +14,8 @@
                             <label string="Stage:" align="1.0"/>
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
-                                    widget="selection"
                                     on_change="onchange_stage_id(stage_id)"
-                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
+                                    domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
                                 <button name="stage_previous"
                                     states="draft,open,pending" type="object"
                                     icon="gtk-go-back" string="" />
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ea1d9e543ff..7a75353608c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -107,11 +107,10 @@
                                 <group colspan="4" col="6">
                                     <field name="user_id" string="Responsible"/>
                                     <field name="section_id" widget="selection"/>
-                                    <label string="Stage: " align="1.0"/>
-                                    <group colspan="1" col="3">
-                                        <field name="stage_id" nolabel="1" readonly="1"
+                                    <group colspan="2" col="4">
+                                        <field name="stage_id"
                                             on_change="onchange_stage_id(stage_id)"
-                                            domain="[('object_id.model', '=', 'crm.claim')]" />
+                                            domain="[('object_id.model', '=', 'crm.claim'), ('section_ids', '=', section_id)]" />
                                         <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                                     </group>

From 22c272feb68976836c1d191df51413d651272bf1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 6 Oct 2010 19:27:37 +0530
Subject: [PATCH 038/294] [IMP] Project->scrum->scrum Meeting-Improvement in
 send Email Button(wizard)

bzr revid: ron@tinyerp.com-20101006135737-5fb9bbl0bv9sc9ht
---
 addons/project_scrum/project_scrum_view.xml   |   2 -
 .../wizard/project_scrum_email.py             | 150 ++++++++++++------
 .../wizard/project_scrum_email_view.xml       |   6 +-
 3 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index f2b56041d49..1a7d1cdc5ee 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -404,8 +404,6 @@
                             <separator colspan="4" string="Are there anything blocking you?"/>
                             <field colspan="4" name="question_blocks" nolabel="1"/>
                             <separator colspan="4" string=""/>
-							<button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
-                            <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                         </page>
                         <page string="Optional Info">
                             <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index d10746ee83f..9d0dbf54e2d 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -23,6 +23,7 @@ from lxml import etree
 from osv import fields, osv
 from tools.translate import _
 from datetime import datetime
+import tools
 
 class project_scrum_email(osv.osv_memory):
     _name = 'project.scrum.email'
@@ -32,7 +33,6 @@ class project_scrum_email(osv.osv_memory):
             context = {}
         active_id = context.get('active_id', False)
         res = False
-#        res='master@gmail.com'
         if active_id:
             res = self.pool.get('project.scrum.meeting').browse(cr,uid,active_id,context=context).sprint_id.scrum_master_id.user_email
         return res
@@ -42,7 +42,6 @@ class project_scrum_email(osv.osv_memory):
             context = {}
         active_id = context.get('active_id', False)
         res = False
-#        res='owner@gmail.com'
         if active_id:
             res = self.pool.get('project.scrum.meeting').browse(cr, uid,active_id,context=context).sprint_id.product_owner_id.user_email
         return res
@@ -53,11 +52,9 @@ class project_scrum_email(osv.osv_memory):
         active_id = context.get('active_id', False)
         res = False
 
-#        res='owner@gmail.com'
         if active_id:
             res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
             res=" Scrum Meeting  of " + res1
-            print res
         return res
 
     def _get_message(self,cr, uid, context=None):
@@ -66,21 +63,21 @@ class project_scrum_email(osv.osv_memory):
         active_id = context.get('active_id', False)
         res = False
 
-#        res='owner@gmail.com'
         if active_id:
-
             res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
+            sprint_name= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).sprint_id.name
             cnv_date = datetime.strptime(res1,'%Y-%m-%d')
             weekfordate=datetime.strftime(cnv_date,'%W')
             res2= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).sprint_id.project_id.name
-            res=" Scrum Meeting  of "+res1+" on Sprint Week "+weekfordate+" of Project "+res2
+            res3='Hello  , \n    I am sending you Daily Meeting Details of date  '+res1+'  for the Sprint  '+sprint_name
+            res=res3+" of Project "+res2
         return res
 
 
     _columns = {
-        'scrum_master_id': fields.char('Scrum Master Email', size=220,help="The person who is maintains the processes for the product"),
-        'product_owner_id': fields.char('Product Owner Email', size=220,help="The person who is responsible for the product"),
-        'subject':fields.char('Subject',size=220),
+        'scrum_master_id': fields.char('Scrum Master Email', size=64,help="The person who is maintains the processes for the product"),
+        'product_owner_id': fields.char('Product Owner Email', size=64,help="The person who is responsible for the product"),
+        'subject':fields.char('Subject',size=64),
         'message':fields.text('Message'),
 
                }
@@ -93,41 +90,102 @@ class project_scrum_email(osv.osv_memory):
 
     }
 
-#    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-#        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-#        users_pool = self.pool.get('res.users')
-#        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
-#        time_mode_name = time_mode and time_mode.name or 'Hours'
-#        if time_mode_name in ['Hours','Hour']:
-#            return res
-#
-#        eview = etree.fromstring(res['arch'])
-#
-#        def _check_rec(eview):
-#            if eview.attrib.get('widget','') == 'float_time':
-#                eview.set('widget','float')
-#            for child in eview:
-#                _check_rec(child)
-#            return True
-#
-#        _check_rec(eview)
-#
-#        res['arch'] = etree.tostring(eview)
-#
-#        for field in res['fields']:
-#            if 'Hours' in res['fields'][field]['string']:
-#                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
-#        return res
 
-#    def compute_hours(self, cr, uid, ids, context=None):
-#        if context is None:
-#            context = {}
-#        data = self.browse(cr, uid, ids, context=context)[0]
-#        task_pool = self.pool.get('project.task')
-#        task_id = context.get('active_id', False)
-#        if task_id:
-#            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
-#            if context.get('button_reactivate', False):
-#                task_pool.do_reopen(cr, uid, [task_id], context=context)
-#        return {}
+    def button_send_scrum_email(self, cr, uid, ids, context=None):
+        if context is None:
+            context={}
+
+        active_id = context.get('active_id', False)
+        scrum_obj=self.pool.get('project.scrum.meeting').browse(cr, uid,active_id,context=context)
+
+#        wizard data
+        meeting_wizard_id=self.browse(cr,uid,ids,context=context)[0]
+        scrum_master_email=meeting_wizard_id.scrum_master_id
+        product_owner_email=meeting_wizard_id.product_owner_id
+        mail_subject=meeting_wizard_id.subject
+        mail_message=meeting_wizard_id.message
+
+
+
+#        Record Data
+        if active_id:
+            scrum_master_name=scrum_obj.sprint_id.scrum_master_id.name
+            product_owner_name=scrum_obj.sprint_id.product_owner_id.name
+            last_meeting = scrum_obj.question_yesterday
+            if not last_meeting:
+                last_meeting=""
+            next_meeting = scrum_obj.question_today
+            if not next_meeting:
+                next_meeting=""
+            block_meeting = scrum_obj.question_blocks
+            if not block_meeting:
+                block_meeting=""
+            backlog_accurate = scrum_obj.question_backlog
+            if not backlog_accurate:
+                backlog_accurate=""
+            mail_date=scrum_obj.date
+            sprint_name=scrum_obj.sprint_id.name
+            task_record_list=[]
+            for task_assign in scrum_obj.task_ids:
+                task_record=task_assign.name
+                task_record_list.append(task_record)
+
+#         Email
+        if scrum_master_email:
+            if product_owner_email:
+                send_owner = self.email_send(cr,uid, ids,product_owner_email,mail_subject,mail_message,
+                                             last_meeting,next_meeting,block_meeting,backlog_accurate,
+                                             task_record_list,product_owner_name,
+                                             mail_date,sprint_name,active_id)
+                if not send_owner:
+                    raise osv.except_osv(_('Error !'), _(' Email Not send to the product owner !' ))
+
+            else:
+                raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.'))
+            send_master = self.email_send(cr, uid, ids,scrum_master_email,mail_subject,mail_message,
+                                          last_meeting,next_meeting,block_meeting,backlog_accurate,
+                                          task_record_list,scrum_master_name,mail_date,
+                                          sprint_name,active_id)
+            if not send_master:
+                    raise osv.except_osv(_('Error !'), _(' Email Not send to the scrum master !' ))
+            else:
+                return {'type':'ir.actions.act_window_close' }
+        else:
+            raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.'))
+
+        return True
+
+    def email_send(self, cr, uid, ids, email,mail_subject,mail_message,
+                   last_meeting,next_meeting,block_meeting,backlog_accurate,
+                   task_record_list,user_own_name,mail_date,sprint_name,active_id,
+                   context=None):
+        if context is None:
+            context = {}
+        email_from = tools.config.get('email_from', False)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        user_email = email_from or user.address_id.email
+        sub_name = mail_subject
+
+        body ="\n"+mail_message+"\n"
+        body += "\n"+ _('What did you do since the last meeting?')+ '\n_______________________\n'
+        body +="\n"+last_meeting+"\n"
+        body +="\n" +_("What do you plan to do till the next meeting?")+ '\n_______________________ \n'
+        body +="\n"+next_meeting+"\n"
+        body +="\n"+ _('Are there anything blocking you?') +'\n_______________________ \n'
+        body +="\n"+block_meeting+"\n"
+        body +="\n"+ _('Are your Sprint Backlog estimate accurate ?') +'\n_______________________ \n'
+        body +="\n"+backlog_accurate+"\n"
+        body += "\n"+ _('Tasks Summary:')+ '\n_______________________'
+        str=""
+        for taskassign in task_record_list:
+            str=str +"\n"
+            str  =str + taskassign
+        body +=str
+        body += "\n\n"+_('Thank you')+",\n"+ user.name
+
+        flag = tools.email_send(user_email,[email], sub_name, body, reply_to=None,openobject_id=active_id)
+        if not flag:
+            return False
+        return True
+
 project_scrum_email()
diff --git a/addons/project_scrum/wizard/project_scrum_email_view.xml b/addons/project_scrum/wizard/project_scrum_email_view.xml
index 1552192b02c..5308bd34e89 100644
--- a/addons/project_scrum/wizard/project_scrum_email_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_email_view.xml
@@ -12,8 +12,8 @@
                     <group col="2" colspan="4">
 	                    <field name="scrum_master_id"/>
 	                    <field name="product_owner_id"/>
-	                    <field name="subject"/>
-                    </group>
+					</group>
+                    <field name="subject"/>
 					<notebook colspan="4">
 						<page string="Message">
                     		<field name="message" nolabel="1"/>
@@ -22,7 +22,7 @@
 
                     <separator string="" colspan="4"/>
                     <button icon="gtk-close" special="cancel" string="_Cancel"/>
-                    <button icon="gtk-go-forward"  string="_Send" type="object" default_focus="1"/>
+                    <button icon="gtk-go-forward" name="button_send_scrum_email"  string="_Send" type="object" default_focus="1" />
                 </form>
             </field>
         </record>

From 034d7f368912bcb4570d8c31973dbd8a95293dd9 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Thu, 7 Oct 2010 12:02:17 +0530
Subject: [PATCH 039/294] [IMP] eml retun python email object and saving mail
 to windows %temp% dictionary

bzr revid: jam@tinyerp.com-20101007063217-gxt0un71raran4vb
---
 .../plugin/openerp-outlook-plugin/addin.py    |  2 +-
 .../dialogs/dialog_map.py                     | 48 ++++++++++------
 .../plugin/openerp-outlook-plugin/eml.py      | 31 ++++++-----
 .../openerp-outlook-plugin/tiny_xmlrpc.py     | 55 +++++++------------
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 67334e0ac7f..9cea4016bb2 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -196,7 +196,7 @@ class OutlookAddin:
             toolbarweb = bars.Item("Web")
 
             item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonPOpenPartner = DispatchWithEvents(item, OpenPartner)
+            item = self.toolbarButtonOpenPartner = DispatchWithEvents(item, OpenPartner)
             item.Caption = "Open Partners"
             item.TooltipText = "Click to Open OpenERP Partner Contact Information."
             item.Enabled = True
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index 760a59929e0..444a8cbc685 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -679,17 +679,21 @@ def CreateCase(btnProcessor,*args):
             for rec in r:
                 if rec[0] == 'res.partner':
                     partner_ids.append(rec[1])
-
+            f = False
             #Create new case
             try:
-                NewConn.CreateCase(str(section), mail, partner_ids)
+                f = NewConn.CreateCase(str(section), mail, partner_ids)
                 msg="New Document created."
                 flag=flag_info
             except Exception,e:
                 msg="New Document not created \n\n"+str(e)
                 flag=flag_error
-            win32ui.MessageBox(msg, "Create Document", flag)
-            return
+            if f:
+                win32ui.MessageBox(msg, "Create Document", flag)
+                return
+            else:
+                win32ui.MessageBox("Error While creating document.\n Document can not be created.", "Create Document", flag_error)
+                return
         else:
             win32ui.MessageBox("Document can not be created. CRM not installed", "Create Object", flag_info)
     except Exception, e:
@@ -935,9 +939,13 @@ def SetDefaultContact(txtProcessor,*args):
     global partner_ref
     global new_con_country
     global new_con_state
-    state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
-    country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
+    state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
+    country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
     if txtProcessor.init_done:
+        if new_con_country == "":
+            new_con_country = country
+        if new_con_state == "":
+            new_con_state = state
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1],partner_ref)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
@@ -1063,6 +1071,8 @@ def set_name_email(dialogProcessor,*args):
     name = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[0])
     email = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[1])
 
+#Function for Getting default mail when dialog is loaded and finding contact related to this
+#setting values to the appropriate text areas
 def GetDefaultEmail(txtProcessor,*args):
 
     from win32com.client import Dispatch
@@ -1403,27 +1413,32 @@ def OpenPartnerForm(txtProcessor,*args):
 def SerachOpenDocuemnt(txtProcessor,*args):
     from win32com.client import Dispatch
     import win32con
+    import win32ui
     b = check()
     if not b:
         return
     global web_server
     global web_server_port
+    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
+    assert ex.Selection.Count == 1
+    mail = ex.Selection.Item(1)
+    link_box = None
     #Acquiring control of the text box
-    link_box = txtProcessor.GetControl()
+    try:
+        link_box = txtProcessor.GetControl()
+    except Exception,e:
+        win32ui.MessageBox(str(e),"Excet")
     if web_server.strip() == "" or web_server.strip() == "http:\\\\":
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
         txtProcessor.init_done=True
         return
     linktodoc = ""
     #Reading Current Selected Email.
-    vals = []
-
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    e_id = ustr(mail.EntryID).encode('iso-8859-1')
-    vals = list(NewConn.SearchEmailResources(mail))
-
+    win32ui.MessageBox(str(mail),"mail")
+    try:
+        vals = NewConn.SearchEmailResources(mail)
+    except Exception,e:
+        win32ui.MessageBox(str(e),"Excep")
     if vals == None:
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, "< Mail is still not archived.>")
         txtProcessor.init_done=True
@@ -1629,9 +1644,6 @@ dialog_map = {
                 "IDD_SERVER_PORT_DIALOG" : (
                     (CloseButtonProcessor,    "IDCANCEL"),
                     (OKButtonProcessor,  "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL"),
-                #                (RadioButtonProcessor, "IDR_XML_PROTOCOL", GetConn, ()),
-                #                (RadioButtonProcessor, "IDR_XMLS_PROTOCOL", GetConn, ()),
-                #                (RadioButtonProcessor, "IDR_NETRPC_PROTOCOL", GetConn, ()),
                 ),
 
                 "IDD_SYNC" :               (
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
index 14d674aef3a..84d5a50df44 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/eml.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
@@ -26,7 +26,8 @@ import chilkat
 import os
 from manager import ustr
 import win32ui
-email = chilkat.CkEmail()
+import email
+cemail = chilkat.CkEmail()
 dt = chilkat.SYSTEMTIME()
 def generateEML(mail):
     sub = (mail.Subject).replace(' ','')
@@ -36,20 +37,21 @@ def generateEML(mail):
     sender_name = mail.SenderEmailAddress
     attachments=mail.Attachments
 
-    email = chilkat.CkEmail()
-    email.put_Subject (ustr(sub).encode('iso-8859-1'))
-    email.put_Body (ustr(body).encode('utf-8'))
-    email.put_FromAddress (ustr(sender_email).encode('iso-8859-1'))
-    email.put_From (ustr(sender_email).encode('iso-8859-1'))
+    cemail = chilkat.CkEmail()
+    cemail.put_Subject (ustr(sub).encode('iso-8859-1'))
+    cemail.put_Body (ustr(body).encode('utf-8'))
+    cemail.put_FromAddress (ustr(sender_email).encode('iso-8859-1'))
+    cemail.put_From (ustr(sender_email).encode('iso-8859-1'))
 
     for i in xrange(1, recipients.Count+1):
         name = ustr(recipients.Item(i).Name).encode('iso-8859-1')
         address = ustr(recipients.Item(i).Address).encode('iso-8859-1')
-        email.AddTo(name,address)
+        cemail.AddTo(name,address)
 
     eml_name= ustr(sub).encode('iso-8859-1')+'-'+str(mail.EntryID)[-9:]
     ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n']
-    mails_folder_path = os.path.abspath(os.path.dirname(__file__)+"\\dialogs\\resources\\mails\\")
+    #mails_folder_path = os.path.abspath("%temp%\\dialogs\\resources\\mails\\")
+    mails_folder_path = os.path.abspath("C:\\printing")
     attachments_folder_path = mails_folder_path + "\\attachments\\"
     if not os.path.exists(attachments_folder_path):
         os.makedirs(attachments_folder_path)
@@ -70,7 +72,7 @@ def generateEML(mail):
             os.remove(att_file)
         f1  = att_file
         attachments[i].SaveAsFile(att_file)
-        contentType = email.addFileAttachment(att_file)
+        contentType = cemail.addFileAttachment(att_file)
         if (contentType == None ):
             print mail.lastErrorText()
             sys.exit()
@@ -85,10 +87,11 @@ def generateEML(mail):
        f = eml_name.split('-')
        eml_name = f[0][0:l] + '.' + f[-1]
     eml_path = ustr(os.path.join(mails_folder_path,eml_name+".eml")).encode('iso-8859-1')
-    success = email.SaveEml(eml_path)
+    success = cemail.SaveEml(eml_path)
+    fp = open(eml_path, 'rb')
+    new_mail = email.message_from_file(fp)
+    fp.close()
     if (success == False):
-        print email.lastErrorText()
+        print cemail.lastErrorText()
         sys.exit()
-
-    print "Saved EML!",eml_path
-    return eml_path
\ No newline at end of file
+    return new_mail
\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 6393c357af6..a6636b35cfc 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -137,19 +137,8 @@ class XMLRpcConn(object):
         conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
         import eml
         new_msg = files = ext_msg =""
-        eml_path=eml.generateEML(mail)
-        att_name = ustr(eml_path.split('\\')[-1])
-        flag=False
+        new_mail=eml.generateEML(mail)
         attachments=mail.Attachments
-
-        try:
-            fp = open(eml_path, 'rb')
-            msg =fp.read()
-            fp.close()
-            new_mail =  email.message_from_string(str(msg))
-        except Exception,e:
-            win32ui.MessageBox(str(e),"Reading Error Mail")
-
         for rec in recs: #[('res.partner', 3, 'Agrolait')]
             model = rec[0]
             res_id = rec[1]
@@ -185,10 +174,8 @@ class XMLRpcConn(object):
             result = {}
             if attachments:
                 result = self.MakeAttachment([rec], mail)
-
             attachment_ids = result.get(model, {}).get(res_id, [])
             ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','history',model, res_id, msg, attachment_ids)
-
             new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
             flag = True
 
@@ -251,22 +238,24 @@ class XMLRpcConn(object):
         return res
 
     def CreateCase(self, section, mail, partner_ids, with_attachments=True):
-        res={}
         import win32ui
         import eml
         section=str(section)
-        partner_ids=eval(str(partner_ids))
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        flag = False
+        id = -1
         try:
-            eml_path=eml.generateEML(mail)
-            fp = open(eml_path, 'rb')
-            msg =fp.read()
-            fp.close()
-            new_mail =  email.message_from_string(str(msg))
-            execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(new_mail))
+            conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+            email=eml.generateEML(mail)
+            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, email)
+            if id > 0:
+                flag = True
+                return flag
+            else:
+                flag = False
+                return flag
         except Exception,e:
-            win32ui.MessageBox(str(e),"Mail Reading Error")
-            pass
+            win32ui.MessageBox("Create Case\n"+str(e),"Mail Reading Error")
+            return flag
 
     def MakeAttachment(self, recs, mail):
         attachments = mail.Attachments
@@ -412,23 +401,19 @@ class XMLRpcConn(object):
     def SearchEmailResources(self, mail):
         import win32ui
         import eml
+
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         sub = ""
         res_vals = []
+
         try:
-            parse_mail = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','parse_message',mail)
-            win32ui.MessageBox(str(parse_mail),"Temp")
-            eml_path=eml.generateEML(mail)
-            fp = open(eml_path, 'rb')
-            msg =fp.read()
-            fp.close()
-            new_mail =  email.message_from_string(str(msg))
-            sub = new_mail.get('Subject')
-            win32ui.MessageBox(str(sub),"Sub")
+#            new_mail = eml.generateEML(mail)
+            email.SaveAs()
+            message_id = str(new_mail.get('message-id'))
         except Exception,e:
             win32ui.MessageBox(str(e),"Mail Reading Error")
             return None
-        mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('name','=',sub)])
+        mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])
         if not mail_id:
             return None
         address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message','read',mail_id[0],['model','res_id'])

From 2780c63d4819262b4f2c4a8a63d9c73fb92862fe Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Thu, 7 Oct 2010 13:07:31 +0530
Subject: [PATCH 040/294] [ADD] project_scrum : added project_scrum_postpone.py
 and project_scrum_postpone_view.xml

bzr revid: jas@tinyerp.com-20101007073731-wgbv4nv8rnhqyafn
---
 .../wizard/project_scrum_postpone.py          | 22 +++++++++++++++
 .../wizard/project_scrum_postpone_view.xml    | 28 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 addons/project_scrum/wizard/project_scrum_postpone.py
 create mode 100644 addons/project_scrum/wizard/project_scrum_postpone_view.xml

diff --git a/addons/project_scrum/wizard/project_scrum_postpone.py b/addons/project_scrum/wizard/project_scrum_postpone.py
new file mode 100644
index 00000000000..b4576f88ab8
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_postpone.py
@@ -0,0 +1,22 @@
+from osv import osv
+from osv import fields
+
+class postpone_wizard(osv.osv_memory):
+    _name="postpone.wizard"
+    def button_postpone(self, cr, uid, ids, context=None):
+        log_obj=self.pool.get('project.scrum.product.backlog')
+        if context is None:
+            context = {}
+        for product in log_obj.browse(cr, uid, ids, context=context):
+            tasks_id = []
+            for task in product.tasks_id:
+                if task.state != 'done':
+                    tasks_id.append(task.id)
+            clone_id = log_obj.copy(cr, uid, product.id, {
+                'name': 'PARTIAL:'+ product.name ,
+                'sprint_id':False,
+                'tasks_id':[(6, 0, tasks_id)],
+                                })
+        log_obj.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return {}
+postpone_wizard()
\ No newline at end of file
diff --git a/addons/project_scrum/wizard/project_scrum_postpone_view.xml b/addons/project_scrum/wizard/project_scrum_postpone_view.xml
new file mode 100644
index 00000000000..995e84d612e
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_postpone_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="postpone_wizard_form">
+            <field name="name">postpone_wizard</field>
+            <field name="model">postpone.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Postpone Backlog">
+                    <separator string="Postpone" colspan="4"/>
+                    <label align="0.0" colspan="2" string="Are you sure to postpone Backlog ?"/>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4">
+                    <button special="cancel" type="object" string="Close" icon="gtk-cancel"/>
+                    <button name="button_postpone" type="object" string="Ok" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_postpone_wizard">
+            <field name="name">Postpone</field>
+            <field name="res_model">postpone.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>

From 635e3389e9fcba904ede1ae7d57fec1f6b587608 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 7 Oct 2010 14:13:14 +0530
Subject: [PATCH 041/294] [IMP] 5008 and 5009 Revert Changes

bzr revid: ron@tinyerp.com-20101007084314-iiqqleknx8j1vy9c
---
 addons/account/account_invoice_view.xml       | 18 ----
 addons/project/project.py                     |  7 --
 addons/project_issue/project_issue.py         | 87 +++++++++----------
 .../project_long_term_view.xml                |  2 +-
 .../wizard/project_scrum_email_view.xml       |  2 +
 5 files changed, 42 insertions(+), 74 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 634caa86e75..e6323ae3a4b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                  parent="base.menu_main_pm" sequence="3"/>
-
         <!--
         Invoices
         -->
@@ -439,19 +435,6 @@
             <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
 
-        <record id="action_invoice_tree_partner" model="ir.actions.act_window">
-            <field name="name">Partner Invoice</field>
-            <field name="res_model">account.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
-        </record>
-
-
 
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -467,7 +450,6 @@
         </record>
 
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
-        <menuitem action="action_invoice_tree_partner" id="menu_action_invoice_tree1_project" parent="base.menu_project_management_time_tracking" sequence="100"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Vendor Invoices</field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 75be42823bd..abae697cacf 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -576,7 +576,6 @@ class task(osv.osv):
         if context is None:
             context = {}
         request = self.pool.get('res.request')
-        p_issue = self.pool.get('project.issue')
 
         for task in self.browse(cr, uid, ids, context=context):
             project = task.project_id
@@ -592,15 +591,11 @@ class task(osv.osv):
                 })
 
             self.write(cr, uid, [task.id], {'state': 'open'})
-            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
-            p_issue.write(cr, uid,issue_id, {'progress':0.0})
 
         return True
 
     def do_cancel(self, cr, uid, ids, *args):
         request = self.pool.get('res.request')
-        p_issue = self.pool.get('project.issue')
-        print "Cancel"
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
             project = task.project_id
@@ -616,9 +611,7 @@ class task(osv.osv):
                 })
             message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
             self.log(cr, uid, task.id, message)
-            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
             self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
-            p_issue.write(cr, uid,issue_id, {'progress':100.0})
         return True
 
     def do_open(self, cr, uid, ids, *args):
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 6496e93f2e9..83871e02b66 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -221,57 +221,48 @@ class project_issue(crm.crm_case, osv.osv):
         task_obj = self.pool.get('project.task')
 
 
-        for curr_task in case_obj.browse(cr, uid,ids):
-            if curr_task.state in ['open']:
-                if context is None:
-                    context = {}
-                result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
-                res = data_obj.read(cr, uid, result, ['res_id'])
-                id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
-                id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
-                if id2:
-                    id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                if id3:
-                    id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        if context is None:
+            context = {}
 
-                for bug in case_obj.browse(cr, uid, ids, context=context):
-                    new_task_id = task_obj.create(cr, uid, {
-                        'name': bug.name,
-                        'partner_id': bug.partner_id.id,
-                        'description':bug.description,
-                        'date': bug.date,
-                        'project_id': bug.project_id.id,
-                        'priority': bug.priority,
-                        'user_id': bug.assigned_to.id,
-                        'planned_hours': 0.0,
-                    })
+        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-                    vals = {
-                        'task_id': new_task_id,
-                        'state':'open'
-                    }
-                    case_obj.write(cr, uid, [bug.id], vals)
+        for bug in case_obj.browse(cr, uid, ids, context=context):
+            new_task_id = task_obj.create(cr, uid, {
+                'name': bug.name,
+                'partner_id': bug.partner_id.id,
+                'description':bug.description,
+                'date': bug.date,
+                'project_id': bug.project_id.id,
+                'priority': bug.priority,
+                'user_id': bug.assigned_to.id,
+                'planned_hours': 0.0,
+            })
 
-                return  {
-                    'name': _('Tasks'),
-                    'view_type': 'form',
-                    'view_mode': 'form,tree',
-                    'res_model': 'project.task',
-                    'res_id': int(new_task_id),
-                    'view_id': False,
-                    'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-                    'type': 'ir.actions.act_window',
-                    'search_view_id': res['res_id'],
-                    'nodestroy': True
-                        }
-            elif curr_task.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
-Issue Could not convert into Task"))
-                return True
-            else:
-                raise osv.except_osv(_("Warning !"), _("Issue should be in \
-\'To Do\'  state before converting to Task."))
-                return True
+            vals = {
+                'task_id': new_task_id,
+                'state':'open'
+            }
+            case_obj.write(cr, uid, [bug.id], vals)
+
+        return  {
+            'name': _('Tasks'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'project.task',
+            'res_id': int(new_task_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'],
+            'nodestroy': True
+        }
 
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c7122726f75..6575d2e03ae 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -15,7 +15,7 @@
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                   <field name="phase_id" string="Phase Name"/>
+                   <field name="useability" string="Availability"/>
                 </level>
               </gantt>
             </field>
diff --git a/addons/project_scrum/wizard/project_scrum_email_view.xml b/addons/project_scrum/wizard/project_scrum_email_view.xml
index 5308bd34e89..d0d8723709e 100644
--- a/addons/project_scrum/wizard/project_scrum_email_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_email_view.xml
@@ -13,7 +13,9 @@
 	                    <field name="scrum_master_id"/>
 	                    <field name="product_owner_id"/>
 					</group>
+					<group colspan="4">
                     <field name="subject"/>
+                    </group>
 					<notebook colspan="4">
 						<page string="Message">
                     		<field name="message" nolabel="1"/>

From 2a2bcb23abf87ad6ff09b61308c6862e423e2cfd Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 7 Oct 2010 14:40:39 +0530
Subject: [PATCH 042/294] [REM]: crm*: Removed unused demo datas

bzr revid: rpa@tinyerp.com-20101007091039-3sjvpo52f94kbllc
---
 addons/crm/crm_lead_demo.xml                    | 15 ---------------
 addons/crm_claim/crm_claim_data.xml             |  5 -----
 addons/crm_fundraising/crm_fundraising_data.xml |  4 ----
 3 files changed, 24 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 9b7b1da2031..0051ac7b44a 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -128,13 +128,10 @@
             <field eval="&quot;Questionnaire&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;Smith John&quot;" name="partner_name2"/>
-            <field eval="&quot;(487) 013-1504&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="&quot;Website Visitor&quot;" name="partner_name"/>
             <field eval="&quot;smith_john@gmail.com&quot;" name="email_from"/>
-            <field eval="time.strftime('%Y-%m-16 10:05:15')" name="date"/>
         </record>
         <record id="crm_case_business_card0" model="crm.lead">
             <field eval="1" name="active"/>
@@ -145,13 +142,9 @@
             <field eval="&quot;Marketing Products&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;Elvis Borne&quot;" name="partner_name2"/>
-            <field eval="&quot;(147) 014-6574&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="&quot;Business Card&quot;" name="partner_name"/>
-            <field eval="&quot;(124) 587-8974&quot;" name="partner_phone"/>
-            <field eval="time.strftime('%Y-%m-16 11:05:15')" name="date"/>
         </record>
         <record id="crm_case_imported_contact0" model="crm.lead">
             <field eval="1" name="active"/>
@@ -162,8 +155,6 @@
             <field eval="&quot;Business Group&quot;" name="name"/>
             <field eval="&quot;cancel&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;Drew Clark&quot;" name="partner_name2"/>
-            <field eval="&quot;(125) 021-4781&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="&quot;Imported Contact&quot;" name="partner_name"/>
@@ -177,12 +168,9 @@
             <field eval="&quot;OpenERP Campaining&quot;" name="name"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;Carl Nelson&quot;" name="partner_name2"/>
-            <field eval="&quot;(874) 022-6574&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_oppor3"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="&quot;Campaining&quot;" name="partner_name"/>
-            <field eval="&quot;(232) 147-6329&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_company_partnership0" model="crm.lead">
             <field eval="1" name="active"/>
@@ -193,12 +181,9 @@
             <field eval="&quot;Offer&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;Joe Lucas&quot;" name="partner_name2"/>
-            <field eval="&quot;(234) 031-1254&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="&quot;Partnership Offer&quot;" name="partner_name"/>
-            <field eval="&quot;(254) 954-2147&quot;" name="partner_phone"/>
        </record>
 
        
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index cb41f1bf21e..f72e1af3f18 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -44,31 +44,26 @@
         
         <record model="crm.case.stage" id="stage_claim1">
             <field name="name">Accepted as Claim</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.stage" id="stage_claim2">
             <field name="name">Fixed</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
             
         <record model="crm.case.stage" id="stage_claim3">
             <field name="name">Won't fix</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.stage" id="stage_claim4">
             <field name="name">Invalid</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
         
         <record model="crm.case.stage" id="stage_claim5">
             <field name="name">Awaiting Response</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
 
diff --git a/addons/crm_fundraising/crm_fundraising_data.xml b/addons/crm_fundraising/crm_fundraising_data.xml
index cb0cb5fd24a..ef4bd9559f5 100644
--- a/addons/crm_fundraising/crm_fundraising_data.xml
+++ b/addons/crm_fundraising/crm_fundraising_data.xml
@@ -33,25 +33,21 @@
     <record model="crm.case.resource.type" id="type_fund1">
         <field name="name">Cash</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
 
     <record model="crm.case.resource.type" id="type_fund2">
         <field name="name">Cheque</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
 
     <record model="crm.case.resource.type" id="type_fund3">
         <field name="name">Credit Card</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
 
     <record model="crm.case.resource.type" id="type_fund4">
         <field name="name">Demand Draft</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
 
 </data>

From 3c9671dc675bd4d1e2a2c6c9a7cffee3693626a3 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Thu, 7 Oct 2010 14:54:29 +0530
Subject: [PATCH 043/294] [IMP] project_scrum : improved postpone wizard

bzr revid: jas@tinyerp.com-20101007092429-lfqizg17626ezu3m
---
 addons/project_scrum/project_scrum.py           | 17 +++++++++++++++++
 .../wizard/project_scrum_postpone.py            | 17 ++---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index d4c8911c459..f472369211b 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -236,6 +236,23 @@ class project_scrum_product_backlog(osv.osv):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
+    def button_postpone(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            tasks_id = []
+            for task in product.tasks_id:
+                if task.state != 'done':
+                    tasks_id.append(task.id)
+
+            clone_id = self.copy(cr, uid, product.id, {
+                'name': 'PARTIAL:'+ product.name ,
+                'sprint_id':False,
+                'tasks_id':[(6, 0, tasks_id)],
+                                })
+        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return True
+
     _columns = {
         'name' : fields.char('Feature', size=64, required=True),
         'note' : fields.text('Note'),
diff --git a/addons/project_scrum/wizard/project_scrum_postpone.py b/addons/project_scrum/wizard/project_scrum_postpone.py
index b4576f88ab8..95169873f3a 100644
--- a/addons/project_scrum/wizard/project_scrum_postpone.py
+++ b/addons/project_scrum/wizard/project_scrum_postpone.py
@@ -4,19 +4,6 @@ from osv import fields
 class postpone_wizard(osv.osv_memory):
     _name="postpone.wizard"
     def button_postpone(self, cr, uid, ids, context=None):
-        log_obj=self.pool.get('project.scrum.product.backlog')
-        if context is None:
-            context = {}
-        for product in log_obj.browse(cr, uid, ids, context=context):
-            tasks_id = []
-            for task in product.tasks_id:
-                if task.state != 'done':
-                    tasks_id.append(task.id)
-            clone_id = log_obj.copy(cr, uid, product.id, {
-                'name': 'PARTIAL:'+ product.name ,
-                'sprint_id':False,
-                'tasks_id':[(6, 0, tasks_id)],
-                                })
-        log_obj.write(cr, uid, ids, {'state':'cancel'}, context=context)
-        return {}
+       self.pool.get('project.scrum.product.backlog').button_postpone(cr, uid, ids, context)
+       return {}
 postpone_wizard()
\ No newline at end of file

From 95db658a2b2bd6f2ae0ba45757cefceab662344f Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Thu, 7 Oct 2010 15:32:33 +0530
Subject: [PATCH 044/294] [IMP] Saving Attchments to the windows %temp%

bzr revid: jam@tinyerp.com-20101007100233-zyekdmnma9ftetab
---
 addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index a6636b35cfc..ef4b5606ac4 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -261,7 +261,7 @@ class XMLRpcConn(object):
         attachments = mail.Attachments
         result = {}
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        att_folder_path = os.path.abspath(os.path.dirname(__file__)+"\\dialogs\\resources\\mails\\attachments\\")
+        att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
         if not os.path.exists(att_folder_path):
             os.makedirs(att_folder_path)
         for rec in recs: #[('res.partner', 3, 'Agrolait')]

From d180cd91eb2c0a7ff9bd02200b384eeea2b3dab4 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 7 Oct 2010 16:07:16 +0530
Subject: [PATCH 045/294] [IMP] crm,crm*,base_calendar:-improvements in
 security access rights

bzr revid: mtr@mtr-20101007103716-evdqjmz8uy5aym3f
---
 addons/base_calendar/base_calendar_view.xml        |  2 +-
 addons/base_calendar/security/ir.model.access.csv  |  2 +-
 addons/crm/crm_lead_menu.xml                       |  2 +-
 addons/crm/crm_meeting_menu.xml                    |  2 +-
 addons/crm/crm_phonecall_menu.xml                  |  2 +-
 addons/crm/security/crm_security.xml               |  4 ++++
 addons/crm/security/ir.model.access.csv            | 14 ++++++++------
 addons/crm_claim/crm_claim_menu.xml                |  2 +-
 addons/crm_claim/security/ir.model.access.csv      |  2 +-
 addons/crm_fundraising/crm_fundraising_menu.xml    |  2 +-
 .../crm_fundraising/security/ir.model.access.csv   |  2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml          |  1 +
 addons/crm_helpdesk/security/ir.model.access.csv   |  4 ++--
 13 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index ba91c4b75dd..7947d813b1d 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -158,7 +158,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="6" groups="base.group_system" />
+            parent="base.menu_base_config" sequence="6" groups="base.group_system,base.group_sale_manager" />
 
         <!-- Invitation menu -->
 
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index aa269e9ff18..0ae628fb720 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,0
 "access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
 "access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
 "access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index b98d26a0e6e..b26dcc29f41 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -31,7 +31,7 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_sale_salesman"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7726280a05f..2f6c48d93ad 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -111,7 +111,7 @@
     <menuitem id="menu_attendee_invitations"
             name="Meeting Invitations" parent="crm.menu_meeting_sale"
             sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended" />
+            groups="base.group_extended,base.group_sale_salesman" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c4263a47a18..5c5a43edbd8 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -57,7 +57,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_sale_salesman"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 5f3863882f5..fde1dfbbd32 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -25,5 +25,9 @@
         <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>
 
+    <record model="ir.ui.menu" id="base.menu_base_config">
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
+    </record>
+    
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index e68fe873b6c..67ec7c587a9 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -5,14 +5,14 @@
 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
 "access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,0,0,0
-"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,0,0,0
+"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
+"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
 "access_crm_phonecall_system","crm.phonecall.system","model_crm_phonecall","base.group_system",1,0,0,0
-"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,0,0,0
+"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,0,0,0
+"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
 "access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
-"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,1
+"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,0
 "access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
 "access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
@@ -45,12 +45,13 @@
 "mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
 "access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
 "access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
-"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,0
+"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
 "access_crm_case_resource_type_system","crm.case.resource.type system","model_crm_case_resource_type","base.group_system",1,1,1,1
 "access_crm_case_section_system","crm.case.section system","model_crm_case_section","base.group_system",1,1,1,1
 "access_crm_lead_report_system","crm.lead.report system","model_crm_lead_report","base.group_system",1,1,1,1
 "access_base_res_country_system","base.res.country system","base.model_res_country","base.group_system",1,1,1,1
 "access_base_res_country_state_system","base.res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
+"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
 "access_base_action_rule_system","base.action.rule system","model_base_action_rule","base.group_system",1,1,1,1
 "access_crm_segmentation_system","crm.segmentation system","model_crm_segmentation","base.group_system",1,1,1,1
 "access_crm_segmentation_line_system","crm.segmentation.line system","model_crm_segmentation_line","base.group_system",1,1,1,1
@@ -65,3 +66,4 @@
 "access_calendar_attendee_system","calendar.attendee.system","model_calendar_attendee","base.group_system",1,0,0,0
 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
+"access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 3a4b63047ea..c02bc33340d 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_salesman"
             parent="base.menu_base_partner" sequence="7" />
 
         <!-- Claims Menu -->
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index d6c00551af0..e2563f7541a 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,0,0,0
+"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,1,1,1
 "access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
 "access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
 "access_crm_claim_system","crm.claim.system","model_crm_claim","base.group_system",1,0,0,0
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index cd54a11e615..d521bc91592 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -5,7 +5,7 @@
 <!-- MENU -->
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_sale_salesman"
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index ce7d699f36b..53d593589d4 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","base.group_sale_manager",1,0,0,0
+"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","base.group_sale_manager",1,1,1,1
 "access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
 "access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
 "access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 5a4e9df19bc..7bc6faf4ee0 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -38,6 +38,7 @@
         </record>
 
         <menuitem name="Helpdesk and Support" id="menu_help_support_main"
+            groups="base.group_extended,base.group_sale_salesman"
             parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
 
     </data>
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index e7c1bbb7d89..79cac379f91 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,0,0,0
-"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,1
+"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,1,1,1
+"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,0
 "access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
 "access_crm_helpdesk_system","crm.helpdesk.system","model_crm_helpdesk","base.group_system",1,0,0,0

From efee86963fd26c8fb051e4107efc7525bdafe23a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:23:52 +0530
Subject: [PATCH 046/294] [IMP]: crm: Improvement in lead to opportunity wizard
 for partner selection

bzr revid: rpa@tinyerp.com-20101007135352-8w96zvhrvqlhzk0w
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 34 --------------------
 addons/crm/wizard/crm_lead_to_partner.py     | 14 ++++++--
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 502dddcdcaa..7b6317e7b9f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -162,41 +162,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         'partner_id': fields.many2one('res.partner', 'Partner'), 
         'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'), 
     }
-    
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
 
-        @return : default values of fields.
-        """
-        lead_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        partner_id = False
-
-        data = context and context.get('active_ids', []) or []
-        res = super(crm_lead2opportunity_partner, self).default_get(cr, uid, fields, context=context)
-
-        for lead in lead_obj.browse(cr, uid, data, context=context):
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
-            if not partner_ids and lead.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-            partner_id = partner_ids and partner_ids[0] or False
-
-            if 'partner_id' in fields:
-                res.update({'partner_id': partner_id})
-            if 'action' in fields:
-                res.update({'action': partner_id and 'exist' or 'create'})
-        return res
-    
     def make_partner(self, cr, uid, ids, context=None):
         """
         This function Makes partner based on action.
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index aeb5b2db673..ea70248aed4 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -21,6 +21,7 @@
 
 from osv import osv, fields
 from tools.translate import _
+import re
 
 class crm_lead2partner(osv.osv_memory):
     """ Converts lead to partner """
@@ -74,12 +75,19 @@ class crm_lead2partner(osv.osv_memory):
         res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
 
         for lead in lead_obj.browse(cr, uid, data, context=context):
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
-            if not partner_ids and lead.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
+            partner_ids = []
+            if lead.email_from:
+                email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from)
+                address_ids = contact_obj.search(cr, uid, [('email', 'in', email)])
                 if address_ids:
                     addresses = contact_obj.browse(cr, uid, address_ids)
                     partner_ids = addresses and [addresses[0].partner_id.id] or False
+            if not partner_ids and lead.partner_name:
+                partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
+            if not partner_ids:
+                cr.execute("""SELECT p.id from res_partner p 
+                            where regexp_replace(lower(p.name), '[^a-z]*', '', 'g') = regexp_replace(%s, '[^a-z]*', '', 'g')""", (lead.name.lower(), ))
+                partner_ids = map(lambda x: x[0], cr.fetchall())
             partner_id = partner_ids and partner_ids[0] or False
 
             if 'partner_id' in fields:

From 924d95427a6b054210ae2bf3486977efeec50126 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 8 Oct 2010 12:42:42 +0530
Subject: [PATCH 047/294] [IMP]: sale_crm: Created history when opportunity is
 converted into quotation

bzr revid: rpa@tinyerp.com-20101008071242-vqbezmuq76e6sbcb
---
 addons/sale_crm/wizard/crm_make_sale.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 089a2389703..c4e4f1af1fb 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -140,6 +140,7 @@ class crm_make_sale(osv.osv_memory):
                 new_ids.append(new_id)
                 message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Sales Quotation.")
                 self.log(cr, uid, case.id, message)
+                case_obj._history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id))
 
             if make.close:
                 case_obj.case_close(cr, uid, data)

From 9e33cddedc349e3f67a9c39b0b7779951df63d4d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 8 Oct 2010 14:59:39 +0530
Subject: [PATCH 048/294] [IMP] crm:-added group for the menuitem
 Reporting/Dashboard

bzr revid: mtr@mtr-20101008092939-0e6hd4mut1kzpayx
---
 addons/crm/board_crm_statistical_view.xml | 3 ++-
 addons/crm/board_crm_view.xml             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 01aa479479f..bd952d9e9ba 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -119,7 +119,8 @@
             action="open_board_statistical_dash"
             sequence="0"
             id="menu_board_statistics_dash"
-            icon="terp-graph"/>
+            icon="terp-graph"
+            groups="base.group_sale_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 8aa1d96d403..ada70b68bba 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -157,7 +157,8 @@
             name="Connecting Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
             sequence="1"
-            id="menu_board_crm" icon="terp-graph"/>
+            id="menu_board_crm" icon="terp-graph"
+            groups="base.group_sale_salesman"/>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
     </data>
 </openerp>

From 0aa7ad9d0b1023af9a0145551be2c85233a148a8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 8 Oct 2010 16:26:41 +0530
Subject: [PATCH 049/294] [FIX]: crm_partner_assign: Fixed a problem when there
 is no partner found

bzr revid: rpa@tinyerp.com-20101008105641-lk93kad5hbf3hrx0
---
 addons/crm_partner_assign/partner_geo_assign.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 9a761740c8d..ab794cba468 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -171,7 +171,8 @@ class crm_lead(osv.osv):
                                         AND partner_weight > 0) AS d
                                   ORDER BY distance LIMIT 1""", (result[1],result[0]))
                     res = cr.dictfetchone()
-                    part_ids.append(res['id'])
+                    if res:
+                        part_ids.append(res['id'])
 
                 total = 0
                 toassign = []

From 608d6ab32b11e2eadcdebe1924900b6ce33e02b3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 8 Oct 2010 17:13:45 +0530
Subject: [PATCH 050/294] [IMP]: crm: Lead to opportunity searches for
 following steps for partner/existing opportunity: 1. Find partner address
 matches the email_from of the lead 2. Find partner name that matches the name
 of the lead 3. Find email of existing opportunity matches the email_from of
 the lead 4. Find name of existing opportunity matches the name of the lead

bzr revid: rpa@tinyerp.com-20101008114345-mxrpwhm1ccto9mhu
---
 .../wizard/crm_lead_to_opportunity_view.xml   |  3 ++
 addons/crm/wizard/crm_lead_to_partner.py      | 36 ++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index d41030789b6..5f0e26a7dc5 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -46,6 +46,9 @@
                <form string="Create a Partner">
                 <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
                 <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+                <group colspan="4" col="1" attrs="{'invisible':[('msg','=',False)]}">
+                    <field name="msg" colspan="4" nolabel="1"  height="50"/>
+                </group>
                 <newline />
                 <field name="action"/>
                 <group attrs="{'invisible':[('action','!=','exist')]}">
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index ea70248aed4..21c95442371 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -33,7 +33,8 @@ class crm_lead2partner(osv.osv_memory):
         'action': fields.selection([('exist', 'Link to an existing partner'), \
                                     ('create', 'Create a new partner')], \
                                     'Action', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner')
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'msg': fields.text('Message', readonly=True)
         }
 
     def view_init(self, cr, uid, fields, context=None):
@@ -76,12 +77,19 @@ class crm_lead2partner(osv.osv_memory):
 
         for lead in lead_obj.browse(cr, uid, data, context=context):
             partner_ids = []
-            if lead.email_from:
-                email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from)
-                address_ids = contact_obj.search(cr, uid, [('email', 'in', email)])
+            # Find partner address matches the email_from of the lead
+            email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
+            email = map(lambda x: "'" + x + "'", email)
+            if email:
+                cr.execute("""select id from res_partner_address 
+                                where 
+                                substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
+                address_ids = map(lambda x: x[0], cr.fetchall())
                 if address_ids:
                     addresses = contact_obj.browse(cr, uid, address_ids)
                     partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            # Find partner name that matches the name of the lead
             if not partner_ids and lead.partner_name:
                 partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
             if not partner_ids:
@@ -90,6 +98,26 @@ class crm_lead2partner(osv.osv_memory):
                 partner_ids = map(lambda x: x[0], cr.fetchall())
             partner_id = partner_ids and partner_ids[0] or False
 
+            if not partner_id:
+                label = False
+                opp_ids = []
+                if email:
+                    # Find email of existing opportunity matches the email_from of the lead
+                    cr.execute("""select id from crm_lead 
+                                where type='opportunity' and
+                                substring(email_from from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
+                    opp_ids = map(lambda x:x[0], cr.fetchall())
+                    label = opp_ids and 'email' or False
+                if not opp_ids:
+                    # Find name of existing opportunity matches the name of the lead
+                    cr.execute("""SELECT l.id from crm_lead l
+                                    where type = 'opportunity' and
+                                    regexp_replace(lower(l.name), '[^a-z]*', '', 'g') = regexp_replace(%s, '[^a-z]*', '', 'g')""", (lead.name.lower(), ))
+                    opp_ids = map(lambda x: x[0], cr.fetchall())
+                    label = opp_ids and 'name' or False
+                if label:
+                    res.update({'msg': "An existing opportunity seems to match the %s of this lead, you should double-check before converting it." % (label)})
+
             if 'partner_id' in fields:
                 res.update({'partner_id': partner_id})
             if 'action' in fields:

From b5521b00ec7484ae44a80260cc08312e2d3513a7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 8 Oct 2010 17:17:23 +0530
Subject: [PATCH 051/294] [IMP]: crm: Opportunities should be searchable by
 email

bzr revid: rpa@tinyerp.com-20101008114723-oc124175qg6k3v1g
---
 addons/crm/crm_opportunity_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5b45af19398..6af969c261b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -311,6 +311,8 @@
                                   <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                               </field>
                               <separator orientation="vertical"/>
+                              <field name="email_from"/>
+                              <separator orientation="vertical"/>
                               <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                               <newline/>
                               <field name="create_date" string="Creation Date"/>

From 40a2f48b450a4411796335502bf422b699e52378 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 8 Oct 2010 23:32:05 +0200
Subject: [PATCH 052/294] [IMP] sale: security enhancements

bzr revid: qdp-launchpad@tinyerp.com-20101008213205-37h0e6q3i1h0bq5o
---
 addons/sale/sale.py                      | 3 +--
 addons/sale/security/ir.model.access.csv | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6c8bf247b23..c3e0a29af9d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -279,10 +279,9 @@ class sale_order(osv.osv):
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
-        'company_id': fields.many2one('res.company','Company')
+        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
     }
     _defaults = {
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
         'picking_policy': 'direct',
         'date_order': time.strftime('%Y-%m-%d'),
         'order_policy': 'manual',
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 0d523202a10..3675ccf32ae 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,11 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,1,1,0
+"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,0,0,0
 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
 "access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
 "access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
 "access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
-"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,1
+"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,0
 "access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","base.group_sale_salesman",1,0,0,0
 "access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","base.group_sale_salesman",1,1,1,0
 "access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","base.group_sale_salesman",1,1,1,0

From 82628bfcd8833da53038e49ccff12cf885e49151 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 8 Oct 2010 23:51:15 +0200
Subject: [PATCH 053/294] [IMP] sale: security enhancements

bzr revid: qdp-launchpad@tinyerp.com-20101008215115-0hkup3a9op358k14
---
 addons/crm/security/crm_security.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index fde1dfbbd32..78018a4031b 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -10,15 +10,21 @@
         <field name="name">Sales / User</field>
     </record>
 
-    <record id="base.group_sale_salesman_personal" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Sales / User / See Personal Leads</field>
+    <record id="base.group_sale_salesman_all_leads" model="res.groups">
+        <field name="name">Sales / User - See All Leads</field>
     </record>
 
     <record id="crm_rule_personal_lead" model="ir.rule">
         <field name="name">Personal Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('base.group_sale_salesman_personal'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+    <record id="crm_rule_all_lead" model="ir.rule">
+        <field name="name">All Leads</field>
+        <field ref="model_crm_lead" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record model='ir.ui.menu' id='base.menu_base_partner'>

From e1f3b7cbb63d1b9abfc509f2d88adc8837444e10 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Sat, 9 Oct 2010 00:13:39 +0200
Subject: [PATCH 054/294] [IMP] sale: security enhancements

bzr revid: qdp-launchpad@tinyerp.com-20101008221339-j6v45x5zwhdoihfi
---
 addons/sale_crm/__openerp__.py               | 3 ++-
 addons/sale_crm/security/ir.model.access.csv | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 addons/sale_crm/security/ir.model.access.csv

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 8d83aded5f7..87f2cb774b1 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -42,6 +42,7 @@ crm modules.
                    'board_sale_crm_view.xml',
                    'process/sale_crm_process.xml',
                    'security/sale_crm_security.xml',
+                   'security/ir.model.access.csv'
                    ],
     'demo_xml': [],
     'test': ['test/sale_crm.yml'],
@@ -49,4 +50,4 @@ crm modules.
     'active': False,
     'certificate': '0064360130141',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/security/ir.model.access.csv b/addons/sale_crm/security/ir.model.access.csv
new file mode 100644
index 00000000000..81007b11678
--- /dev/null
+++ b/addons/sale_crm/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_invoice_report_salesman", "account.invoice.report salesman", "account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0

From 0408b2019cf64dd8ded184e595d6e34b117181bb Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 11 Oct 2010 11:16:51 +0530
Subject: [PATCH 055/294] [FIX]: sale_crm: Fixed security .csv

bzr revid: rpa@tinyerp.com-20101011054651-ct7vgcseh7ins7t0
---
 addons/sale_crm/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/security/ir.model.access.csv b/addons/sale_crm/security/ir.model.access.csv
index 81007b11678..a1bd4896f5f 100644
--- a/addons/sale_crm/security/ir.model.access.csv
+++ b/addons/sale_crm/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_invoice_report_salesman", "account.invoice.report salesman", "account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0
+"access_account_invoice_report_salesman","account.invoice.report salesman","account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0

From ed9dc2a01c59062e54099b74c3e3d580d1c4d62f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 11 Oct 2010 11:32:13 +0530
Subject: [PATCH 056/294] [FIX]: crm, sale_crm: Fixed pylint warnings

bzr revid: rpa@tinyerp.com-20101011060213-yd9g5nfzg4wg0i4o
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 1 -
 addons/sale_crm/wizard/crm_make_sale.py      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 5ce13d421ec..ccf85a36422 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -173,7 +173,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             context = {}
         
         partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data')
         value = {}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 8f9104d5c79..1112ebd73b6 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import decimal_precision as dp
 import time
 
 

From 7dd8a396e4987c442f604586ad54e0528e9ff302 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 11 Oct 2010 14:59:30 +0530
Subject: [PATCH 057/294] [REM]: crm: Removed unused fields in phonecall report

bzr revid: rpa@tinyerp.com-20101011092930-82qqybna4tdjm3p9
---
 addons/crm/report/crm_phonecall_report_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index d3c513ad143..0cc80ee7e0f 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -42,8 +42,6 @@
                     <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_revenue_prob"/>
                     <field name="probability"/>
                     <field name="state" select="1"/>
                 </form>

From b571b1bf9ab999abb04610b900a380d37bc88de7 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 11 Oct 2010 15:44:56 +0530
Subject: [PATCH 058/294] [IMP] Solved the Message-Id bug, Added Open Document
 Button, No mail or Attchment are stored to system all sotred to %temp%
 reducing the use chilkat and added new dependices mscdo1.21

bzr revid: jam@tinyerp.com-20101011101456-6pop9x3e4nnk21px
---
 .../plugin/openerp-outlook-plugin/addin.py    | 26 +++---
 .../dialogs/dialog_map.py                     | 56 +++++++++---
 .../dialogs/resources/dialogs.py              |  6 +-
 .../dialogs/resources/dialogs.rc              |  2 +-
 .../openerp-outlook-plugin/tiny_xmlrpc.py     | 86 ++++++++++++++-----
 5 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 9cea4016bb2..dbd6f172182 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -61,14 +61,14 @@ def GetConn():
     return d
 
 class ButtonEvent:
-	def OnClick(self, button, cancel):
-		import win32ui
-		try:
-			mngr = manager.GetManager()
-			mngr.ShowManager()
-		except Exception,e:
-			win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
-		return cancel
+    def OnClick(self, button, cancel):
+        import win32ui
+        try:
+            mngr = manager.GetManager()
+            mngr.ShowManager()
+        except Exception,e:
+        	win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
+        return cancel
 #
 class ViewPartners:
     def OnClick(self, button, cancel):
@@ -202,11 +202,11 @@ class OutlookAddin:
             item.Enabled = True
 
 
-#            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-#            item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
-#            item.Caption = "Open Document"
-#            item.TooltipText = "Click to Open Document that ha been pushed to server."
-#            item.Enabled = True
+            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
+            item.Caption = "Open Document"
+            item.TooltipText = "Click to Open Document that ha been pushed to server."
+            item.Enabled = True
 
             # Hook events for the item
             item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index 444a8cbc685..ab14539e947 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -629,6 +629,8 @@ def GetSelectedItems(hwndList):
 
 def MakeAttachment(btnProcessor,*args):
     #Check if server running or user logged in
+    from win32com.client import Dispatch
+    import win32com
     b = check()
     if not b:
         return
@@ -636,7 +638,6 @@ def MakeAttachment(btnProcessor,*args):
     assert ex.Selection.Count == 1
     mail = ex.Selection.Item(1)
     mail = GetMail(btnProcessor)
-
     #get selected records
     hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     r = GetSelectedItems(hwndList)
@@ -939,6 +940,8 @@ def SetDefaultContact(txtProcessor,*args):
     global partner_ref
     global new_con_country
     global new_con_state
+    global state_ref
+    global country_ref
     state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
     country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
     if txtProcessor.init_done:
@@ -957,6 +960,8 @@ def SetDefaultContact(txtProcessor,*args):
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3],new_con_country)
         new_con_country = ""
         new_con_state = ""
+        state_ref = ""
+        country_ref =""
         return
     #
     try:
@@ -1081,6 +1086,8 @@ def GetDefaultEmail(txtProcessor,*args):
     global partner_ref
     global country_ref
     global state_ref
+    global new_con_country
+    global new_con_state
     partner_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0])
     state_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10])
     country_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11])
@@ -1096,10 +1103,13 @@ def GetDefaultEmail(txtProcessor,*args):
     partner_ref = ""
     country_ref = ""
     state_ref = ""
-
+    new_con_country = ""
+    new_con_state = ""
     if state_val == None:
         country_ref = country_n
     country_ref = state_val
+    if country_ref == None:
+        country_ref = ""
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
 
     if not b:
@@ -1414,38 +1424,58 @@ def SerachOpenDocuemnt(txtProcessor,*args):
     from win32com.client import Dispatch
     import win32con
     import win32ui
+    import win32com
+    from win32com.mapi import mapi, mapiutil, mapitags
+    import pythoncom
     b = check()
     if not b:
         return
     global web_server
     global web_server_port
+    #Reading Current Selected Email.
     ex = txtProcessor.window.manager.outlook.ActiveExplorer()
     assert ex.Selection.Count == 1
     mail = ex.Selection.Item(1)
-    link_box = None
     #Acquiring control of the text box
-    try:
-        link_box = txtProcessor.GetControl()
-    except Exception,e:
-        win32ui.MessageBox(str(e),"Excet")
+    link_box = txtProcessor.GetControl()
+    #Checking for the web server Parameters
     if web_server.strip() == "" or web_server.strip() == "http:\\\\":
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
         txtProcessor.init_done=True
         return
     linktodoc = ""
-    #Reading Current Selected Email.
-    win32ui.MessageBox(str(mail),"mail")
+
+    message_id = None
     try:
-        vals = NewConn.SearchEmailResources(mail)
+        outlook = win32com.client.Dispatch("Outlook.Application")
+        session = win32com.client.Dispatch("MAPI.session")
+        session.Logon('Outlook')
+        objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+        objFields = objMessage.Fields
+        strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+        strheader = ustr(strheader).encode('iso-8859-1')
+        headers = {}
+        strheader = strheader.replace("\n ", " ").splitlines()
+        for line in strheader:
+            split_here = line.find(":")
+            headers[line[:split_here]] = line[split_here:]
+        temp1 = headers.get('Message-ID')
+        temp2 = headers.get('Message-Id')
+        if temp1 == None:    message_id = temp2
+        if temp2 == None:    message_id = temp1
+        startCut = message_id.find("<")
+        endCut = message_id.find(">")
+        message_id = message_id[startCut:endCut+1]
     except Exception,e:
-        win32ui.MessageBox(str(e),"Excep")
+        win32ui.MessageBox(str(e),"Open Document")
+    vals = NewConn.SearchEmailResources(message_id)
     if vals == None:
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, "< Mail is still not archived.>")
         txtProcessor.init_done=True
         return
     try:
-        linktodoc = web_server+":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
-        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, linktodoc)
+        linktodoc = "http:\\\\" +web_server+ ":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
+        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
     except Exception,e:
         win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)
     webbrowser.open_new(linktodoc)
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index 4c4aabab683..cc19913c851 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,9 +1,9 @@
 #C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
 #This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
-_rc_size_=16024
-_rc_mtime_=1286276397
+_rc_size_=16025
+_rc_mtime_=1286623806
 class FakeParser:
-	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
+	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
 	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
 	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
index 62e8b26ca4a..c00d9c80db0 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 IDD_MANAGER DIALOGEX 0, 0, 460, 260
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME
-CAPTION "OpenERP Configuarion"
+CAPTION "OpenERP Configuration"
 FONT 8, "Tahoma", 1000, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",ID_DONE,400,239,50,14//,WS_VISIBLE //| WS_TABSTOP
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index ef4b5606ac4..2344a52a29c 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -27,7 +27,9 @@ import pythoncom
 import time
 from manager import ustr
 import email
-
+from win32com.mapi import mapi, mapiutil, mapitags
+import pythoncom
+import win32com
 waittime = 10
 wait_count = 0
 wait_limit = 12
@@ -136,13 +138,42 @@ class XMLRpcConn(object):
         import win32ui, win32con
         conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
         import eml
+        flag = False
         new_msg = files = ext_msg =""
+        message_id = referances  = None
+        try:
+            outlook = win32com.client.Dispatch("Outlook.Application")
+            session = win32com.client.Dispatch("MAPI.session")
+            session.Logon('Outlook')
+            objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+            objFields = objMessage.Fields
+            strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+            strheader = ustr(strheader).encode('iso-8859-1')
+            headers = {}
+            strheader = strheader.replace("\n ", " ").splitlines()
+            for line in strheader:
+                split_here = line.find(":")
+                headers[line[:split_here]] = line[split_here:]
+            temp1 = headers.get('Message-ID')
+            temp2 = headers.get('Message-Id')
+            referances = headers.get('References')
+            if temp1 == None:    message_id = temp2
+            if temp2 == None:    message_id = temp1
+            startCut = message_id.find("<")
+            endCut = message_id.find(">")
+            message_id = message_id[startCut:endCut+1]
+            if not referances == None:
+                startCut = referances.find("<")
+                endCut = referances.find(">")
+                referances = referances[startCut:endCut+1]
+        except Exception,e:
+            win32ui.MessageBox(str(e),"Archive To OpenERP")
+            return
         new_mail=eml.generateEML(mail)
         attachments=mail.Attachments
         for rec in recs: #[('res.partner', 3, 'Agrolait')]
             model = rec[0]
             res_id = rec[1]
-
             #Check if mailgate installed
             object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mailgate.message')])
             if not object_id:
@@ -154,13 +185,12 @@ class XMLRpcConn(object):
 
             #Reading the Object ir.model Name
 
-            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',mail.EntryID),('model','=',model),('res_id','=',res_id)])
+            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
             if ext_ids:
                 name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
-                ext_msg += """This mail is already archived to {1} '{2}'.
-""".format(object_name,name)
+                ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
+                flag = True
                 continue
-
             msg = {
                 'subject':mail.Subject,
                 'date':str(mail.ReceivedTime),
@@ -168,8 +198,8 @@ class XMLRpcConn(object):
                 'cc':mail.CC,
                 'from':mail.SenderEmailAddress,
                 'to':mail.To,
-                'message-id':str(new_mail.get('Message-Id')),
-                'references':str(new_mail.get('References')),
+                'message-id':message_id,
+                'references':ustr(referances),
             }
             result = {}
             if attachments:
@@ -180,8 +210,8 @@ class XMLRpcConn(object):
             flag = True
 
         if flag:
-            t = ext_msg
-            t += """Mail archived Successfully with attachments.\n"""+new_msg
+            t = """Mail archived Successfully with attachments.\n"""+ext_msg
+            t += "\n"+new_msg
             win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
         return flag
 
@@ -240,13 +270,35 @@ class XMLRpcConn(object):
     def CreateCase(self, section, mail, partner_ids, with_attachments=True):
         import win32ui
         import eml
-        section=str(section)
         flag = False
         id = -1
         try:
             conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
             email=eml.generateEML(mail)
-            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, email)
+            message_id = referances  = None
+            outlook = win32com.client.Dispatch("Outlook.Application")
+            session = win32com.client.Dispatch("MAPI.session")
+            session.Logon('Outlook')
+            objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+            objFields = objMessage.Fields
+            strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+            strheader = ustr(strheader).encode('iso-8859-1')
+            headers = {}
+            strheader = strheader.replace("\n ", " ").splitlines()
+            for line in strheader:
+                split_here = line.find(":")
+                headers[line[:split_here]] = line[split_here:]
+            temp1 = headers.get('Message-ID')
+            temp2 = headers.get('Message-Id')
+            if temp1 == None:    message_id = temp2
+            if temp2 == None:    message_id = temp1
+            startCut = message_id.find("<")
+            endCut = message_id.find(">")
+            message_id = message_id[startCut:endCut+1]
+
+            email.replace_header('Message-Id',message_id)
+            win32ui.MessageBox(str(email),"Mail ")
+            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(email))
             if id > 0:
                 flag = True
                 return flag
@@ -398,21 +450,13 @@ class XMLRpcConn(object):
         	return None
         return partner_id[0]
 
-    def SearchEmailResources(self, mail):
+    def SearchEmailResources(self, message_id):
         import win32ui
         import eml
 
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         sub = ""
         res_vals = []
-
-        try:
-#            new_mail = eml.generateEML(mail)
-            email.SaveAs()
-            message_id = str(new_mail.get('message-id'))
-        except Exception,e:
-            win32ui.MessageBox(str(e),"Mail Reading Error")
-            return None
         mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])
         if not mail_id:
             return None

From fe0e28c1574eddef05da9875369dbd44da9b149d Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 11 Oct 2010 15:47:26 +0530
Subject: [PATCH 059/294] [FIX] wiki: put readonly create_uid, create_date and
 write_date fields

bzr revid: hmo@tinyerp.com-20101011101726-w4phuj9aaj7p606e
---
 addons/wiki/wiki.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index b8876ee0316..2d814485a7c 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -108,9 +108,9 @@ class wiki_wiki2(osv.osv):
         'name': fields.char('Title', size=256, select=True, required=True),
         'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
         'text_area': fields.text("Content"),
-        '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),
+        'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
+        'create_date': fields.datetime("Created on", select=True, readonly=True),
+        'write_date': fields.datetime("Modification Date", select=True, readonly=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),
@@ -184,8 +184,6 @@ class wiki_wiki2(osv.osv):
 
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks, """
-        #TOFIX: why create_uid in vals
-        if 'create_uid' in vals: del vals['create_uid']
         wiki_id = super(wiki_wiki2, self).create(cr, uid,
                              vals, context)
         self.create_history(cr, uid, [wiki_id], vals, context)

From b28fff9a4bb81156b4bd43a7a62751c9b1a21ea9 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 11 Oct 2010 16:11:04 +0530
Subject: [PATCH 060/294] [IMP] Outlook Installer : Installtion instruction

bzr revid: jam@tinyerp.com-20101011104104-37b3ew1ay7b155vy
---
 addons/outlook/README       | 1 +
 addons/outlook/installer.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/addons/outlook/README b/addons/outlook/README
index 404f2121c6a..adfd4401cb3 100644
--- a/addons/outlook/README
+++ b/addons/outlook/README
@@ -4,6 +4,7 @@ Pre requirements :
 ======================================================================================
 1.Python 2.6+ . python can be downloaded from http://www.python.org/download/releases/ .
 2.Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. It can be downloaded from http://sourceforge.net/projects/pywin32/files/ or http://starship.python.net/crew/mhammond/win32/ 
+3.If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)". It can be downloaded from http://www.microsoft.com/downloads/en/details.aspx?FamilyID=e17e7f31-079a-43a9-bff2-0a110307611e&displaylang=en
 
 How to install openerp-outlook plug-in?
 ======================================================================================
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 84349a64d17..1fe408d7e67 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -55,6 +55,7 @@ class outlook_installer(osv.osv_memory):
 Pre-requirements :
     1. Python 2.6+ .
     2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
+    3. If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)".
 
 How to install openerp-outlook plug-in?
     1. Extract zip file  “openerp-outlook-plugin.zip� .
@@ -65,6 +66,9 @@ How to install openerp-outlook plug-in?
     6. See User Guide for more information.
     7. Keep All extratced files in some safe places
         (e.g. python installation Directory "C:\pythonXX\" or Windows installation Directory "C:\Program Files\"  ).
+
+Note :
+    Please refer README file for dependecies external link, openobject-addons/outlook/README.
 """
         }
 outlook_installer()

From 2c71620b6faa9d1b680b0a333dfaf7ec5a93abad Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Mon, 11 Oct 2010 17:39:52 +0530
Subject: [PATCH 061/294] [IMP/FIX]  document : improved tooltips for Type and
 fixed Group by Storage

bzr revid: jas@tinyerp.com-20101011120952-95evv1jbm0r00tn9
---
 addons/document/document_directory.py | 24 ++++++++++++------------
 addons/document/document_view.xml     |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 3486359f183..652f42f0938 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.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/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ from tools.translate import _
 class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Directory'
-    _order = 'name desc'
+    _order = 'name'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
@@ -44,13 +44,13 @@ class document_directory(osv.osv):
         'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'),
         'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'),
         'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'),
-        'type': fields.selection([ 
+        'type': fields.selection([
             ('directory','Static Directory'),
             ('ressource','Folders per resource'),
             ],
             'Type', required=True, select=1,
-            help="Defines directory's behaviour."),
-        
+            help="Each directory can either have the type Static or be linked to another resource. A static directory, as with Operating Systems, is the classic directory that can contain a set of files. The directories linked to systems resources automatically possess sub-directories for each of resource types defined in the parent directory."),
+
         'ressource_type_id': fields.many2one('ir.model', 'Resource model',
             help="Select an object here and there will be one folder per record of that resource."),
         'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
@@ -95,13 +95,13 @@ class document_directory(osv.osv):
                 return objid.browse(cr, uid, mid, context=context).res_id
         except Exception:
                 return None
-        
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', context=c),
         'user_id': lambda self,cr,uid,ctx: uid,
         'domain': lambda self,cr,uid,ctx: '[]',
         'type': lambda *args: 'directory',
-        'ressource_id': lambda *a: 0,        
+        'ressource_id': lambda *a: 0,
         'storage_id': _get_def_storage,
         'resource_find_all': True,
     }
@@ -151,7 +151,7 @@ class document_directory(osv.osv):
     _constraints = [
         (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id'])
     ]
-    
+
     def __init__(self, *args, **kwargs):
         super(document_directory, self).__init__(*args, **kwargs)
 
@@ -172,7 +172,7 @@ class document_directory(osv.osv):
         """
         if not context:
                 context = {}
-            
+
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
     def get_dir_permissions(self, cr, uid, ids ):
@@ -180,7 +180,7 @@ class document_directory(osv.osv):
         """
         assert len(ids) == 1
         id = ids[0]
-        
+
         cr.execute( "SELECT count(dg.item_id) AS needs, count(ug.uid) AS has " \
                 " FROM document_directory_group_rel dg " \
                 "   LEFT OUTER JOIN res_groups_users_rel ug " \
@@ -197,7 +197,7 @@ class document_directory(osv.osv):
             Return a tuple (node_dir, remaining_path)
         """
         return (nodes.node_database(context=ncontext), uri)
-        
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default ={}
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 13e4cff02d4..b7a5840dc7d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -148,6 +148,7 @@
                 <field name="name"/>
                 <field name="type"/>
                 <field name="user_id"/>
+                <field name="storage_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
             </tree>
@@ -403,7 +404,7 @@
         src_model="res.partner"
         groups="base.group_extended"/>
 
-    <act_window 
+    <act_window
     	context="{'search_default_parent_id': [active_id]}"
         id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"

From 1bc360ea56877913e8b4679f9ad3323fc7c6b207 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 11 Oct 2010 18:33:28 +0530
Subject: [PATCH 062/294] [IMP] Fed State search based on Country Selection.

bzr revid: jam@tinyerp.com-20101011130328-kmkmplwx0oonep20
---
 .../dialogs/dialog_map.py                     | 24 ++++++++++---------
 .../openerp-outlook-plugin/tiny_xmlrpc.py     | 17 +++++++------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index ab14539e947..abaff953cfe 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -180,7 +180,8 @@ global new_con_country
 new_con_country= ""
 global new_con_state
 new_con_state= ""
-
+global search_country
+search_country = None
 
 def check():
     server = NewConn.getitem('_server')
@@ -953,10 +954,6 @@ def SetDefaultContact(txtProcessor,*args):
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2],new_con_state)
-        state_val = NewConn.FindCountryForState(str(state_ref))
-        if state_val == None:
-            new_con_country = country
-        new_con_country =  state_val
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3],new_con_country)
         new_con_country = ""
         new_con_state = ""
@@ -1099,18 +1096,15 @@ def GetDefaultEmail(txtProcessor,*args):
         state_ref = state_n
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(partner_ref))
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(state_ref))
-    state_val = NewConn.FindCountryForState(str(state_ref))
+    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
     partner_ref = ""
     country_ref = ""
     state_ref = ""
     new_con_country = ""
     new_con_state = ""
-    if state_val == None:
-        country_ref = country_n
-    country_ref = state_val
     if country_ref == None:
         country_ref = ""
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
+
 
     if not b:
         return
@@ -1172,6 +1166,8 @@ def GetDefaultEmail(txtProcessor,*args):
 
             if val[0] == 'country_id' and val[1] != False :
                 win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(val[1][1]))
+                global search_country
+                search_country =  ustr(val[1][1])
 
             if val[0] == 'phone' and val[1] != False :
                 win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[5], ustr(val[1]))
@@ -1235,6 +1231,8 @@ def SearchPartner(btnProcessor,*args):
 
                 if val[0] == 'country_id' and val[1] != False :
                     win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[12], ustr(val[1][1]))
+                    global search_country
+                    search_country =  ustr(val[1][1])
 
                 if val[0] == 'phone' and val[1] != False :
                     win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6], ustr(val[1]))
@@ -1542,12 +1540,14 @@ def SelectCountryFromList(btnProcessor,*args):
                 sel_text = nombre[0:size]
         global country_ref
         global new_con_country
+        global search_country
         if str(sel_text).strip() == "":
             win32ui.MessageBox("Invalid country selected.","Search Country")
             return
         try:
             country_ref = str(sel_text)
             new_con_country = str(sel_text)
+            search_country = str(sel_text)
         except Exception,e:
             pass
         win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
@@ -1564,13 +1564,15 @@ def SearchState(btnProcessor, *args):
     if not b:
         return
     try :
+        global new_con_country
+        global search_country
         search_state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
         if not search_state:
             win32ui.MessageBox("Please enter state name to search for.", "Search Fed.State", flag_excl)
             return
         #Searching the contact.
         hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        states = list(NewConn.GetStates(search_state))
+        states = list(NewConn.GetStates(search_state, search_country))
         win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
         if not states:
             win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 2344a52a29c..af2c5afd35c 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -295,9 +295,7 @@ class XMLRpcConn(object):
             startCut = message_id.find("<")
             endCut = message_id.find(">")
             message_id = message_id[startCut:endCut+1]
-
             email.replace_header('Message-Id',message_id)
-            win32ui.MessageBox(str(email),"Mail ")
             id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(email))
             if id > 0:
                 flag = True
@@ -467,7 +465,6 @@ class XMLRpcConn(object):
 
 
     def GetCountry(self, country_search=''):
-        import win32ui
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         ids=[]
         obj_list=[]
@@ -480,11 +477,17 @@ class XMLRpcConn(object):
             obj_list.sort(lambda x, y: cmp(x[1],y[1]))
         return obj_list
 
-    def GetStates(self, state_search=''):
+    def GetStates(self, state_search='', country=None):
+        import win32ui
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        ids=[]
-        obj_list=[]
-        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','ilike',ustr(state_search))])
+        ids = []
+        c_id = []
+        obj_list = []
+        if country == None:
+            ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','ilike',ustr(state_search))])
+        if not country == None:
+            c_id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',[('name','=',ustr(country))])
+            ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','ilike',ustr(state_search)),('country_id','=',c_id[0])])
         if ids:
             ids.sort()
             for id in ids:

From ae2056a2c87c3da7f78d2393d44c3248aa503e04 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 12 Oct 2010 11:12:51 +0530
Subject: [PATCH 063/294] [IMP] Dialog Title

bzr revid: jam@tinyerp.com-20101012054251-kzs9md8e34568f6y
---
 .../openerp-outlook-plugin/dialogs/resources/dialogs.py     | 6 +++---
 .../openerp-outlook-plugin/dialogs/resources/dialogs.rc     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index cc19913c851..5f5a0cdca50 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,9 +1,9 @@
 #C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
 #This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
-_rc_size_=16025
-_rc_mtime_=1286623806
+_rc_size_=16028
+_rc_mtime_=1286860723
 class FakeParser:
-	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
+	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
 	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
 	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
index c00d9c80db0..4514d17b0eb 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
@@ -317,7 +317,7 @@ END
 IDD_SELECT_STATE DIALOGEX 0, 0, 220, 250
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Country"
+CAPTION "Search Fed. State"
 FONT 8, "Tahoma", 400, 0, 0x0
 BEGIN
 

From faf41056d830aa6d4c3767de3b0aa296cc33736d Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 11:22:05 +0530
Subject: [PATCH 064/294] [IMP] : project_scrum : improved task progress and
 backlog progress chart

bzr revid: jas@tinyerp.com-20101012055205-5m8imrf270cpzvm6
---
 .../board_project_scrum_view.xml              |  12 +-
 addons/project_scrum/project_scrum_demo.xml   | 213 +++++++++++++++++-
 2 files changed, 208 insertions(+), 17 deletions(-)

diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index e9581fa9707..22aac896c88 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -26,23 +26,23 @@
              	</tree>
             </field>
         </record>
-        <record id="view_project_task_graph" model="ir.ui.view">
+        <record id="view_task_progress_graph" model="ir.ui.view">
             <field name="name">project.task.graph</field>
             <field name="model">project.task</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Task Progress" type="bar">
-                    <field name="project_id"/>
-                    <field name="planned_hours" operator="+"/>
-                    <field name="delay_hours" operator="+"/>
+                    <field name="sprint_id"/>
+                    <field name="effective_hours" operator="+"/>
                 </graph>
             </field>
         </record>
-        <record id="action_view_project_task_graph" model="ir.actions.act_window">
+        <record id="action_view_task_progress_graph" model="ir.actions.act_window">
             <field name="name">Task Progress</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_task_progress_graph"/>
         </record>
 
         <record id="view_backlog_progress_graph" model="ir.ui.view">
@@ -82,7 +82,7 @@
                              <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
                         <child2>
-                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progress" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_task_progress_graph)d" string="Task Progress" width="510"/>
                              <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progress" width="510"/>
                         </child2>
                     </hpaned>
diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml
index 2c627c89b09..bd31913dfb9 100644
--- a/addons/project_scrum/project_scrum_demo.xml
+++ b/addons/project_scrum/project_scrum_demo.xml
@@ -13,6 +13,24 @@
             <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
 
+        <record id="scrum_project_2" model="project.project">
+            <!-- FIXME !!! -->
+            <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
+            <field model="res.users" name="manager" search="[('login','=','admin')]"/>
+            <field name="expected_hours">200</field>
+            <field name="name">OpenERP - MRP branch</field>
+            <field model="res.users" name="product_owner_id" search="[('login','=','admin')]"/>
+        </record>
+
+        <record id="scrum_project_3" model="project.project">
+            <!-- FIXME !!! -->
+            <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
+            <field model="res.users" name="manager" search="[('login','=','admin')]"/>
+            <field name="expected_hours">98</field>
+            <field name="name">OpenERP - CRM branch</field>
+            <field model="res.users" name="product_owner_id" search="[('login','=','admin')]"/>
+        </record>
+
         <!-- Resource: project_scrum.sprint -->
 
         <record id="scrum_sprint_0" model="project.scrum.sprint">
@@ -23,6 +41,133 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="state">open</field>
         </record>
+       <record id="scrum_sprint_1" model="project.scrum.sprint">
+            <field name="name">sprint 1</field>
+            <field name="date_start">2010-01-01</field>
+            <field name="date_stop">2010-01-15</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_2" model="project.scrum.sprint">
+            <field name="name">sprint 2</field>
+            <field name="date_start">2010-01-16</field>
+            <field name="date_stop">2010-01-30</field>
+            <field name="expected_hours">100.0</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_3" model="project.scrum.sprint">
+            <field name="name">sprint 3</field>
+            <field name="date_start">2010-02-01</field>
+            <field name="date_stop">2010-02-15</field>
+            <field name="expected_hours">89.0</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_4" model="project.scrum.sprint">
+            <field name="name">sprint 4</field>
+            <field name="date_start">2010-02-16</field>
+            <field name="date_stop">2010-02-28</field>
+            <field name="expected_hours">125.0</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_5" model="project.scrum.sprint">
+            <field name="name">sprint 5</field>
+            <field name="date_start">2010-03-01</field>
+            <field name="date_stop">2010-03-15</field>
+            <field name="expected_hours">178.0</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_6" model="project.scrum.sprint">
+            <field name="name">sprint 6</field>
+            <field name="date_start">2010-03-16</field>
+            <field name="date_stop">2010-01-30</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="expected_hours">200.0</field>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_7" model="project.scrum.sprint">
+            <field name="name">sprint 7</field>
+            <field name="date_start">2010-04-01</field>
+            <field name="date_stop">2010-04-15</field>
+            <field name="expected_hours">175.0</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_8" model="project.scrum.sprint">
+            <field name="name">sprint 8</field>
+            <field name="date_start">2010-04-16</field>
+            <field name="date_stop">2010-04-30</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field name="expected_hours">122.0</field>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_9" model="project.scrum.sprint">
+            <field name="name">sprint 9</field>
+            <field name="date_start">2010-05-01</field>
+            <field name="date_stop">2010-05-15</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_10" model="project.scrum.sprint">
+            <field name="name">sprint 10</field>
+            <field name="date_start">2010-05-16</field>
+            <field name="date_stop">2010-05-30</field>
+            <field name="expected_hours">78.0</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_11" model="project.scrum.sprint">
+            <field name="name">sprint 11</field>
+            <field name="date_start">2010-06-01</field>
+            <field name="date_stop">2010-06-15</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_12" model="project.scrum.sprint">
+            <field name="name">sprint 12</field>
+            <field name="date_start">2010-06-16</field>
+            <field name="date_stop">2010-06-30</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
 
         <!-- Resource: project.product.backlog -->
 
@@ -40,53 +185,99 @@
             <field name="name">New accounting module</field>
             <field name="expected_hours">111.0</field>
             <field name="note">The accounting module of OpenERP (financial accounting and management accounting) is being reshaped. New functionalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_1"/>
 			<field name="state">open</field>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="project_id" ref="scrum_project_2"/>
         </record>
         <record id="scrum_product_backlog_2" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automated Plugin System to install/uninstall modules</field>
             <field name="expected_hours">4.0</field>
             <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of OpenERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_2"/>
             <field name="state">open</field>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="project_id" ref="scrum_project_3"/>
         </record>
         <record id="scrum_product_backlog_3" model="project.scrum.product.backlog">
             <field name="name">Review all terms</field>
             <field name="expected_hours">8.0</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_3"/>
             <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_4" model="project.scrum.product.backlog">
             <field name="name">Bugfixes</field>
             <field name="expected_hours">6.0</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_4"/>
             <field name="state">open</field>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="project_id" ref="scrum_project_2"/>
         </record>
         <record id="scrum_product_backlog_5" model="project.scrum.product.backlog">
             <field name="name">Test for 3.2.0 Publishing</field>
             <field name="expected_hours">5.0</field>
             <field name="note">Test OpenERP to release stable 3.2.0 version. (may be 3.2.0-pre1 ?)</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="sprint_id" ref="scrum_sprint_5"/>
+            <field name="project_id" ref="scrum_project_3"/>
         </record>
         <record id="scrum_product_backlog_6" model="project.scrum.product.backlog">
             <field name="name">Reshape the complete menu</field>
             <field name="expected_hours">4.0</field>
             <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_6"/>
           	<field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
+
         <record id="scrum_product_backlog_7" model="project.scrum.product.backlog">
             <field name="name">Editable Trees</field>
             <field name="expected_hours">12.0</field>
             <field name="note">Editable trees in list and one2many_list widgets.</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_7"/>
+            <field name="project_id" ref="scrum_project_2"/>
+        </record>
+
+        <record id="scrum_product_backlog_8" model="project.scrum.product.backlog">
+            <field name="name">Reshape the complete menu</field>
+            <field name="expected_hours">3.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_8"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_3"/>
+        </record>
+
+        <record id="scrum_product_backlog_9" model="project.scrum.product.backlog">
+            <field name="name">Analysis Product phase</field>
+            <field name="expected_hours">10.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_9"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_1"/>
+        </record>
+
+        <record id="scrum_product_backlog_10" model="project.scrum.product.backlog">
+            <field name="name">Rearrange the Menu</field>
+            <field name="expected_hours">9.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_10"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_2"/>
+        </record>
+
+        <record id="scrum_product_backlog_11" model="project.scrum.product.backlog">
+            <field name="name">Complete change in list view</field>
+            <field name="expected_hours">8.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_11"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_3"/>
+        </record>
+
+        <record id="scrum_product_backlog_12" model="project.scrum.product.backlog">
+            <field name="name">Reshape the complete menu</field>
+            <field name="expected_hours">2.0</field>
+            <field name="note">Set rule for Tax according to 2010-2011 Rules</field>
+            <field name="sprint_id" ref="scrum_sprint_12"/>
+            <field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
 

From e848ed0cf4133f3c0827e81d13527dd1dbfa07e6 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 12 Oct 2010 11:56:08 +0530
Subject: [PATCH 065/294] [IMP] ::Documents->Shared Repository:enlarge the FTP
 server field,Documents-> descending by date and tooltip change and fix bug on
 my document filter button::Reporting->Document Dashboard->group by year/Month
 and default user_id context remove

bzr revid: ron@tinyerp.com-20101012062608-nvlyu9qag6zeyh5h
---
 addons/document/board_document_view.xml       |  6 ++--
 addons/document/document.py                   |  7 ++--
 addons/document/document_directory.py         | 20 ++++++------
 addons/document/document_view.xml             |  6 ++--
 addons/document/report/document_report.py     |  8 +++--
 .../document/report/document_report_view.xml  | 32 +++++++------------
 .../document_ftp/test/document_ftp_test2.yml  |  2 +-
 .../document_ftp/wizard/ftp_browse_view.xml   |  2 +-
 .../document_ftp/wizard/ftp_configuration.py  |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  1 +
 addons/project/report/project_report.py       |  2 +-
 11 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 2bfc5a6f200..7ba8c498271 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -16,9 +16,7 @@
                             <action
                                 string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
-                                view_mode="tree"
-                                domain="[('name','=',time.strftime('%%Y')),('month','=',time.strftime('%%m'))]"/>
-
+                                view_mode="tree,form"/>
                             <action
                                 string="File Size by Month"
                                 name="%(document.action_view_size_month)d"
@@ -28,7 +26,7 @@
                             <action
                                 string="Files by Resource Type"
                                 name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>
+                                />
 
                             <action
                                 string="Files by Partner"
diff --git a/addons/document/document.py b/addons/document/document.py
index 624af24c1fb..f4b752fb636 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -41,7 +41,7 @@ class document_file(osv.osv):
         fbrl = self.browse(cr, uid, ids, context=context)
         nctx = nodes.get_node_context(cr, uid, context={})
         # nctx will /not/ inherit the caller's context. Most of
-        # it would be useless, anyway (like active_id, active_model, 
+        # it would be useless, anyway (like active_id, active_model,
         # bin_size etc.)
         result = {}
         bin_size = context.get('bin_size', False)
@@ -91,10 +91,11 @@ class document_file(osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
-        
+
         # fields used for file storage
         'store_fname': fields.char('Stored Filename', size=200),
     }
+    _order = "create_date desc"
 
     def __get_def_directory(self, cr, uid, context=None):
         dirobj = self.pool.get('document.directory')
@@ -150,7 +151,7 @@ class document_file(osv.osv):
             return False
         if not self._check_duplication(cr, uid, vals, ids, 'write'):
             raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-        
+
         # if nodes call this write(), they must skip the code below
         from_node = context and context.get('__from_node', False)
         if (('parent_id' in vals) or ('name' in vals)) and not from_node:
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 3486359f183..9cc8e4a9950 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.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/>.
 #
 ##############################################################################
 
@@ -44,13 +44,13 @@ class document_directory(osv.osv):
         'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'),
         'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'),
         'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'),
-        'type': fields.selection([ 
+        'type': fields.selection([
             ('directory','Static Directory'),
             ('ressource','Folders per resource'),
             ],
             'Type', required=True, select=1,
             help="Defines directory's behaviour."),
-        
+
         'ressource_type_id': fields.many2one('ir.model', 'Resource model',
             help="Select an object here and there will be one folder per record of that resource."),
         'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
@@ -95,13 +95,13 @@ class document_directory(osv.osv):
                 return objid.browse(cr, uid, mid, context=context).res_id
         except Exception:
                 return None
-        
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', context=c),
         'user_id': lambda self,cr,uid,ctx: uid,
         'domain': lambda self,cr,uid,ctx: '[]',
         'type': lambda *args: 'directory',
-        'ressource_id': lambda *a: 0,        
+        'ressource_id': lambda *a: 0,
         'storage_id': _get_def_storage,
         'resource_find_all': True,
     }
@@ -151,7 +151,7 @@ class document_directory(osv.osv):
     _constraints = [
         (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id'])
     ]
-    
+
     def __init__(self, *args, **kwargs):
         super(document_directory, self).__init__(*args, **kwargs)
 
@@ -172,7 +172,7 @@ class document_directory(osv.osv):
         """
         if not context:
                 context = {}
-            
+
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
     def get_dir_permissions(self, cr, uid, ids ):
@@ -180,7 +180,7 @@ class document_directory(osv.osv):
         """
         assert len(ids) == 1
         id = ids[0]
-        
+
         cr.execute( "SELECT count(dg.item_id) AS needs, count(ug.uid) AS has " \
                 " FROM document_directory_group_rel dg " \
                 "   LEFT OUTER JOIN res_groups_users_rel ug " \
@@ -197,7 +197,7 @@ class document_directory(osv.osv):
             Return a tuple (node_dir, remaining_path)
         """
         return (nodes.node_database(context=ncontext), uri)
-        
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default ={}
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 13e4cff02d4..aa4d94382ee 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -291,7 +291,7 @@
                  <field name="parent_id" />
                  <field name="user_id">
                     <filter icon="terp-personal"
-                        domain="[('user_id','=', False)]"
+                        domain="[('user_id','=',uid)]"
                         help="Filter on my documents" />
                  </field>
                 <field name="partner_id"/>
@@ -333,7 +333,7 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
         <field name="search_view_id" ref="view_attach_filter"/>
-        <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
+        <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
@@ -403,7 +403,7 @@
         src_model="res.partner"
         groups="base.group_extended"/>
 
-    <act_window 
+    <act_window
     	context="{'search_default_parent_id': [active_id]}"
         id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 419b37ca68e..34b61f01c01 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -34,6 +34,7 @@ class report_document_user(osv.osv):
         'user_id':fields.integer('Owner', readonly=True),
         'user':fields.char('User',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
+        'datas_fname': fields.char('File Name',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
         'file_size': fields.integer('File Size', readonly=True),
@@ -52,6 +53,7 @@ class report_document_user(osv.osv):
                      u.name as user,
                      count(*) as nbr,
                      d.name as directory,
+                     f.datas_fname as datas_fname,
                      f.create_date as create_date,
                      f.file_size as file_size,
                      min(d.type) as type,
@@ -59,11 +61,13 @@ class report_document_user(osv.osv):
                  FROM ir_attachment f
                      left join document_directory d on (f.parent_id=d.id and d.name<>'')
                      inner join res_users u on (f.user_id=u.id)
-                 group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date
+                 group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname
              )
         """)
 report_document_user()
 
+
+
 class report_files_partner(osv.osv):
     _name = "report.files.partner"
     _description = "Files details by Partners"
@@ -86,7 +90,7 @@ class report_files_partner(osv.osv):
                        to_char(date_trunc('month', f.create_date),'MM') AS month,
                        SUM(f.file_size) AS file_size,
                        p.name AS partner
-                       
+
                 FROM ir_attachment f
                   LEFT JOIN res_partner p ON (f.partner_id=p.id)
                 WHERE f.datas_fname IS NOT NULL
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index d0ba1303a39..b9a1652388c 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -10,6 +10,7 @@
                     <field name="name" select="1"/>
                     <field name="user" select="1"/>
                     <field name="directory" select="1"/>
+                    <field name="datas_fname" select="1"/>
                     <field name="file_size"/>
                     <field name="create_date"/>
                 </form>
@@ -25,10 +26,11 @@
                 <tree string="Files">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="user" select="1"/>
-                    <field name="directory" select="1"/>
-                    <field name="file_size"/>
-                    <field name="create_date"/>
+                    <field name="user" select="1" invisible="1"/>
+                    <field name="directory" select="1" invisible="1"/>
+                    <field name="file_size" invisible="1"/>
+                    <field name="create_date" invisible="1"/>
+                    <field name="nbr"/>
                 </tree>
             </field>
         </record>
@@ -60,8 +62,8 @@
             <field name="name">All Users files</field>
             <field name="res_model">report.document.user</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="context">{'search_default_user': 'user_id'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'group_by': ['name','month']}</field>
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
@@ -112,30 +114,18 @@
             <field name="arch" type="xml">
                 <graph string="Files by Resource Type" type="pie">
                     <field name="type" />
-<!--                    <field name="file_size" operator="+"/>-->
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
         </record>
 
-<!--        <record model="ir.ui.view" id="view_document_by_resourcetype_tree">-->
-<!--            <field name="name">report.document.resource.tree.view</field>-->
-<!--            <field name="model">report.document.user</field>-->
-<!--            <field name="type">tree</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <tree string="Files by Resource Type">-->
-<!--                    <field name="type" />-->
-<!--                    <field name="nbr"/>-->
-<!--                </tree>-->
-<!--            </field>-->
-<!--        </record>-->
 
         <record model="ir.actions.act_window" id="action_view_document_by_resourcetype_graph">
             <field name="name">Files by Resource Type</field>
             <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_document_by_resourcetype_graph"></field>
+            <field name="view_id" ref="view_document_by_resourcetype_graph"/>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">graph,tree</field>
         </record>
 
 <!--***************************************************************************************-->
@@ -150,7 +140,7 @@
                     <field name="file_size" operator="+"/>
                 </graph>
             </field>
-        </record>
+    </record>
 
     <record model="ir.ui.view" id="view_size_month_tree">
             <field name="name">report.document.user.tree</field>
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 32434962ba2..53d5a2b78bf 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -196,7 +196,7 @@
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.mkd("Test-Folder2")
+        ftp.mkd("Test-Folder3")
         # TODO move
 -
     I remove the 'Test-Folder3'
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 7a52c1fd291..90182b70e0d 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document">
                     <separator string="Browse Document" colspan="4"/>
-                    <field name="url" widget="url" colspan="4"/>
+                    <field name="url" widget="url" colspan="4" width="250"/>
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <label string="" colspan="2"/>
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 0522e0348b8..5c6544dac5d 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -30,7 +30,7 @@ class document_ftp_configuration(osv.osv_memory):
     _rec_name = 'host'
     _columns = {
         'host': fields.char('Address', size=64,
-                            help="Server address or IP and port to which users should connect to for DMS access", 
+                            help="Server address or IP and port to which users should connect to for DMS access",
                             required=True),
     }
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7138f9137f..2a47d8ea297 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -113,6 +113,7 @@
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
     <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+    <menuitem id="menu_partner_invc" name="Partner Invoice" parent="base.menu_project_management_time_tracking" action="account.action_invoice_tree1"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index f4d8b32e569..989f646724e 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -89,7 +89,7 @@ class report_project_task_user(osv.osv):
                     planned_hours as hours_planned,
                     (extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
                     (extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
-                    (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)  as delay_endings_days
+                    abs((extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24))  as delay_endings_days
               FROM project_task t
 
                 GROUP BY

From cebd5a055e2a2bd0e2ced4776e2c729d43d5029c Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 15:17:07 +0530
Subject: [PATCH 066/294] [IMP] document : improved domain for Related
 Documents

bzr revid: jas@tinyerp.com-20101012094707-3bh1fr8u0w2am89k
---
 addons/document/document_view.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b7a5840dc7d..5b8653cda8c 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -405,14 +405,10 @@
         groups="base.group_extended"/>
 
     <act_window
-    	context="{'search_default_parent_id': [active_id]}"
-        id="zoom_directory" name="Related Documents"
+        domain="[('parent_id', '=', active_id)]"
+    	id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"
         src_model="document.directory"/>
-
-
-
-
 </data>
 </openerp>
 

From cbdd2134a8737b74be53a2a16fb4b864127f91f0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 15:55:37 +0530
Subject: [PATCH 067/294] [IMP] project_issue, project_long_term : improved
 string and corrected spelling mistake in demo file

bzr revid: jas@tinyerp.com-20101012102537-r35k4pe4ej56yxpt
---
 addons/project_issue/project_issue.py         | 10 +++----
 .../project_long_term_demo.xml                | 26 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2788b59ed7d..7aa501dd41b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -141,7 +141,7 @@ class project_issue(crm.crm_case, osv.osv):
                 else:
                     res[issue.id][field] = abs(float(duration))
         return res
-    
+
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=128, required=True),
@@ -172,7 +172,7 @@ class project_issue(crm.crm_case, osv.osv):
         'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
@@ -288,11 +288,11 @@ class project_issue(crm.crm_case, osv.osv):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{}}
-    
+
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
         if context is None:
             context = {}
-        result = {}    
+        result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context)
@@ -442,7 +442,7 @@ class project_issue(crm.crm_case, osv.osv):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not context:
             context={}
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 30acac99377..4de53c0f38d 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-<!-- 
+<!--
 This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
         <!-- Users -->
-        
+
         <record id="res_users_analyst" model="res.users">
-            <field name="name">Phoung</field>
+            <field name="name">Phuong</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="login">phu</field>
             <field name="password">phu</field>
@@ -19,7 +19,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="password">al</field>
         </record>
         <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Qwintin</field>
+            <field name="name">Quentin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">qdp</field>
             <field name="password">qdp</field>
@@ -91,8 +91,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
-        
-        
+
+
 
         <!-- Projects -->
         <record id="project_integrate_openerp" model="project.project">
@@ -101,12 +101,12 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="type">normal</field>
             <field name="description">Integrate an Sale and Warehouse Management.</field>
             <field eval="[(6, 0, [
-                    ref('res_users_analyst'), 
-                    ref('res_users_project_manager'), 
-                    ref('res_users_technical_leader'), 
-                    ref('res_users_developer'), 
-                    ref('res_users_designer'), 
-                    ref('res_users_tester'), 
+                    ref('res_users_analyst'),
+                    ref('res_users_project_manager'),
+                    ref('res_users_technical_leader'),
+                    ref('res_users_developer'),
+                    ref('res_users_designer'),
+                    ref('res_users_tester'),
                     ref('res_users_finacial_manager')])]" name="members"/>
             <field name="user_id" ref="res_users_project_manager"/>
             <field name="name">Integrate an Sale and Warehouse Management.</field>
@@ -213,7 +213,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="resource_id" ref="resource_project_manager"/>
             <field name="phase_id" ref="project_phase_5"/>
         </record>
-        
+
         <record id="resource_allocation_9" model="project.resource.allocation">
             <field name="resource_id" ref="resource_analyst"/>
             <field name="phase_id" ref="project_phase_6"/>

From 2498fc7273dc5c12d0b33a7657ff07e757e97c0b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 15:59:13 +0530
Subject: [PATCH 068/294] [FIX] project_planning: fix

bzr revid: hmo@tinyerp.com-20101012102913-8md34zo6ee9recgq
---
 addons/project/project_view.xml                         | 8 ++++----
 addons/project_planning/board_project_planning_view.xml | 6 +++---
 addons/project_planning/project_planning_view.xml       | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5e5be5ee4b0..5afa16a092a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,10 +5,10 @@
         <menuitem
             icon="terp-project" id="base.menu_main_pm"
             name="Project" sequence="10"
-            groups="group_project_manager,group_project_user,base.group_system"/>
+            groups="group_project_manager,group_project_user,base.group_system,group_project_finance_user"/>
 
-        <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="base.group_system"/>
+        <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
+        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="base.group_system,group_project_finance_user"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -490,7 +490,7 @@
             <field name="view_id" ref="task_type_tree"/>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml
index b48ab78dec2..867dba5767f 100644
--- a/addons/project_planning/board_project_planning_view.xml
+++ b/addons/project_planning/board_project_planning_view.xml
@@ -5,14 +5,14 @@
         <record id="board_project_planning_form" model="ir.ui.view">
             <field name="name">board.project.planning.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="project.board_project_manager_form"/>              
+			<field name="inherit_id" ref="project.board_project_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child2/button[@string='My tasks board']" position="after"> 
+      		<xpath expr="/form/hpaned/child1/action[@string='My Open Tasks']" position="after"> 
 				<action colspan="4" name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
 			</xpath>
             </field>
-        </record>"
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ff354c69ccd..b4e6bb316f4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -220,7 +220,7 @@
             parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
 
         <!--
             Planning statistics
@@ -293,7 +293,7 @@
             <field name="res_model">report_account_analytic.planning.stat</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="context">{"search_default_user_id":uid}</field>
+            <!-- <field name="context">{"search_default_user_id":uid}</field> -->
             <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
         </record>
         <menuitem id="next_id_85" name="Planning"

From eeffc06f2afddcd6cdb1f19ca6b31b3acfa3396b Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:37:23 +0300
Subject: [PATCH 069/294] base_calendar, caldav: revise SQL calls.

bzr revid: p_christ@hol.gr-20101012103723-alnh7rkf1g8tthlo
---
 addons/base_calendar/base_calendar.py | 4 ++--
 addons/caldav/calendar.py             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 1ff7777cf36..2a0b0cc60ad 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1065,7 +1065,7 @@ class calendar_event(osv.osv):
             'rule_type': rrule_type,
             'id': id,
         })
-        cr.execute(qry % val)
+        cr.execute(qry, val) # Hopefully psycopg2 works with dicts. But, FIXME
         return True
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
@@ -1682,7 +1682,7 @@ class calendar_todo(osv.osv):
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
         @param context: A standard dictionary for contextual values
         """
-
+        
         assert name == 'date'
         return self.write(cr, uid, id, { 'date_start': value }, context=context)
 
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 068af56459f..883688c38f6 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -63,8 +63,8 @@ def uid2openobjectid(cr, uidval, oomodel, rdate):
             return (False, None)
         qry = 'SELECT DISTINCT(id) FROM %s' % model_obj._table
         if rdate:
-            qry += " where recurrent_id='%s'" % (rdate) #TOFIX: sql injection
-            cr.execute(qry)
+            qry += " WHERE recurrent_id=%s"
+            cr.execute(qry, (rdate,))
             r_id = cr.fetchone()
             if r_id:
                 return (id, r_id[0])

From 96499ac6ce8497c7ab8720a2b4516e00c5e1d314 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:30 +0300
Subject: [PATCH 070/294] doc webdav: fix namespaces, properties

bzr revid: p_christ@hol.gr-20101012103830-0mfo4ecuu4lu78ia
---
 addons/document_webdav/dav_fs.py        |  7 ++++++-
 addons/document_webdav/webdav.py        | 16 ++++++++++------
 addons/document_webdav/webdav_server.py |  3 ++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index f3c8201bafc..9b04d2f3ff0 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -194,7 +194,12 @@ class openerp_dav_handler(dav_interface):
             pname        -- name of the property
          """
         if self.M_NS.has_key(ns):
-            return dav_interface.get_prop(self, uri, ns, propname)
+            try:
+                # if it's not in the interface class, a "DAV:" property
+                # may be at the node class. So shouldn't give up early.
+                return dav_interface.get_prop(self, uri, ns, propname)
+            except DAV_NotFound:
+                pass
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             if cr: cr.close()
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 3b6cf582067..6b24198e320 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -48,7 +48,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     re=doc.createElement("D:response")
     # append namespaces to response
     nsnum=0
-    namespaces = self.namespaces
+    namespaces = self.namespaces[:]
     if 'DAV:' in namespaces:
         namespaces.remove('DAV:')
     for nsname in namespaces:
@@ -108,10 +108,14 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
             ve=doc.createElement(ns_prefix+v[0])
             if need_ns:
                 ve.setAttribute("xmlns:ns"+str(nsnum), v[1])
-            if len(v) > 2 and isinstance(v[2], list):
-                # support nested elements like:
-                # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
-                _prop_elem_child(ve, v[1], v[2], ns_prefix)
+            if len(v) > 2:
+                if isinstance(v[2], list):
+                    # support nested elements like:
+                    # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
+                    _prop_elem_child(ve, v[1], v[2], ns_prefix)
+                else:
+                    vt =doc.createTextNode(tools.ustr(v[2]))
+                    ve.appendChild(vt)
             pnode.appendChild(ve)
         else:
             ve=doc.createTextNode(tools.ustr(v))
@@ -141,7 +145,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
         else:
             ns_prefix="ns"+str(namespaces.index(ns))+":"
         for p,v in good_props[ns].items():
-            if not v:
+            if v is None:
                 continue
             _prop_child(gp, ns, p, v)
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 44592243480..c86cde2b096 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -208,8 +208,9 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
         if self.headers.has_key("Content-Type"):
             ct=self.headers['Content-Type']
         try:
-            location = dc.put(uri,body,ct)
+            location = dc.put(uri, body, ct)
         except DAV_Error, (ec,dd):
+            self._logger.warning("Cannot PUT to %s: %s", uri, dd, exc_info=True)
             return self.send_status(ec)
 
         headers = {}

From ef59ed0203296335f16a1e2cc698f19ce1d021c1 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:30 +0300
Subject: [PATCH 071/294] crm_caldav: fix for empty 'date_deadline'

bzr revid: p_christ@hol.gr-20101012103830-5439bl3x0gnza141
---
 addons/crm_caldav/crm_caldav.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py
index 22f64f4d63d..1a2deae90be 100644
--- a/addons/crm_caldav/crm_caldav.py
+++ b/addons/crm_caldav/crm_caldav.py
@@ -77,7 +77,7 @@ class crm_meeting(osv.osv):
         try:
             for val in vals:
                 # Compute value of duration
-                if 'date_deadline' in val and 'duration' not in val:
+                if val.get('date_deadline', False) and 'duration' not in val:
                     start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
                     end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
                     diff = end - start

From 2655d0e091357c7f70dde96f216f59444b8297df Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:31 +0300
Subject: [PATCH 072/294] Doc Webdav: when scanning children, protect the
 cursor against exceptions.

bzr revid: p_christ@hol.gr-20101012103831-36qutrtz7avzb2ny
---
 addons/document_webdav/dav_fs.py | 37 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 9b04d2f3ff0..8cd00da2a12 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -288,26 +288,27 @@ class openerp_dav_handler(dav_interface):
         result = []
         node = self.uri2object(cr, uid, pool, uri2[:])
 
-        if not node:
-            if cr: cr.close()
-            raise DAV_NotFound2(uri2)
-        else:
-            fp = node.full_path()
-            if fp and len(fp):
-                self.parent.log_message('childs: @%s' % fp)
-                fp = '/'.join(fp)
+        try:
+            if not node:
+                raise DAV_NotFound2(uri2)
             else:
-                fp = None
-            domain = None
-            if filters:
-                domain = node.get_domain(cr, filters)
-            for d in node.children(cr, domain):
-                self.parent.log_message('child: %s' % d.path)
-                if fp:
-                    result.append( self.urijoin(dbname,fp,d.path) )
+                fp = node.full_path()
+                if fp and len(fp):
+                    self.parent.log_message('childs: @%s' % fp)
+                    fp = '/'.join(fp)
                 else:
-                    result.append( self.urijoin(dbname,d.path) )
-        if cr: cr.close()
+                    fp = None
+                domain = None
+                if filters:
+                    domain = node.get_domain(cr, filters)
+                for d in node.children(cr, domain):
+                    self.parent.log_message('child: %s' % d.path)
+                    if fp:
+                        result.append( self.urijoin(dbname,fp,d.path) )
+                    else:
+                        result.append( self.urijoin(dbname,d.path) )
+        finally:
+            if cr: cr.close()
         return result
 
     def uri2local(self, uri):

From 402d407b2c3f630ca57d31f72b48ed397fec1119 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:56 +0300
Subject: [PATCH 073/294] Document: make node classes pluggable (part 1)

Refactor and put hooks in document/nodes so that addons can override
the classes and enhance the node behaviour, per database.

bzr revid: p_christ@hol.gr-20101012103856-j115po98jqff6j02
---
 addons/document/document_directory.py | 32 ++++++++++++++++++++
 addons/document/nodes.py              | 42 +++++++++++++--------------
 2 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 3486359f183..0c208ad04b7 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -175,6 +175,38 @@ class document_directory(osv.osv):
             
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
+    def get_node_class(self, cr, uid, ids, dbro=None, context=None):
+        """Retrieve the class of nodes for this directory
+           
+           This function can be overriden by inherited classes ;)
+           @param dbro The browse object, if caller already has it
+        """
+        if dbro is None:
+            dbro = self.browse(cr, uid, ids, context=context)
+
+        if dbro.type == 'directory':
+            return nodes.node_dir
+        elif dbro.type == 'ressource':
+            assert not dbro.ressource_parent_type_id, \
+                "resource and parent_id at #%d: %r" % (dbro.id, dbro.ressource_parent_type_id)
+            return nodes.node_res_dir
+        else:
+            raise ValueError("dir node for %s type", dbro.type)
+
+    def _prepare_context(self, cr, uid, nctx, context):
+        """ Fill nctx with properties for this database
+        @param nctx instance of nodes.node_context, to be filled
+        @param context ORM context (dict) for us
+        
+        Note that this function is called *without* a list of ids, 
+        it should behave the same for the whole database (based on the
+        ORM instance of document.directory).
+        
+        Some databases may override this and attach properties to the
+        node_context. See WebDAV, CalDAV.
+        """
+        return
+
     def get_dir_permissions(self, cr, uid, ids ):
         """Check what permission user 'uid' has on directory 'id'
         """
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index b849396498d..e4be756db3d 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -64,13 +64,16 @@ class node_context(object):
     """ This is the root node, representing access to some particular
         context """
     cached_roots = {}
+    node_file_class = None
 
     def __init__(self, cr, uid, context=None):
         self.dbname = cr.dbname
         self.uid = uid
         self.context = context
         self._dirobj = pooler.get_pool(cr.dbname).get('document.directory')
+        self.node_file_class = node_file
         assert self._dirobj
+        self._dirobj._prepare_context(cr, uid, self, context=context)
         self.rootdir = False #self._dirobj._get_root_directory(cr,uid,context)
 
     def __eq__(self, other):
@@ -104,14 +107,10 @@ class node_context(object):
         """Create (or locate) a node for a directory
             @param dbro a browse object of document.directory
         """
-        fullpath = self._dirobj.get_full_path(cr, self.uid, dbro.id, self.context)
-        if dbro.type == 'directory':
-            return node_dir(fullpath, None ,self, dbro)
-        elif dbro.type == 'ressource':
-            assert dbro.ressource_parent_type_id == False
-            return node_res_dir(fullpath, None, self, dbro)
-        else:
-            raise ValueError("dir node for %s type", dbro.type)
+        
+        fullpath = dbro.get_full_path(context=self.context)
+        klass = dbro.get_node_class(dbro, context=self.context)
+        return klass(fullpath, None ,self, dbro)
 
     def get_file_node(self, cr, fbro):
         """ Create or locate a node for a static file
@@ -121,7 +120,7 @@ class node_context(object):
         if fbro.parent_id:
             parent = self.get_dir_node(cr, fbro.parent_id)
 
-        return node_file(fbro.name, parent, self, fbro)
+        return self.node_file_class(fbro.name, parent, self, fbro)
 
 
 class node_descriptor(object):
@@ -438,22 +437,20 @@ class node_database(node_class):
         if not domain:
             domain = []
 
-        where2 = where + domain + [('type', '=', 'directory')]
+        where2 = where + domain + ['|', ('type', '=', 'directory'), \
+                    '&', ('type', '=', 'ressource'), ('ressource_parent_type_id','=',False)]
         ids = dirobj.search(cr, uid, where2, context=ctx)
         res = []
         for dirr in dirobj.browse(cr, uid, ids, context=ctx):
-            res.append(node_dir(dirr.name, self, self.context,dirr))
-
-        where2 = where + domain + [('type', '=', 'ressource'), ('ressource_parent_type_id','=',False)]
-        ids = dirobj.search(cr, uid, where2, context=ctx)
-        for dirr in dirobj.browse(cr, uid, ids, context=ctx):
-            res.append(node_res_dir(dirr.name, self, self.context, dirr))
+            klass = dirr.get_node_class(dirr, context=ctx)
+            res.append(klass(dirr.name, self, self.context,dirr))
 
         fil_obj = dirobj.pool.get('ir.attachment')
         ids = fil_obj.search(cr, uid, where, context=ctx)
         if ids:
             for fil in fil_obj.browse(cr, uid, ids, context=ctx):
-                res.append(node_file(fil.name, self, self.context, fil))
+                klass = self.context.node_file_class
+                res.append(klass(fil.name, self, self.context, fil))
         return res
 
     def _file_get(self,cr, nodename=False):
@@ -910,6 +907,7 @@ class node_res_obj(node_class):
         where = [('directory_id','=',self.dir_id) ]
         ids = cntobj.search(cr,uid,where,context=ctx)
         for content in cntobj.browse(cr, uid, ids, context=ctx):
+            # TODO: remove relic of GroupDAV
             if content.extension == '.ics': # FIXME: call the content class!
                 return ('vevent-collection','http://groupdav.org/')
         return None
@@ -944,6 +942,7 @@ class node_res_obj(node_class):
                 res_name = getattr(bo, namefield)
                 if not res_name:
                     continue
+                # TODO Revise
                 res.append(node_res_obj(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
 
 
@@ -956,9 +955,6 @@ class node_res_obj(node_class):
                 # child resources can be controlled by properly set dctx
                 res.append(node_res_dir(dirr.name,self,self.context, dirr, {'active_id': self.res_id}))
 
-
-
-
         fil_obj = dirobj.pool.get('ir.attachment')
         if self.res_find_all:
             where2 = where
@@ -967,7 +963,8 @@ class node_res_obj(node_class):
         ids = fil_obj.search(cr, uid, where3, context=ctx)
         if ids:
             for fil in fil_obj.browse(cr, uid, ids, context=ctx):
-                res.append(node_file(fil.name, self, self.context, fil))
+                klass = self.context.node_file_class
+                res.append(klass(fil.name, self, self.context, fil))
 
 
         # Get Child Ressource Directories
@@ -1038,7 +1035,8 @@ class node_res_obj(node_class):
 
         fil_id = fil_obj.create(cr, uid, val, context=ctx)
         fil = fil_obj.browse(cr, uid, fil_id, context=ctx)
-        fnode = node_file(path, self, self.context, fil)
+        klass = self.context.node_file_class
+        fnode = klass(path, self, self.context, fil)
         if data is not None:
             fnode.set_data(cr, data, fil)
         return fnode

From c52b73b587971da28020c47dcb5395a82e2b20ea Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:58 +0300
Subject: [PATCH 074/294] doc webdav: initial override of nodes.py

bzr revid: p_christ@hol.gr-20101012103858-hykw2g2ezbwaobmn
---
 addons/document_webdav/__init__.py        |  4 ++
 addons/document_webdav/dav_fs.py          |  1 -
 addons/document_webdav/document_webdav.py | 47 +++++++++++++++++++
 addons/document_webdav/nodes.py           | 57 +++++++++++++++++++++++
 4 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 addons/document_webdav/document_webdav.py
 create mode 100644 addons/document_webdav/nodes.py

diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index 69312668a74..ac417e18087 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -21,3 +21,7 @@
 
 import webdav
 import webdav_server
+
+import document_webdav
+
+#eof
\ No newline at end of file
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 8cd00da2a12..9e04673555a 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -37,7 +37,6 @@ from DAV.iface import *
 import urllib
 
 from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-from document.nodes import node_res_dir, node_res_obj
 from cache import memoize
 from tools import misc
 CACHE_SIZE=20000
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
new file mode 100644
index 00000000000..2db183e4ec6
--- /dev/null
+++ b/addons/document_webdav/document_webdav.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 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 osv, fields
+import nodes
+
+class document_davdir(osv.osv):
+    _inherit = 'document.directory'
+
+    def get_node_class(self, cr, uid, ids, dbro=None, context=None):
+        # Note: in this function, nodes come from document_webdav/nodes.py !
+        if dbro is None:
+            dbro = self.browse(cr, uid, ids, context=context)
+
+        if dbro.type == 'directory':
+            return nodes.node_dir
+        elif dbro.type == 'ressource':
+            assert not dbro.ressource_parent_type_id, \
+                "resource and parent_id at #%d: %r" % (dbro.id, dbro.ressource_parent_type_id)
+            return nodes.node_res_dir
+        else:
+            raise ValueError("dir node for %s type", dbro.type)
+
+    def _prepare_context(self, cr, uid, nctx, context):
+        nctx.node_file_class = nodes.node_file
+        return
+
+document_davdir()
+#eof
\ No newline at end of file
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
new file mode 100644
index 00000000000..6e9d85a0ae3
--- /dev/null
+++ b/addons/document_webdav/nodes.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 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 document import nodes
+
+class node_acl_mixin(object):
+    def _get_dav_owner(self, cr):
+        return self.uuser
+
+    def _get_dav_group(self, cr):
+        return self.ugroup
+        
+    def _get_dav_supported_privilege_set(self, cr):
+        return '' # TODO
+    
+    def _get_dav_current_user_privilege_set(self, cr):
+        return '' # TODO
+
+class node_dir(node_acl_mixin, nodes.node_dir):
+    DAV_PROPS = { "DAV:": ('owner', 'group', 
+                            'supported-privilege-set', 
+                            'current-user-privilege-set'), 
+                }
+    DAV_M_NS = { "DAV:" : '_get_dav',}
+    http_options = { 'DAV': ['access-control',] }
+
+
+class node_file(node_acl_mixin, nodes.node_file):
+    DAV_PROPS = { "DAV:": ('owner', 'group', 
+                            'supported-privilege-set', 
+                            'current-user-privilege-set'), 
+                }
+    DAV_M_NS = { "DAV:" : '_get_dav',}
+    http_options = { 'DAV': ['access-control', ] }
+    pass
+
+
+#eof

From 7f97ed973f1c3b7b59a291b7c9ae8b816a8d69c6 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:59 +0300
Subject: [PATCH 075/294] Caldav: put some logging around skipped data, fix
 tzinfo var.

bzr revid: p_christ@hol.gr-20101012103859-0pae3clyllabjs0y
---
 addons/caldav/calendar.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 883688c38f6..b5a62686494 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -30,6 +30,7 @@ import pytz
 import re
 import tools
 import time
+import logging
 from caldav_node import res_node_calendar
 
 try:
@@ -232,6 +233,7 @@ def map_data(cr, uid, obj, context=None):
 
 class CalDAV(object):
     __attribute__ = {}
+    _logger = logging.getLogger('document.caldav')
 
     def ical_set(self, name, value, type):
         """ set calendar Attribute
@@ -294,6 +296,7 @@ class CalDAV(object):
 
         att_data = []
         exdates = []
+        _server_tzinfo = pytz.timezone(tools.get_server_timezone())
 
         for cal_data in child.getChildren():
             if cal_data.name.lower() == 'organizer':
@@ -668,6 +671,15 @@ class Calendar(CalDAV, osv.osv):
                 val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context)
                 vals.append(val)
                 objs.append(cal_children[child.name.lower()])
+            elif child.name.upper() == 'CALSCALE':
+                if child.value.upper() != 'GREGORIAN':
+                    self._logger.warning('How do I handle %s calendars?',child.value)
+            elif child.name.upper() in ('PRODID', 'VERSION'):
+                pass
+            elif child.name.upper().startswith('X-'):
+                self._logger.debug("skipping custom node %s", child.name)
+            else:
+                self._logger.debug("skipping node %s", child.name)
         
         res = []
         for obj_name in list(set(objs)):

From 58a95955bac32c58e516ce9434ae8f4a541a96ab Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:38:59 +0300
Subject: [PATCH 076/294] Doc Webdav: implement model for DAV properties (at
 dirs)

In normative setups of WebDAV, we need to place some extra properties
on selected directories.

bzr revid: p_christ@hol.gr-20101012103859-dcwsrzylxwpzbpq1
---
 addons/document_webdav/__openerp__.py         |   4 +-
 addons/document_webdav/document_webdav.py     |  40 +++++++
 addons/document_webdav/nodes.py               | 104 ++++++++++++++++++
 .../security/ir.model.access.csv              |   4 +
 addons/document_webdav/webdav_view.xml        |  98 +++++++++++++++++
 5 files changed, 248 insertions(+), 2 deletions(-)
 create mode 100644 addons/document_webdav/security/ir.model.access.csv
 create mode 100644 addons/document_webdav/webdav_view.xml

diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 39330f68dea..4daaa8824cb 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -30,7 +30,7 @@
 
 {
 	"name" : "WebDAV server for Document Management",
-	"version" : "2.0",
+	"version" : "2.1",
 	"author" : "OpenERP SA",
 	"category" : "Generic Modules/Others",
 	"website": "http://www.openerp.com",
@@ -41,7 +41,7 @@
 """,
 	"depends" : ["base", "document"],
 	"init_xml" : [],
-	"update_xml" : [],
+	"update_xml" : ['security/ir.model.access.csv', "webdav_view.xml", ],
 	"demo_xml" : [],
 	"active": False,
 	"installable": True
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index 2db183e4ec6..fb0b62c3df6 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -25,6 +25,11 @@ import nodes
 class document_davdir(osv.osv):
     _inherit = 'document.directory'
 
+    _columns = {
+        # Placed here just for a reference
+        'dav_prop_ids': fields.one2many('document.webdav.dir.property', 'dir_id', 'DAV properties'),
+        }
+
     def get_node_class(self, cr, uid, ids, dbro=None, context=None):
         # Note: in this function, nodes come from document_webdav/nodes.py !
         if dbro is None:
@@ -43,5 +48,40 @@ class document_davdir(osv.osv):
         nctx.node_file_class = nodes.node_file
         return
 
+    def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
+        """ try to locate the node in uri,
+            Return a tuple (node_dir, remaining_path)
+        """
+        return (nodes.node_database(context=ncontext), uri)
+
 document_davdir()
+
+class dav_dir_property(osv.osv):
+    """ Arbitrary WebDAV properties, attached to document.directories.
+    
+    Some DAV properties have to be settable at directories, depending
+    on the database directory structure.
+    
+    Example would be the principal-URL.
+    
+    There _can_ be properties without a directory, which means that they
+    globally apply to all the directories (aka. collections) of the
+    present database.
+    """
+    _name = 'document.webdav.dir.property'
+    
+    _columns = {
+        'dir_id': fields.many2one('document.directory', 'Directory', required=False, select=1),
+        'namespace': fields.char('Namespace', size=127, required=True),
+        'name': fields.char('Name', size=64, required=True),
+        'value': fields.text('Value'),
+        'do_subst': fields.boolean('Substitute', required=True),
+        }
+        
+    _defaults = {
+        'do_subst': False,
+        }
+        
+dav_dir_property()
+
 #eof
\ No newline at end of file
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 6e9d85a0ae3..ce847efa48f 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -21,6 +21,8 @@
 
 
 from document import nodes
+from tools.safe_eval import safe_eval as eval
+import urllib
 
 class node_acl_mixin(object):
     def _get_dav_owner(self, cr):
@@ -35,7 +37,76 @@ class node_acl_mixin(object):
     def _get_dav_current_user_privilege_set(self, cr):
         return '' # TODO
 
+    def _get_dav_props_hlpr(self, cr, par_class, prop_model, 
+                            prop_ref_field, res_id):
+        """ Helper for dav properties, usable in subclasses
+        
+        @param par_class The parent class
+        @param prop_model The name of the orm model holding the properties
+        @param prop_ref_field The name of the field at prop_model pointing to us
+        @param res_id the id of self in the corresponing orm table, that should
+                        match prop_model.prop_ref_field
+        """
+        ret = par_class.get_dav_props(self, cr)
+        if prop_model:
+            propobj = self.context._dirobj.pool.get(prop_model)
+            uid = self.context.uid
+            ctx = self.context.context.copy()
+            ctx.update(self.dctx)
+            sdomain = [(prop_ref_field, '=', False),]
+            if res_id:
+                sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
+            prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
+            if prop_ids:
+                ret = ret.copy()
+                for pbro in propobj.browse(cr, uid, prop_ids, context=ctx):
+                    ret[pbro.namespace] = ret.get(pbro.namespace, ()) + \
+                        (pbro.name,)
+                    # Note that we cannot have properties to conditionally appear
+                    # on the context, yet.
+                
+        return ret
+
+    def _get_dav_eprop_hlpr(self, cr, ns, prop,
+                            par_class, prop_model, 
+                            prop_ref_field, res_id):
+        """ Helper for get dav eprop, usable in subclasses
+        
+        @param namespace the one to search for
+        @param name Name to search for
+        @param par_class The parent class
+        @param prop_model The name of the orm model holding the properties
+        @param prop_ref_field The name of the field at prop_model pointing to us
+        @param res_id the id of self in the corresponing orm table, that should
+                        match prop_model.prop_ref_field
+        """
+        ret = par_class.get_dav_eprop(self, cr, ns, prop)
+        if ret is not None:
+            return ret
+        if prop_model:
+            propobj = self.context._dirobj.pool.get(prop_model)
+            uid = self.context.uid
+            ctx = self.context.context.copy()
+            ctx.update(self.dctx)
+            sdomain = [(prop_ref_field, '=', False),('namespace', '=', ns), ('name','=', prop)]
+            if res_id:
+                sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
+            prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
+            if prop_ids:
+                pbro = propobj.browse(cr, uid, prop_ids[0], context=ctx)
+                val = pbro.value
+                if pbro.do_subst:
+                    if val.startswith("('") and val.endswith(")"):
+                        glbls = { 'urlquote': urllib.quote, }
+                        val = eval(val, glbls, ctx)
+                    else:
+                        val = val % ctx
+                return val
+        return None
+
 class node_dir(node_acl_mixin, nodes.node_dir):
+    """ override node_dir and add DAV functionality
+    """
     DAV_PROPS = { "DAV:": ('owner', 'group', 
                             'supported-privilege-set', 
                             'current-user-privilege-set'), 
@@ -43,6 +114,17 @@ class node_dir(node_acl_mixin, nodes.node_dir):
     DAV_M_NS = { "DAV:" : '_get_dav',}
     http_options = { 'DAV': ['access-control',] }
 
+    def get_dav_resourcetype(self, cr):
+        return ('collection', 'DAV:')
+
+    def get_dav_props(self, cr):
+        return self._get_dav_props_hlpr(cr, nodes.node_dir, 
+                'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+    def get_dav_eprop(self, cr, ns, prop):
+        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_dir,
+                'document.webdav.dir.property', 'dir_id', self.dir_id)
+
 
 class node_file(node_acl_mixin, nodes.node_file):
     DAV_PROPS = { "DAV:": ('owner', 'group', 
@@ -53,5 +135,27 @@ class node_file(node_acl_mixin, nodes.node_file):
     http_options = { 'DAV': ['access-control', ] }
     pass
 
+    def get_dav_resourcetype(self, cr):
+        return ''
+
+    def get_dav_props(self, cr):
+        return self._get_dav_props_hlpr(cr, nodes.node_dir, 
+                None, 'file_id', self.file_id)
+                #'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+    #def get_dav_eprop(self, cr, ns, prop):
+
+class node_database(nodes.node_database):
+    def get_dav_resourcetype(self, cr):
+        return ('collection', 'DAV:')
+
+    def get_dav_props(self, cr):
+        return self._get_dav_props_hlpr(cr, nodes.node_dir,
+                'document.webdav.dir.property', 'dir_id', False)
+
+    def get_dav_eprop(self, cr, ns, prop):
+        return self._get_dav_eprop_hlpr(cr, nodes.node_dir, ns, prop,
+                'document.webdav.dir.property', 'dir_id', False)
+
 
 #eof
diff --git a/addons/document_webdav/security/ir.model.access.csv b/addons/document_webdav/security/ir.model.access.csv
new file mode 100644
index 00000000000..a77304eb297
--- /dev/null
+++ b/addons/document_webdav/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_webdav_dir_property_all","webdav.dir.property all","model_document_webdav_dir_property",,1,0,0,0
+"access_webdav_dir_property_group_doc_manager","webdav.dir.property document manager","model_document_webdav_dir_property","base.group_system",1,1,1,1
+"access_webdav_dir_property_group_system","webdav.dir.property group system","model_document_webdav_dir_property","base.group_system",1,1,1,1
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
new file mode 100644
index 00000000000..2ea0bca5279
--- /dev/null
+++ b/addons/document_webdav/webdav_view.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <record model="ir.ui.view" id="view_dir_props_form">
+        <field name="name">document.webdav.dir.property.form</field>
+        <field name="model">document.webdav.dir.property</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Properties">
+		<field name="namespace"/>
+		<field name="name"/>
+		<newline />
+		<field name="dir_id" />
+		<field name="do_subst" />
+		<newline />
+		<field name="value" colspan="4" />
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_dir_props_tree">
+        <field name="name">document.webdav.dir.property.tree</field>
+        <field name="model">document.webdav.dir.property</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Properties" toolbar="1">
+		<field name="dir_id" />
+		<field name="namespace"/>
+		<field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_dir_props_filter" model="ir.ui.view">
+            <field name="name">Search View: Directory DAV properties</field>
+            <field name="model">document.webdav.dir.property</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Document storage">
+                    <field name="name" />
+                    <field name="namespace" />
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
+                        <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
+    <record model="ir.actions.act_window" id="action_dir_props_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.webdav.dir.property</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_dir_props_filter"/>
+    </record>
+   <menuitem
+        name="DAV properties for folders"
+        action="action_dir_props_form"
+        id="menu_dir_props"
+        groups="base.group_extended"
+        parent="document.menu_document_management_configuration"/>
+
+    <!-- Add the properties to the directory form -->
+    <record model="ir.ui.view" id="view_document_directory_form1">
+        <field name="name">document.directory.webdav.inherit</field>
+        <field name="model">document.directory</field>
+        <field name="inherit_id" ref="document.view_document_directory_form" />
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+	    <page string="Dynamic context" position="after">
+		<page string="WebDAV properties">
+		    <label string="These properties will be added to WebDAV requests" colspan="4" />
+		    
+		    <field name="dav_prop_ids" nolabel="1" colspan="4">
+			<tree string="Properties">
+			    <field name="namespace"/>
+			    <field name="name"/>
+			</tree>
+			<form string="Properties">
+			    <field name="namespace"/>
+			    <field name="name"/>
+			    <newline />
+			    <field name="do_subst" />
+			    <newline />
+			    <field name="value" colspan="4" />
+			</form>
+		    </field>
+		</page>
+	    </page>
+	</field>
+    </record>
+
+
+</data>
+</openerp>

From b8c7bb81a9d77623d5a2b1bcf61d414b76c65631 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:39:00 +0300
Subject: [PATCH 077/294] Doc webdav: expand tabs at __openerp__.py

bzr revid: p_christ@hol.gr-20101012103900-9jt6wn6gmy224yrj
---
 addons/document_webdav/__openerp__.py | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 4daaa8824cb..3a573dc5a2b 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,20 +29,20 @@
 ##############################################################################
 
 {
-	"name" : "WebDAV server for Document Management",
-	"version" : "2.1",
-	"author" : "OpenERP SA",
-	"category" : "Generic Modules/Others",
-	"website": "http://www.openerp.com",
-	"description": """ With this module, the WebDAV server for the documents is activated.
-	You can then use any compatible browser to remotely see the attachments of OpenObject.
+        "name" : "WebDAV server for Document Management",
+        "version" : "2.1",
+        "author" : "OpenERP SA",
+        "category" : "Generic Modules/Others",
+        "website": "http://www.openerp.com",
+        "description": """ With this module, the WebDAV server for the documents is activated.
+        You can then use any compatible browser to remotely see the attachments of OpenObject.
 
-	After installation, the webDAV server can be controlled by a [webdav] section in the server's config.
+        After installation, the webDAV server can be controlled by a [webdav] section in the server's config.
 """,
-	"depends" : ["base", "document"],
-	"init_xml" : [],
-	"update_xml" : ['security/ir.model.access.csv', "webdav_view.xml", ],
-	"demo_xml" : [],
-	"active": False,
-	"installable": True
+        "depends" : ["base", "document"],
+        "init_xml" : [],
+        "update_xml" : ['security/ir.model.access.csv', "webdav_view.xml", ],
+        "demo_xml" : [],
+        "active": False,
+        "installable": True
 }

From 333c1c6ca8c9d473ff5de2f8b02f4238202ffcb6 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:39:36 +0300
Subject: [PATCH 078/294] Doc: make sure folders are deleted after YAML tests

This will also enable the tests to run multiple times on the same db.

bzr revid: p_christ@hol.gr-20101012103936-d0e7o1b5ppu7kri5
---
 addons/document/test/document_test2.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index 34e834a5306..65312eaf10d 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -12,7 +12,7 @@
     I create a "Testing" folder where all the test data will go.
 -
     !record {model: document.directory, id: dir_tests }:
-        name: 'Testing'
+        name: 'Testing (will be deleted!)'
         parent_id: dir_root
 -
     I create an attachment into the root folder (w. empty fields, test that
@@ -52,7 +52,7 @@
     I search the testing folder for attachments.
 -
     !python {model: ir.attachment}: |
-        ids = self.search(cr, uid, [('parent_id.name','=', 'Testing'), ('name','=','Test renamed 2')])
+        ids = self.search(cr, uid, [('parent_id.name','=', 'Testing (will be deleted!)'), ('name','=','Test renamed 2')])
         assert ids == [ ref("file_test2") ], ids
 -
     I create an attachment to a 3rd resource, eg. a res.country
@@ -70,7 +70,14 @@
         ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
         assert ids == [ ref("attach_3rd")], ids
 -
-    I delete the attachment
+    I delete the attachments
 -
     !python {model: ir.attachment}: |
+     self.unlink(cr, uid, [ref('file_test2')])
      self.unlink(cr, uid, [ref('attach_3rd')])
+-
+    I delete the tests folder
+-
+    !python {model: document.directory}: |
+      self.unlink(cr, uid, [ref('dir_tests')])
+      cr.commit()

From 725bbee01d4b1adebec77d3af523eed5d9766d21 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:39:37 +0300
Subject: [PATCH 079/294] Doc ftp: Cleanup after yaml tests

bzr revid: p_christ@hol.gr-20101012103937-2jdkd7gkr1u86p48
---
 .../document_ftp/test/document_ftp_test2.yml  | 26 ++++++++++++++++++-
 .../document_ftp/test/document_ftp_test3.yml  | 10 +++++++
 .../document_ftp/test/document_ftp_test4.yml  |  8 ++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 32434962ba2..da55c353767 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -196,10 +196,15 @@
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.mkd("Test-Folder2")
+        ftp.mkd("Test-Folder3")
         # TODO move
 -
     I remove the 'Test-Folder3'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.rmd("Test-Folder3")
 -
     I check that test3.txt is removed.
 -
@@ -228,3 +233,22 @@
 -
     I move the 200 files to 'Test-Folder2'
     # TODO
+
+-
+    I delete the 200 files
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
+        # TODO speed
+        ftp.delete('test3.txt')
+        for i in range(0, 200):
+            ftp.delete('test-name%s.txt' %i)
+-
+    I remove the 'Test-Folder2'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.rmd("Test-Folder2")
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
index dbdab370b97..a3e9bd5cb40 100644
--- a/addons/document_ftp/test/document_ftp_test3.yml
+++ b/addons/document_ftp/test/document_ftp_test3.yml
@@ -80,3 +80,13 @@
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
         vuvuzela = 'b'+''.join('z' * 200)+'!'
         ftp.delete(vuvuzela)
+
+-
+    I delete the testing folders
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.rmd('Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
+        ftp.rmd('Äïêéìáóôéêüò ÖÜêåëëïò')
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index eeed4b17dda..7ff473e619b 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -118,3 +118,11 @@
 - |
     Bonus Piste:
     I create a 'Partner3' under 'all'
+-
+    I delete the Partners Testing folder
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.rmd('Partners Testing')

From 034a4166c994839eec1579802b09fcb9c4bdb039 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:39:37 +0300
Subject: [PATCH 080/294] doc ftp: unlink the YAML testing directories, too

bzr revid: p_christ@hol.gr-20101012103937-dtgq5tzthu9pdldz
---
 addons/document_ftp/test/document_ftp_test4.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index 7ff473e619b..2bb616dc1bd 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -121,8 +121,7 @@
 -
     I delete the Partners Testing folder
 -
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.rmd('Partners Testing')
+    !python {model: document.directory}: |
+        self.unlink(cr, uid, [ref('dir_tests2')])
+        self.unlink(cr, uid, [ref('dir_respart1')])
+        cr.commit()
\ No newline at end of file

From 4eab25baf3f8f334771196193e1ad5978dc85108 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:39:45 +0300
Subject: [PATCH 081/294] Document: cleanup nodes.py, let node_res_dir be
 overriden.

bzr revid: p_christ@hol.gr-20101012103945-1ziw8331h4wpvp6t
---
 addons/document/nodes.py | 46 ++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index e4be756db3d..19e50d7fe1f 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -281,6 +281,8 @@ class node_class(object):
     def get_dav_props(self, cr):
         """ If this class has special behaviour for GroupDAV etc, export
         its capabilities """
+        # This fn is placed here rather than WebDAV, because we want the
+        # baseclass methods to apply to all node subclasses
         return self.DAV_PROPS or {}
 
     def match_dav_eprop(self, cr, match, ns, prop):
@@ -460,9 +462,6 @@ class node_database(node_class):
     def _get_ttag(self,cr):
         return 'db-%s' % cr.dbname
 
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
-
 def mkdosname(company_name, default='noname'):
     """ convert a string to a dos-like name"""
     if not company_name:
@@ -502,7 +501,7 @@ class node_dir(node_database):
             for dfld in dirr.dctx_ids:
                 try:
                     self.dctx['dctx_' + dfld.field] = safe_eval(dfld.expr,dc2)
-                except Exception,e:
+                except Exception:
                     print "Cannot eval %s" % dfld.expr
                     print e
                     pass
@@ -667,12 +666,14 @@ class node_dir(node_database):
         return ret
 
 class node_res_dir(node_class):
-    """ A special sibling to node_dir, which does only contain dynamically
+    """ A folder containing dynamic folders
+        A special sibling to node_dir, which does only contain dynamically
         created folders foreach resource in the foreign model.
         All folders should be of type node_res_obj and merely behave like
         node_dirs (with limited domain).
     """
     our_type = 'collection'
+    res_obj_class = None
     def __init__(self, path, parent, context, dirr, dctx=None ):
         super(node_res_dir,self).__init__(path, parent, context)
         self.dir_id = dirr.id
@@ -779,17 +780,15 @@ class node_res_dir(node_class):
                 continue
                 # Yes! we can't do better but skip nameless records.
 
-            res.append(node_res_obj(name, self.dir_id, self, self.context, self.res_model, bo))
+            res.append(self.res_obj_class(name, self.dir_id, self, self.context, self.res_model, bo))
         return res
 
     def _get_ttag(self,cr):
         return 'rdir-%d' % self.dir_id
 
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
-
 class node_res_obj(node_class):
-    """ A special sibling to node_dir, which does only contain dynamically
+    """ A dynamically created folder.
+        A special sibling to node_dir, which does only contain dynamically
         created folders foreach resource in the foreign model.
         All folders should be of type node_res_obj and merely behave like
         node_dirs (with limited domain).
@@ -825,7 +824,7 @@ class node_res_obj(node_class):
             for fld,expr in self.dctx_dict.items():
                 try:
                     self.dctx[fld] = safe_eval(expr, dc2)
-                except Exception,e:
+                except Exception:
                     print "Cannot eval %s for %s" % (expr, fld)
                     print e
                     pass
@@ -884,6 +883,7 @@ class node_res_obj(node_class):
         return res
 
     def get_dav_props(self, cr):
+        # Deprecated! (but document_ics must be cleaned, first)
         res = {}
         cntobj = self.context._dirobj.pool.get('document.directory.content')
         uid = self.context.uid
@@ -897,6 +897,7 @@ class node_res_obj(node_class):
         return res
 
     def get_dav_eprop(self, cr, ns, prop):
+        # Deprecated!
         if ns != 'http://groupdav.org/' or prop != 'resourcetype':
             logger.warning("Who asked for %s:%s?" % (ns, prop))
             return None
@@ -943,17 +944,20 @@ class node_res_obj(node_class):
                 if not res_name:
                     continue
                 # TODO Revise
-                res.append(node_res_obj(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
+                klass = self.__class__
+                res.append(klass(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
 
 
         where2 = where + [('parent_id','=',self.dir_id) ]
         ids = dirobj.search(cr, uid, where2, context=ctx)
         for dirr in dirobj.browse(cr, uid, ids, context=ctx):
             if dirr.type == 'directory':
-                res.append(node_res_obj(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
+                klass = self.__class__
+                res.append(klass(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
             elif dirr.type == 'ressource':
                 # child resources can be controlled by properly set dctx
-                res.append(node_res_dir(dirr.name,self,self.context, dirr, {'active_id': self.res_id}))
+                klass = dirr.get_node_class(dirr, context=ctx)
+                res.append(klass(dirr.name,self,self.context, dirr, {'active_id': self.res_id}))
 
         fil_obj = dirobj.pool.get('ir.attachment')
         if self.res_find_all:
@@ -976,9 +980,11 @@ class node_res_obj(node_class):
             dirids = dirids + dirobj.search(cr,uid, where5)
             for dirr in dirobj.browse(cr, uid, dirids, context=ctx):
                 if dirr.type == 'directory' and not dirr.parent_id:
-                    res.append(node_res_obj(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
+                    klass = self.__class__
+                    res.append(klass(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
                 if dirr.type == 'ressource':
-                    res.append(node_res_dir(dirr.name, self, self.context, dirr, {'active_id': self.res_id}))
+                    klass = dirr.get_node_class(dirr, context=ctx)
+                    res.append(klass(dirr.name, self, self.context, dirr, {'active_id': self.res_id}))
         return res
 
     def create_child_collection(self, cr, objname):
@@ -1044,8 +1050,7 @@ class node_res_obj(node_class):
     def _get_ttag(self,cr):
         return 'rodir-%d-%d' % (self.dir_id, self.res_id)
 
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
+node_res_dir.res_obj_class = node_res_obj
 
 class node_file(node_class):
     our_type = 'file'
@@ -1181,9 +1186,6 @@ class node_file(node_class):
     def _get_ttag(self,cr):
         return 'file-%d' % self.file_id
 
-    def get_dav_resourcetype(self, cr):
-        return ''
-
     def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
         if ndir_node and ndir_node.context != self.context:
             raise NotImplementedError("Cannot move files between contexts")
@@ -1380,3 +1382,5 @@ class nodefd_content(StringIO, node_descriptor):
         finally:
             cr.close()
         StringIO.close(self)
+
+#eof
\ No newline at end of file

From 55d06c6ea1cce4881422378727120678525eb96a Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:15 +0300
Subject: [PATCH 082/294] Document: cleanup, remove restriction on ressource
 dirs

The same code is also called when parent_type_id exists, so the assertion
would fire.

bzr revid: p_christ@hol.gr-20101012104015-gnwvni1bx35ntyl5
---
 addons/document/document.py           |  6 +++++-
 addons/document/document_directory.py | 10 ++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 8cfc01f0988..f8b500761f9 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -28,6 +28,7 @@ import os
 import tools
 from tools.translate import _
 import nodes
+import logging
 
 DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['root_path'], 'filestore'))
 
@@ -107,7 +108,7 @@ class document_file(osv.osv):
         'parent_id': __get_def_directory
     }
     _sql_constraints = [
-        ('filename_uniq', 'unique (name,parent_id,res_id,res_model)', 'The file name must be unique !')
+        # filename_uniq is not possible in pure SQL
     ]
     def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
         name = vals.get('name', False)
@@ -260,6 +261,9 @@ class document_file(osv.osv):
                 r = stor.prepare_unlink(cr, uid, storage_id, f)
                 if r:
                     unres.append(r)
+            else:
+                logging.getLogger('document').warning("Unlinking attachment #%s %s that has no storage",
+                                                f.id, f.name)
         res = super(document_file, self).unlink(cr, uid, ids, context)
         stor.do_unlink(cr, uid, unres)
         return res
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 0c208ad04b7..95099af81a7 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -187,8 +187,6 @@ class document_directory(osv.osv):
         if dbro.type == 'directory':
             return nodes.node_dir
         elif dbro.type == 'ressource':
-            assert not dbro.ressource_parent_type_id, \
-                "resource and parent_id at #%d: %r" % (dbro.id, dbro.ressource_parent_type_id)
             return nodes.node_res_dir
         else:
             raise ValueError("dir node for %s type", dbro.type)
@@ -248,6 +246,7 @@ class document_directory(osv.osv):
                     name=directory.name
                 if not parent_id:
                     parent_id=directory.parent_id and directory.parent_id.id or False
+                # TODO fix algo
                 if not ressource_parent_type_id:
                     ressource_parent_type_id=directory.ressource_parent_type_id and directory.ressource_parent_type_id.id or False
                 if not ressource_id:
@@ -268,8 +267,11 @@ class document_directory(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if not self._check_duplication(cr, uid, vals):
             raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!'))
-        if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) :
-            raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!'))
+        newname = vals.get('name',False)
+        if newname:
+            for illeg in ('/', '@', '$', '#'):
+                if illeg in newname:
+                    raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!'))
         return super(document_directory,self).create(cr, uid, vals, context)
 
     # TODO def unlink(...

From d7f96fd603a50b4ca91a09828c0db2586c1af5d3 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:19 +0300
Subject: [PATCH 083/294] Doc webdav: Fix, implement node_res_obj for latest
 document.

bzr revid: p_christ@hol.gr-20101012104019-nhoqnvgpr9ecjjky
---
 addons/document_webdav/document_webdav.py |  2 --
 addons/document_webdav/nodes.py           | 41 +++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index fb0b62c3df6..6cc565016ea 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -38,8 +38,6 @@ class document_davdir(osv.osv):
         if dbro.type == 'directory':
             return nodes.node_dir
         elif dbro.type == 'ressource':
-            assert not dbro.ressource_parent_type_id, \
-                "resource and parent_id at #%d: %r" % (dbro.id, dbro.ressource_parent_type_id)
             return nodes.node_res_dir
         else:
             raise ValueError("dir node for %s type", dbro.type)
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index ce847efa48f..b9483b7b221 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -157,5 +157,46 @@ class node_database(nodes.node_database):
         return self._get_dav_eprop_hlpr(cr, nodes.node_dir, ns, prop,
                 'document.webdav.dir.property', 'dir_id', False)
 
+class node_res_obj(node_acl_mixin, nodes.node_res_obj):
+    DAV_PROPS = { "DAV:": ('owner', 'group', 
+                            'supported-privilege-set', 
+                            'current-user-privilege-set'), 
+                }
+    DAV_M_NS = { "DAV:" : '_get_dav',}
+    http_options = { 'DAV': ['access-control',] }
+
+    def get_dav_resourcetype(self, cr):
+        return ('collection', 'DAV:')
+
+    def get_dav_props(self, cr):
+        return self._get_dav_props_hlpr(cr, nodes.node_res_obj, 
+                'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+    def get_dav_eprop(self, cr, ns, prop):
+        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_obj,
+                'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+
+class node_res_dir(node_acl_mixin, nodes.node_res_dir):
+    DAV_PROPS = { "DAV:": ('owner', 'group', 
+                            'supported-privilege-set', 
+                            'current-user-privilege-set'), 
+                }
+    DAV_M_NS = { "DAV:" : '_get_dav',}
+    http_options = { 'DAV': ['access-control',] }
+    res_obj_class = node_res_obj
+
+    def get_dav_resourcetype(self, cr):
+        return ('collection', 'DAV:')
+
+    def get_dav_props(self, cr):
+        return self._get_dav_props_hlpr(cr, nodes.node_res_dir, 
+                'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+    def get_dav_eprop(self, cr, ns, prop):
+        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_dir,
+                'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+
 
 #eof

From 1fe7eb3e8f1454b5846e4e0f432d513813030300 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:19 +0300
Subject: [PATCH 084/294] Doc: allow override of dynamic foleders' class

bzr revid: p_christ@hol.gr-20101012104019-ci6z0vb9fce7tfiw
---
 addons/document/document_directory.py | 7 +++++--
 addons/document/nodes.py              | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 95099af81a7..30507f1cd2c 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -175,7 +175,7 @@ class document_directory(osv.osv):
             
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
-    def get_node_class(self, cr, uid, ids, dbro=None, context=None):
+    def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
         """Retrieve the class of nodes for this directory
            
            This function can be overriden by inherited classes ;)
@@ -184,7 +184,10 @@ class document_directory(osv.osv):
         if dbro is None:
             dbro = self.browse(cr, uid, ids, context=context)
 
-        if dbro.type == 'directory':
+        if dynamic:
+            assert dbro.type == 'directory'
+            return nodes.node_res_obj
+        elif dbro.type == 'directory':
             return nodes.node_dir
         elif dbro.type == 'ressource':
             return nodes.node_res_dir
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 19e50d7fe1f..46674b61caa 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -72,6 +72,7 @@ class node_context(object):
         self.context = context
         self._dirobj = pooler.get_pool(cr.dbname).get('document.directory')
         self.node_file_class = node_file
+        self.extra_ctx = {} # Extra keys for context, that do _not_ trigger inequality
         assert self._dirobj
         self._dirobj._prepare_context(cr, uid, self, context=context)
         self.rootdir = False #self._dirobj._get_root_directory(cr,uid,context)
@@ -944,7 +945,7 @@ class node_res_obj(node_class):
                 if not res_name:
                     continue
                 # TODO Revise
-                klass = self.__class__
+                klass = directory.get_node_class(directory, dynamic=True, context=ctx)
                 res.append(klass(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
 
 
@@ -952,7 +953,7 @@ class node_res_obj(node_class):
         ids = dirobj.search(cr, uid, where2, context=ctx)
         for dirr in dirobj.browse(cr, uid, ids, context=ctx):
             if dirr.type == 'directory':
-                klass = self.__class__
+                klass = dirr.get_node_class(dirr, dynamic=True, context=ctx)
                 res.append(klass(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
             elif dirr.type == 'ressource':
                 # child resources can be controlled by properly set dctx
@@ -980,7 +981,7 @@ class node_res_obj(node_class):
             dirids = dirids + dirobj.search(cr,uid, where5)
             for dirr in dirobj.browse(cr, uid, dirids, context=ctx):
                 if dirr.type == 'directory' and not dirr.parent_id:
-                    klass = self.__class__
+                    klass = dirr.get_node_class(dirr, dynamic=True, context=ctx)
                     res.append(klass(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
                 if dirr.type == 'ressource':
                     klass = dirr.get_node_class(dirr, context=ctx)

From f842ccc1ec3beba28238f5027d2c80d23c98e335 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:20 +0300
Subject: [PATCH 085/294] Doc webdav: context for DAV properties, dynamic
 folders

bzr revid: p_christ@hol.gr-20101012104020-izmzgobc2kbxb2cj
---
 addons/document_webdav/document_webdav.py | 16 +++++++++++++--
 addons/document_webdav/nodes.py           | 24 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index 6cc565016ea..28b70c8d7e4 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -21,6 +21,7 @@
 
 from osv import osv, fields
 import nodes
+from tools import config
 
 class document_davdir(osv.osv):
     _inherit = 'document.directory'
@@ -30,12 +31,15 @@ class document_davdir(osv.osv):
         'dav_prop_ids': fields.one2many('document.webdav.dir.property', 'dir_id', 'DAV properties'),
         }
 
-    def get_node_class(self, cr, uid, ids, dbro=None, context=None):
+    def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
         # Note: in this function, nodes come from document_webdav/nodes.py !
         if dbro is None:
             dbro = self.browse(cr, uid, ids, context=context)
 
-        if dbro.type == 'directory':
+        if dynamic:
+            assert dbro.type == 'directory'
+            return nodes.node_res_obj
+        elif dbro.type == 'directory':
             return nodes.node_dir
         elif dbro.type == 'ressource':
             return nodes.node_res_dir
@@ -44,6 +48,14 @@ class document_davdir(osv.osv):
 
     def _prepare_context(self, cr, uid, nctx, context):
         nctx.node_file_class = nodes.node_file
+        # We can fill some more fields, but avoid any expensive function
+        # that might be not worth preparing.
+        nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav')
+        usr_obj = self.pool.get('res.users')
+        res = usr_obj.read(cr, uid, uid, ['login'])
+        if res:
+            nctx.extra_ctx['username'] = res['login']
+        # TODO group
         return
 
     def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index b9483b7b221..0a45b227095 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -24,6 +24,19 @@ from document import nodes
 from tools.safe_eval import safe_eval as eval
 import urllib
 
+def dict_filter(srcdic, keys, res=None):
+    ''' Return a copy of srcdic that has only keys set.
+    If any of keys are missing from srcdic, the result won't have them, 
+    either.
+    @param res If given, result will be updated there, instead of a new dict.
+    '''
+    if res is None:
+        res = {}
+    for k in keys:
+        if k in srcdic:
+            res[k] = srcdic[k]
+    return res
+    
 class node_acl_mixin(object):
     def _get_dav_owner(self, cr):
         return self.uuser
@@ -53,6 +66,9 @@ class node_acl_mixin(object):
             uid = self.context.uid
             ctx = self.context.context.copy()
             ctx.update(self.dctx)
+            # Not really needed because we don't do eval here:
+            # ctx.update({'uid': uid, 'dbname': self.context.dbname })
+            # dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
             sdomain = [(prop_ref_field, '=', False),]
             if res_id:
                 sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
@@ -88,6 +104,9 @@ class node_acl_mixin(object):
             uid = self.context.uid
             ctx = self.context.context.copy()
             ctx.update(self.dctx)
+            ctx.update({'uid': uid, 'dbname': self.context.dbname })
+            ctx['node_classname'] = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
+            dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
             sdomain = [(prop_ref_field, '=', False),('namespace', '=', ns), ('name','=', prop)]
             if res_id:
                 sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
@@ -197,6 +216,11 @@ class node_res_dir(node_acl_mixin, nodes.node_res_dir):
         return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_dir,
                 'document.webdav.dir.property', 'dir_id', self.dir_id)
 
+# Some copies, so that this module can replace 'from document import nodes'
+get_node_context = nodes.get_node_context
+node_context = nodes.node_context
+node_class = nodes.node_class
+node_descriptor = nodes.node_descriptor
 
 
 #eof

From f1ccc3a4e203fc255cf1450684b9f601a2ac7027 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:26 +0300
Subject: [PATCH 086/294] CalDAV: port to improve WebDAV API, support dynamic
 collections.

bzr revid: p_christ@hol.gr-20101012104026-qju5goq0a42m01dq
---
 addons/caldav/caldav_node.py         | 208 +++++++++++++++------------
 addons/caldav/calendar.py            |   5 +-
 addons/caldav/calendar_collection.py |  30 ++--
 addons/caldav/doc/Path discovery.rst |  43 ++++++
 4 files changed, 184 insertions(+), 102 deletions(-)
 create mode 100644 addons/caldav/doc/Path discovery.rst

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 11f720bdcab..27f92943d07 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -20,41 +20,41 @@
 ##############################################################################
 
 import time
-from document import nodes
+from document_webdav import nodes
 import StringIO
 
-class node_database(nodes.node_database):
-    def _child_get(self, cr, name=False, parent_id=False, domain=None):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        if not domain:
-            domain = []
-        domain2 = domain + [('calendar_collection','=', False)]
-        res = super(node_database, self)._child_get(cr, name=name, parent_id=parent_id, domain=domain2)
-        where = [('parent_id','=',parent_id)]
-        domain2 = domain + [('calendar_collection','=', True)]
-        if name:
-            where.append(('name','=',name))
-        if domain2:
-            where += domain2
+def dict_merge(*dicts):
+    """ Return a dict with all values of dicts
+    """
+    res = {}
+    for d in dicts:
+        res.update(d)
+    return res
 
-        where2 = where + [('type', '=', 'directory')]
-        ids = dirobj.search(cr, uid, where2, context=ctx)
-        for dirr in dirobj.browse(cr,uid,ids,context=ctx):
-            res.append(node_calendar_collection(dirr.name,self,self.context,dirr))
-        return res
+def dict_merge2(*dicts):
+    """ Return a dict with all values of dicts.
+        If some key appears twice and contains iterable objects, the values
+        are merged (instead of overwritten).
+    """
+    res = {}
+    for d in dicts:
+        for k in d.keys():
+            if k in res and isinstance(res[k], (list, tuple)):
+                res[k] = res[k] + d[k]
+            else:
+                res[k] = d[k]
+    return res
+
+# Assuming that we have set global properties right, we mark *all* 
+# directories as having calendar-access.
+nodes.node_dir.http_options = dict_merge2(nodes.node_dir.http_options,
+            { 'DAV': ['calendar-access',] })
 
 class node_calendar_collection(nodes.node_dir):
-    DAV_PROPS = {
-            "http://calendarserver.org/ns/" : ('getctag',),
-            }
-    DAV_M_NS = {
-           "http://calendarserver.org/ns/" : '_get_dav',
-           }
-
-    http_options = { 'DAV': ['calendar-access'] }
+    DAV_PROPS = dict_merge2(nodes.node_dir.DAV_PROPS,
+            { "http://calendarserver.org/ns/" : ('getctag',), } )
+    DAV_M_NS = dict_merge2(nodes.node_dir.DAV_M_NS,
+            { "http://calendarserver.org/ns/" : '_get_dav', } )
 
     def _file_get(self,cr, nodename=False):
         return []
@@ -96,26 +96,77 @@ class node_calendar_collection(nodes.node_dir):
         result = self.get_etag(cr)
         return str(result)
 
+class node_calendar_res_col(nodes.node_res_obj):
+    """ Calendar collection, as a dynamically created node
+    
+    This class shall be used instead of node_calendar_collection, when the
+    node is under dynamic ones.
+    """
+    DAV_PROPS = dict_merge2(nodes.node_res_obj.DAV_PROPS,
+            { "http://calendarserver.org/ns/" : ('getctag',), } )
+    DAV_M_NS = dict_merge2(nodes.node_res_obj.DAV_M_NS,
+            { "http://calendarserver.org/ns/" : '_get_dav', } )
+
+    def _file_get(self,cr, nodename=False):
+        return []
+
+    def _child_get(self, cr, name=False, parent_id=False, domain=None):
+        dirobj = self.context._dirobj
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        where = [('collection_id','=',self.dir_id)]
+        ext = False
+        if name and name.endswith('.ics'):
+            name = name[:-4]
+            ext = True
+        if name:
+            where.append(('name','=',name))
+        if not domain:
+            domain = []
+        where = where + domain
+        fil_obj = dirobj.pool.get('basic.calendar')
+        ids = fil_obj.search(cr,uid,where,context=ctx)
+        res = []
+        # TODO: shall we use any of our dynamic information??
+        for cal in fil_obj.browse(cr, uid, ids, context=ctx):
+            if (not name) or not ext:
+                res.append(node_calendar(cal.name, self, self.context, cal))
+            if (not name) or ext:
+                res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
+            # May be both of them!
+        return res
+
+    def _get_ttag(self, cr):
+        return 'calen-dir-%d' % self.dir_id
+
+    def _get_dav_getctag(self, cr):
+        result = self.get_etag(cr)
+        return str(result)
+
 class node_calendar(nodes.node_class):
     our_type = 'collection'
     DAV_PROPS = {
-            "DAV:": ('principal-collection-set'),
-            "http://cal.me.com/_namespace/" : ('user-state'),
+            "olDAV:": ('principal-collection-set',
+                    'principal-URL',
+                    'supported-report-set'),
+            # "http://cal.me.com/_namespace/" : ('user-state',),
             "http://calendarserver.org/ns/" : (
-                    'dropbox-home-URL',
-                    'notification-URL',
+                    # 'dropbox-home-URL',
+                    # 'notification-URL',
                     'getctag',),
             'http://groupdav.org/': ('resourcetype',),
             "urn:ietf:params:xml:ns:caldav" : (
                     'calendar-description',
                     'calendar-data',
-                    'calendar-home-set',
-                    'calendar-user-address-set',
-                    'schedule-inbox-URL',
-                    'schedule-outbox-URL',)}
+                    # 'calendar-home-set',
+                    # 'calendar-user-address-set',
+                    # 'schedule-inbox-URL',
+                    #'schedule-outbox-URL',
+                    )}
     DAV_M_NS = {
            "DAV:" : '_get_dav',
-           "http://cal.me.com/_namespace/": '_get_dav', 
+           # "http://cal.me.com/_namespace/": '_get_dav', 
            'http://groupdav.org/': '_get_gdav',
            "http://calendarserver.org/ns/" : '_get_dav',
            "urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
@@ -136,7 +187,7 @@ class node_calendar(nodes.node_class):
         result = self._get_ttag(cr) + ':' + str(time.time())
         return str(result)
 
-    def _get_dav_dropbox_home_URL(self, cr):
+    def _get_dav_dropbox_home_URL(self, cr): #Depr
         import urllib
         uid = self.context.uid
         ctx = self.context.context.copy()
@@ -147,7 +198,7 @@ class node_calendar(nodes.node_class):
         url = urllib.quote('/%s/%s' % (cr.dbname, res))
         return url
     
-    def _get_dav_notification_URL(self, cr):
+    def _get_dav_notification_URL(self, cr): # Depr
         import urllib
         uid = self.context.uid
         ctx = self.context.context.copy()
@@ -160,8 +211,7 @@ class node_calendar(nodes.node_class):
 
     def _get_dav_user_state(self, cr):
         #TODO
-        return True
-
+        return 'online'
 
     def get_dav_resourcetype(self, cr):
         res = [ ('collection', 'DAV:'),
@@ -269,6 +319,8 @@ class node_calendar(nodes.node_class):
             fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
                     domain=[('id','=',res[0])], context=ctx)
             return fnodes[0]
+        # If we reach this line, it means that we couldn't import any useful
+        # (and matching type vs. our node kind) data from the iCal content.
         return None
 
 
@@ -287,7 +339,6 @@ class node_calendar(nodes.node_class):
     def rmcol(self, cr):
         return False
 
-    
     def _get_caldav_calendar_data(self, cr):
         res = []
         for child in self.children(cr):
@@ -299,11 +350,13 @@ class node_calendar(nodes.node_class):
         calendar_obj = self.context._dirobj.pool.get('basic.calendar')
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        return calendar.description
+        try:
+            calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+            return calendar.description or calendar.name
+        except Exception, e:
+            return None
 
     def _get_dav_principal_collection_set(self, cr):
-        import xml
         import urllib
         uid = self.context.uid
         ctx = self.context.context.copy()
@@ -311,74 +364,45 @@ class node_calendar(nodes.node_class):
         calendar_obj = self.context._dirobj.pool.get('basic.calendar')
         calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
         res = '%s/%s' %(calendar.collection_id.name, calendar.name)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
-        href.appendChild(huri)
-        return href
-
-    def _get_caldav_calendar_home_set(self, cr):
-        import xml.dom.minidom
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, calendar.collection_id.name)))
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        href.appendChild(huri)
-        return href
+        return ('href', 'DAV:', urllib.quote('/%s/%s' % (cr.dbname, res)))
 
     def _get_caldav_calendar_user_address_set(self, cr):
-        import xml.dom.minidom
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
         user_obj = self.context._dirobj.pool.get('res.users')
         user = user_obj.browse(cr, uid, uid, context=ctx)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        huri = doc.createTextNode('MAILTO:' + str(user.email) or str(user.name))
-        href.appendChild(huri)
-        return href
+        return ('href', 'DAV:', 'MAILTO:' + str(user.email) or str(user.name))
 
     def _get_caldav_schedule_outbox_URL(self, cr):
         return self._get_caldav_schedule_inbox_URL(cr)
 
     def _get_caldav_schedule_inbox_URL(self, cr):
-        import xml.dom.minidom
         import urllib
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
         calendar_obj = self.context._dirobj.pool.get('basic.calendar')
         calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
-        href.appendChild(huri)
-        return href
+        res = '/webdav/%s/%s/%s' %(cr.dbname, calendar.collection_id.name, calendar.name)
+        
+        return ('href', 'DAV:', res)
 
+    def _get_dav_supported_report_set(self, cr):
+        return '' # TODO
 
 class res_node_calendar(nodes.node_class):
     our_type = 'file'
     DAV_PROPS = {
-            "http://calendarserver.org/ns/" : ('getctag'),
+            "http://calendarserver.org/ns/" : ('getctag',),
             "urn:ietf:params:xml:ns:caldav" : (
                     'calendar-description',
                     'calendar-data',
-                    'calendar-home-set',
-                    'calendar-user-address-set',
-                    'schedule-inbox-URL',
-                    'schedule-outbox-URL',)}
+                    # 'calendar-home-set',
+                    # 'calendar-user-address-set',
+                    #'schedule-inbox-URL',
+                    # 'schedule-outbox-URL',
+                    )}
     DAV_M_NS = {
            "http://calendarserver.org/ns/" : '_get_dav',
            "urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
@@ -414,6 +438,7 @@ class res_node_calendar(nodes.node_class):
         uid = self.context.uid
         calendar_obj = self.context._dirobj.pool.get('basic.calendar')
         context = self.context.context.copy()
+        context.update(self.dctx)
         context.update({'model': self.model, 'res_id':self.res_id})
         res = calendar_obj.export_cal(cr, uid, [self.calendar_id], context=context)
         return res
@@ -426,8 +451,11 @@ class res_node_calendar(nodes.node_class):
 
     def set_data(self, cr, data, fil_obj = None):
         uid = self.context.uid
+        context = self.context.context.copy()
+        context.update(self.dctx)
+        context.update({'model': self.model, 'res_id':self.res_id})
         calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        res =  calendar_obj.import_cal(cr, uid, data, self.calendar_id)
+        res =  calendar_obj.import_cal(cr, uid, data, self.calendar_id, context=context)
         return res
 
     def _get_ttag(self,cr):
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index b5a62686494..2f7d978b5a6 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -32,6 +32,7 @@ import tools
 import time
 import logging
 from caldav_node import res_node_calendar
+from tools.safe_eval import safe_eval as eval
 
 try:
     import vobject
@@ -595,7 +596,7 @@ class Calendar(CalDAV, osv.osv):
                     continue
                 if line.name in ('valarm', 'attendee'):
                     continue
-                line_domain = eval(line.domain or '[]')
+                line_domain = eval(line.domain or '[]', context)
                 line_domain += domain
                 if ctx_res_id:
                     line_domain += [('id','=',ctx_res_id)]
@@ -627,7 +628,7 @@ class Calendar(CalDAV, osv.osv):
                     continue
                 if line.name in ('valarm', 'attendee'):
                     continue
-                domain = eval(line.domain or '[]')
+                domain = eval(line.domain or '[]', context)
                 if ctx_res_id:
                     domain += [('id','=',ctx_res_id)]
                 mod_obj = self.pool.get(line.object_id.model)
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 8dd4ff053c9..52fe698647c 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -18,9 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import osv, fields
 from tools.translate import _
 import caldav_node
+import logging
 
 class calendar_collection(osv.osv):
     _inherit = 'document.directory' 
@@ -30,7 +32,8 @@ class calendar_collection(osv.osv):
     }
     _default = {
         'calendar_collection' : False,
-    }   
+    }
+    
     def _get_root_calendar_directory(self, cr, uid, context=None):
         objid = self.pool.get('ir.model.data')
         try:
@@ -40,18 +43,25 @@ class calendar_collection(osv.osv):
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             root_cal_dir = self.browse(cr,uid, root_id, context=context) 
             return root_cal_dir.name
-        except Exception, e:
-            import netsvc
-            logger = netsvc.Logger()
-            logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set root directory for Calendars:'+ str(e))
+        except Exception:
+            logger = logging.getLogger('document')
+            logger.warning('Cannot set root directory for Calendars:', exc_info=True)
             return False
         return False
 
-    def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
-        """ try to locate the node in uri,
-            Return a tuple (node_dir, remaining_path)
-        """
-        return (caldav_node.node_database(context=ncontext), uri)
+    def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
+        if dbro is None:
+            dbro = self.browse(cr, uid, ids, context=context)
+
+        if dbro.calendar_collection:
+            if dynamic:
+                return caldav_node.node_calendar_res_col
+            else:
+                return caldav_node.node_calendar_collection
+        else:
+            return super(calendar_collection, self).\
+                    get_node_class(cr, uid, ids, dbro=dbro,dynamic=dynamic, 
+                                    context=context)
 
     def get_description(self, cr, uid, ids, context=None):
         #TODO : return description of all calendars
diff --git a/addons/caldav/doc/Path discovery.rst b/addons/caldav/doc/Path discovery.rst
new file mode 100644
index 00000000000..d2d434b5fb6
--- /dev/null
+++ b/addons/caldav/doc/Path discovery.rst	
@@ -0,0 +1,43 @@
+===============================
+Discovery of calendar resources
+===============================
+
+1. Srv record
+--------------
+Calendar server and port should be advertised by a DNS _srv record. 
+Although this is beyond the capabilities of the OpenERP server, an
+example setup is listed below:
+    -- TODO --
+    
+DNS -> http://our-host-ip:port/
+
+2. Well-known uris
+-------------------
+The OpenERP server may have the 'well-known URIs' servlet activated,
+which means that it will advertise its main database and the correct
+location of the main CalDAV resource.
+http://our-host-ip:port/.well-known/caldav -> http://our-host-ip:port/webdav/dbname/calendars/
+
+
+3. Caldav collection
+---------------------
+The CalDAV "collection" is not necessarily a calendar or a folder just
+containing calendars under it. It is a DAV resource (aka folder) which
+has special DAV properties, so that clients are redirected to the right
+urls (like per-user calendars etc.).
+
+http://our-host-ip:port/webdav/dbname/calendars/ -> http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/
+
+4. Calendar home for user
+--------------------------
+There can be one dynamic folder per user, which will in turn contain the calendars
+
+http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/ ->
+http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/[Meetings, Tasks]
+
+5. Calendars 
+--------------
+Each calendar will contain the resource nodes:
+  .../c/Meetings/ -> .../c/Meetings/123.ics
+
+Principal url

From f4bc8371430aa5f0fec2a1d52fda558e6ba0e3d0 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:29 +0300
Subject: [PATCH 087/294] Doc webdav: enhance the property notation structure

When DAV-aware nodes want to return properties, they might need to
have xml attributes or single instances of sub-elements.

Example:
	return ('aprop', 'D:', ('foo', 'D:', None, { 'name': 'bar'}))
will result in xml:
	<D:prop>
	    <D:aprop><D:foo name="bar"/></D:aprop>
	</D:prop>

bzr revid: p_christ@hol.gr-20101012104029-gq6hhjki4i52n8qh
---
 addons/document_webdav/webdav.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 6b24198e320..86fd8cd9e71 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -67,6 +67,8 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
                     string: text node
                     tuple ('elem', 'ns') for empty sub-node <ns:elem />
                     tuple ('elem', 'ns', sub-elems) for sub-node with elements
+                    tuple ('elem', 'ns', sub-elems, {attrs}) for sub-node with 
+                            optional elements and attributes
                     list, of above tuples
         """
         if ns == 'DAV:':
@@ -108,14 +110,18 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
             ve=doc.createElement(ns_prefix+v[0])
             if need_ns:
                 ve.setAttribute("xmlns:ns"+str(nsnum), v[1])
-            if len(v) > 2:
-                if isinstance(v[2], list):
+            if len(v) > 2 and v[2] is not None:
+                if isinstance(v[2], (list, tuple)):
                     # support nested elements like:
                     # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
                     _prop_elem_child(ve, v[1], v[2], ns_prefix)
                 else:
                     vt =doc.createTextNode(tools.ustr(v[2]))
                     ve.appendChild(vt)
+            if len(v) > 3 and v[3]:
+                assert isinstance(v[3], dict)
+                for ak, av in v[3].items():
+                    ve.setAttribute(ak, av)
             pnode.appendChild(ve)
         else:
             ve=doc.createTextNode(tools.ustr(v))

From 7882ef46faea31510516a133b5e1dacc39938d18 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:30 +0300
Subject: [PATCH 088/294] Caldav node: implement more properties, cleanup old
 ones.

bzr revid: p_christ@hol.gr-20101012104030-o7l7zscrnx4t0fc7
---
 addons/caldav/caldav_node.py | 114 +++++++++++++----------------------
 1 file changed, 42 insertions(+), 72 deletions(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 27f92943d07..f95af09714c 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -23,6 +23,8 @@ import time
 from document_webdav import nodes
 import StringIO
 
+# TODO: implement DAV-aware errors, inherit from IOError
+
 def dict_merge(*dicts):
     """ Return a dict with all values of dicts
     """
@@ -147,23 +149,24 @@ class node_calendar_res_col(nodes.node_res_obj):
 class node_calendar(nodes.node_class):
     our_type = 'collection'
     DAV_PROPS = {
-            "olDAV:": ('principal-collection-set',
-                    'principal-URL',
-                    'supported-report-set'),
+            "DAV:": ('supported-report-set',),
             # "http://cal.me.com/_namespace/" : ('user-state',),
-            "http://calendarserver.org/ns/" : (
-                    # 'dropbox-home-URL',
-                    # 'notification-URL',
-                    'getctag',),
+            "http://calendarserver.org/ns/" : ( 'getctag',),
             'http://groupdav.org/': ('resourcetype',),
             "urn:ietf:params:xml:ns:caldav" : (
-                    'calendar-description',
-                    'calendar-data',
-                    # 'calendar-home-set',
-                    # 'calendar-user-address-set',
-                    # 'schedule-inbox-URL',
-                    #'schedule-outbox-URL',
+                    'calendar-description', 
+                    'supported-calendar-component-set',
                     )}
+    DAV_PROPS_HIDDEN = {
+            "urn:ietf:params:xml:ns:caldav" : (
+                    'calendar-data',
+                    'calendar-timezone',
+                    'supported-calendar-data',
+                    'max-resource-size',
+                    'min-date-time',
+                    'max-date-time',
+                    )}
+
     DAV_M_NS = {
            "DAV:" : '_get_dav',
            # "http://cal.me.com/_namespace/": '_get_dav', 
@@ -187,28 +190,6 @@ class node_calendar(nodes.node_class):
         result = self._get_ttag(cr) + ':' + str(time.time())
         return str(result)
 
-    def _get_dav_dropbox_home_URL(self, cr): #Depr
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
-        url = urllib.quote('/%s/%s' % (cr.dbname, res))
-        return url
-    
-    def _get_dav_notification_URL(self, cr): # Depr
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
-        url = urllib.quote('/%s/%s' % (cr.dbname, res))
-        return url
-
     def _get_dav_user_state(self, cr):
         #TODO
         return 'online'
@@ -356,40 +337,33 @@ class node_calendar(nodes.node_class):
         except Exception, e:
             return None
 
-    def _get_dav_principal_collection_set(self, cr):
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
-        return ('href', 'DAV:', urllib.quote('/%s/%s' % (cr.dbname, res)))
-
-    def _get_caldav_calendar_user_address_set(self, cr):
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        user_obj = self.context._dirobj.pool.get('res.users')
-        user = user_obj.browse(cr, uid, uid, context=ctx)
-        return ('href', 'DAV:', 'MAILTO:' + str(user.email) or str(user.name))
-
-    def _get_caldav_schedule_outbox_URL(self, cr):
-        return self._get_caldav_schedule_inbox_URL(cr)
-
-    def _get_caldav_schedule_inbox_URL(self, cr):
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        res = '/webdav/%s/%s/%s' %(cr.dbname, calendar.collection_id.name, calendar.name)
-        
-        return ('href', 'DAV:', res)
-
     def _get_dav_supported_report_set(self, cr):
-        return '' # TODO
+        
+        return ('supported-report', 'DAV:', 
+                    ('report','DAV:',
+                            ('principal-match','DAV:')
+                    )
+                )
+
+    def _get_caldav_supported_calendar_component_set(self, cr):
+        return ('comp', 'urn:ietf:params:xml:ns:caldav', None,
+                    {'name': self.cal_type.upper()} )
+        
+    def _get_caldav_calendar_timezone(self, cr):
+        return None #TODO
+        
+    def _get_caldav_supported_calendar_data(self, cr):
+        return ('calendar-data', 'urn:ietf:params:xml:ns:caldav', None,
+                    {'content-type': "text/calendar", 'version': "2.0" } )
+        
+    def _get_caldav_max_resource_size(self, cr):
+        return 65535
+
+    def _get_caldav_min_date_time(self, cr):
+        return "19700101T000000Z"
+
+    def _get_caldav_max_date_time(self, cr):
+        return "21001231T235959Z" # I will be dead by then
 
 class res_node_calendar(nodes.node_class):
     our_type = 'file'
@@ -398,10 +372,6 @@ class res_node_calendar(nodes.node_class):
             "urn:ietf:params:xml:ns:caldav" : (
                     'calendar-description',
                     'calendar-data',
-                    # 'calendar-home-set',
-                    # 'calendar-user-address-set',
-                    #'schedule-inbox-URL',
-                    # 'schedule-outbox-URL',
                     )}
     DAV_M_NS = {
            "http://calendarserver.org/ns/" : '_get_dav',

From f5117544fa0a0c18d63bbe8acba8882d13c39bb7 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:30 +0300
Subject: [PATCH 089/294] caldav: instrument the get_domain() filter function

.. although, at the end of the day, this API cannot work since it only
operates on one level of depth.

bzr revid: p_christ@hol.gr-20101012104030-xwjdda74uhdl37y1
---
 addons/caldav/caldav_node.py | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index f95af09714c..510e43eabd0 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -21,6 +21,7 @@
 
 import time
 from document_webdav import nodes
+import logging
 import StringIO
 
 # TODO: implement DAV-aware errors, inherit from IOError
@@ -205,6 +206,7 @@ class node_calendar(nodes.node_class):
         res = []
         if not filters:
             return res
+        _log = logging.getLogger('caldav.query')
         if filters.localName == 'calendar-query':
             res = []
             for filter_child in filters.childNodes:
@@ -220,10 +222,26 @@ class node_calendar(nodes.node_class):
                                     if vevent_filter.nodeType == vevent_filter.TEXT_NODE:
                                         continue
                                     if vevent_filter.localName == 'comp-filter':
-                                        if vevent_filter.getAttribute('name') == 'VEVENT':
-                                            res = [('type','=','vevent')]
-                                        if vevent_filter.getAttribute('name') == 'VTODO':
-                                            res = [('type','=','vtodo')]
+                                        if vevent_filter.getAttribute('name'):
+                                            res = [('type','=',vevent_filter.getAttribute('name').lower() )]
+                                            
+                                        for cfe in vevent_filter.childNodes:
+                                            if cfe.localName == 'time-range':
+                                                if cfe.getAttribute('start'):
+                                                    _log.warning("Ignore start.. ")
+                                                    # No, it won't work in this API
+                                                    #val = cfe.getAttribute('start')
+                                                    #res += [('dtstart','=', cfe)]
+                                                elif cfe.getAttribute('end'):
+                                                    _log.warning("Ignore end.. ")
+                                            else:
+                                                _log.debug("Unknown comp-filter: %s", cfe.localName)
+                                    else:
+                                        _log.debug("Unknown comp-filter: %s", vevent_filter.localName)
+                        else:
+                            _log.debug("Unknown filter element: %s", vcalendar_filter.localName)
+                else:
+                    _log.debug("Unknown calendar-query element: %s", filter_child.localName)
             return res
         elif filters.localName == 'calendar-multiget':
             names = []
@@ -238,8 +256,12 @@ class node_calendar(nodes.node_class):
                     if len(caluri):
                         caluri = caluri[-2]
                         if caluri not in names : names.append(caluri)
+                else:
+                    _log.debug("Unknonwn multiget element: %s", filter_child.localName)
             res = [('name','in',names)]
             return res
+        else:
+            _log.debug("Unknown element in REPORT: %s", filters.localName)
         return res
 
     def children(self, cr, domain=None):

From 1b301705258289e13bdcc64e063420792839fe96 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:35 +0300
Subject: [PATCH 090/294] doc webdav: switch on the DAV v2 features

The underlying python-webdav supports some emulation for lock/unlock, so
try to use that.

bzr revid: p_christ@hol.gr-20101012104035-jffog0w1dco2lo9i
---
 addons/document_webdav/dav_fs.py        | 17 ++++++++---------
 addons/document_webdav/nodes.py         | 13 +------------
 addons/document_webdav/webdav_server.py |  5 ++---
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 9e04673555a..07ffeda4da1 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -26,8 +26,6 @@ import os
 import time
 from string import joinfields, split, lower
 
-from service import security
-
 import netsvc
 import urlparse
 
@@ -39,6 +37,8 @@ import urllib
 from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 from cache import memoize
 from tools import misc
+from tools.dict_tools import dict_merge2
+
 CACHE_SIZE=20000
 
 #hack for urlparse: add webdav in the net protocols
@@ -95,8 +95,7 @@ class openerp_dav_handler(dav_interface):
             return props
         node = self.uri2object(cr, uid, pool, uri2)
         if node:
-            props = props.copy()
-            props.update(node.get_dav_props(cr))
+            props = dict_merge2(props, node.get_dav_props(cr))
         cr.close()
         return props
 
@@ -133,11 +132,11 @@ class openerp_dav_handler(dav_interface):
             self.parent.log_message("Exc: %s",traceback.format_exc())
             raise default_exc("Operation failed")
 
-    def _get_dav_lockdiscovery(self, uri):
-        raise DAV_NotFound
+    #def _get_dav_lockdiscovery(self, uri):
+    #    raise DAV_NotFound
 
-    def _get_dav_supportedlock(self, uri):
-        raise DAV_NotFound
+    #def A_get_dav_supportedlock(self, uri):
+    #    raise DAV_NotFound
 
     def match_prop(self, uri, match, ns, propname):
         if self.M_NS.has_key(ns):
@@ -293,8 +292,8 @@ class openerp_dav_handler(dav_interface):
             else:
                 fp = node.full_path()
                 if fp and len(fp):
-                    self.parent.log_message('childs: @%s' % fp)
                     fp = '/'.join(fp)
+                    self.parent.log_message('childs for: %s' % fp)
                 else:
                     fp = None
                 domain = None
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 0a45b227095..67dc9fd2a4f 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -22,20 +22,9 @@
 
 from document import nodes
 from tools.safe_eval import safe_eval as eval
+from tools.dict_tools import dict_filter
 import urllib
 
-def dict_filter(srcdic, keys, res=None):
-    ''' Return a copy of srcdic that has only keys set.
-    If any of keys are missing from srcdic, the result won't have them, 
-    either.
-    @param res If given, result will be updated there, instead of a new dict.
-    '''
-    if res is None:
-        res = {}
-    for k in keys:
-        if k in srcdic:
-            res[k] = srcdic[k]
-    return res
     
 class node_acl_mixin(object):
     def _get_dav_owner(self, cr):
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index c86cde2b096..7e4bb69fa0a 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -57,7 +57,7 @@ def OpenDAVConfig(**kw):
 class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
     verbose = False
     protocol_version = 'HTTP/1.1'
-    _HTTP_OPTIONS= { 'DAV' : ['1',],
+    _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
                     'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
                             'PROPFIND', 'PROPPATCH', 'OPTIONS', 'MKCOL',
                             'DELETE', 'TRACE', 'REPORT', ]
@@ -265,8 +265,7 @@ try:
         handler.debug = config.get_misc('webdav','debug',True)
         _dc = { 'verbose' : verbose,
                 'directory' : directory,
-                'lockemulation' : False,
-
+                'lockemulation' : True,
                 }
 
         conf = OpenDAVConfig(**_dc)

From 369cae941e34f0be498e1786814381a129f52751 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:37 +0300
Subject: [PATCH 091/294] CalDAV: properly implement the CTag feature

Instead of using the ETag (which looks at the modification time of
the base.calendar object), aggregate over the contained calendar entries
to find their maximum modification.

bzr revid: p_christ@hol.gr-20101012104037-847evso9mryqom5f
---
 addons/caldav/caldav_node.py | 45 +++++++++++-------------------
 addons/caldav/calendar.py    | 53 ++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 510e43eabd0..52da451b567 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -21,33 +21,14 @@
 
 import time
 from document_webdav import nodes
+from document.nodes import _str2time
 import logging
 import StringIO
 
+from tools.dict_tools import dict_merge, dict_merge2
+
 # TODO: implement DAV-aware errors, inherit from IOError
 
-def dict_merge(*dicts):
-    """ Return a dict with all values of dicts
-    """
-    res = {}
-    for d in dicts:
-        res.update(d)
-    return res
-
-def dict_merge2(*dicts):
-    """ Return a dict with all values of dicts.
-        If some key appears twice and contains iterable objects, the values
-        are merged (instead of overwritten).
-    """
-    res = {}
-    for d in dicts:
-        for k in d.keys():
-            if k in res and isinstance(res[k], (list, tuple)):
-                res[k] = res[k] + d[k]
-            else:
-                res[k] = d[k]
-    return res
-
 # Assuming that we have set global properties right, we mark *all* 
 # directories as having calendar-access.
 nodes.node_dir.http_options = dict_merge2(nodes.node_dir.http_options,
@@ -186,10 +167,18 @@ class node_calendar(nodes.node_class):
         self.content_length = 0
         self.displayname = calendar.name
         self.cal_type = calendar.type
+        # TODO owner
+        
 
     def _get_dav_getctag(self, cr):
-        result = self._get_ttag(cr) + ':' + str(time.time())
-        return str(result)
+        dirobj = self.context._dirobj
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+
+        bc_obj = dirobj.pool.get('basic.calendar')
+        res = bc_obj.get_cal_max_modified(cr, uid, [self.calendar_id], self, domain=[], context=ctx)
+        return _str2time(res)
 
     def _get_dav_user_state(self, cr):
         #TODO
@@ -295,11 +284,9 @@ class node_calendar(nodes.node_class):
         if not domain:
             domain = []
 
-        fil_obj = dirobj.pool.get('basic.calendar')
-        ids = fil_obj.search(cr, uid, domain)
-        res = []
-        if self.calendar_id in ids:
-            res = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx)
+        bc_obj = dirobj.pool.get('basic.calendar')
+        # we /could/ be supplying an invalid calendar id to bc_obj, it has to check
+        res = bc_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx)
         return res
 
     def create_child(self, cr, path, data):
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 2f7d978b5a6..2133e3be293 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -552,6 +552,33 @@ class CalDAV(object):
             self.ical_reset('value')
         return res
 
+if True: # we need this indentation level ;)
+
+    def get_last_modified(self, cr, user, args, context=None, access_rights_uid=None):
+        """Return the last modification date of objects in 'domain'
+        This function has similar semantics to orm.search(), apart from the
+        limit, offset and order arguments, which make no sense here.
+        It is useful when we want to find if the table (aka set of records)
+        has any modifications we should update at the client.
+        """
+        if context is None:
+            context = {}
+        self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context)
+
+        query = self._where_calc(cr, user, args, context=context)
+        self._apply_ir_rules(cr, user, query, 'read', context=context)
+        from_clause, where_clause, where_clause_params = query.get_sql()
+
+        where_str = where_clause and (" WHERE %s" % where_clause) or ''
+
+        cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) + 
+                    from_clause + where_str ,
+                    where_clause_params,
+                    debug=self._debug)
+        res = cr.fetchall()
+        return res[0][0]
+
+
 class Calendar(CalDAV, osv.osv):
     _name = 'basic.calendar'
     _calname = 'calendar'
@@ -610,6 +637,32 @@ class Calendar(CalDAV, osv.osv):
                     node = res_node_calendar('%s.ics' %data.id, parent, ctx, data, line.object_id.model, data.id)
                     res.append(node)
         return res
+        
+
+    def get_cal_max_modified(self, cr, uid, ids, parent=None, domain=None, context=None):
+        if not context:
+            context = {}
+        if not domain:
+            domain = []
+        res = None
+        ctx_res_id = context.get('res_id', None)
+        ctx_model = context.get('model', None)
+        for cal in self.browse(cr, uid, ids):
+            for line in cal.line_ids:
+                if ctx_model and ctx_model != line.object_id.model:
+                    continue
+                if line.name in ('valarm', 'attendee'):
+                    continue
+                line_domain = eval(line.domain or '[]', context)
+                line_domain += domain
+                if ctx_res_id:
+                    line_domain += [('id','=',ctx_res_id)]
+                mod_obj = self.pool.get(line.object_id.model)
+                max_data = get_last_modified(mod_obj, cr, uid, line_domain, context=context)
+                if res and res > max_data:
+                    continue
+                res = max_data
+        return res
 
     def export_cal(self, cr, uid, ids, vobj='vevent', context=None):
         """ Export Calendar

From 371ceab425cdd48e39267adbb108729b5900cab8 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:42 +0300
Subject: [PATCH 092/294] Document: conformant ETag, avoid special chars.

bzr revid: p_christ@hol.gr-20101012104042-75xq12yk2wrj66ol
---
 addons/document/nodes.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 46674b61caa..e1a1e8bde49 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -266,18 +266,18 @@ class node_class(object):
         """ Get a tag, unique per object + modification.
 
             see. http://tools.ietf.org/html/rfc2616#section-13.3.3 """
-        return self._get_ttag(cr) + ':' + self._get_wtag(cr)
+        return '"%s-%s"' % (self._get_ttag(cr), self._get_wtag(cr))
 
     def _get_wtag(self, cr):
         """ Return the modification time as a unique, compact string """
-        return str(_str2time(self.write_date))
+        return str(_str2time(self.write_date)).replace('.','')
 
     def _get_ttag(self,cr):
         """ Get a unique tag for this type/id of object.
             Must be overriden, so that each node is uniquely identified.
         """
         print "node_class.get_ttag()",self
-        raise NotImplementedError("get_etag stub()")
+        raise NotImplementedError("get_ttag stub()")
 
     def get_dav_props(self, cr):
         """ If this class has special behaviour for GroupDAV etc, export
@@ -883,7 +883,7 @@ class node_res_obj(node_class):
 
         return res
 
-    def get_dav_props(self, cr):
+    def get_dav_props_DEPR(self, cr):
         # Deprecated! (but document_ics must be cleaned, first)
         res = {}
         cntobj = self.context._dirobj.pool.get('document.directory.content')
@@ -897,7 +897,7 @@ class node_res_obj(node_class):
                 res['http://groupdav.org/'] = ('resourcetype',)
         return res
 
-    def get_dav_eprop(self, cr, ns, prop):
+    def get_dav_eprop_DEPR(self, cr, ns, prop):
         # Deprecated!
         if ns != 'http://groupdav.org/' or prop != 'resourcetype':
             logger.warning("Who asked for %s:%s?" % (ns, prop))

From f7ce71c475604afca3ca1a13f648fbb944487393 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:44 +0300
Subject: [PATCH 093/294] Doc webdav: hack minidom to put proper quotes at
 ETag. Status first.

bzr revid: p_christ@hol.gr-20101012104044-1uq9x7k93aku7ls1
---
 addons/document_webdav/webdav.py | 37 +++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 86fd8cd9e71..0a9f4cd1111 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -22,6 +22,8 @@
 
 import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
+from xml.dom.minicompat import StringTypes
+
 import urlparse
 import urllib
 from osv import osv
@@ -35,6 +37,21 @@ from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.
 
 import tools
 
+class Text2(xml.dom.minidom.Text):
+    def writexml(self, writer, indent="", addindent="", newl=""):
+        data = "%s%s%s" % (indent, self.data, newl)
+        data = data.replace("&", "&amp;").replace("<", "&lt;")
+        data = data.replace(">", "&gt;")
+        writer.write(data)
+
+def createText2Node(doc, data):
+    if not isinstance(data, StringTypes):
+        raise TypeError, "node contents must be a string"
+    t = Text2()
+    t.data = data
+    t.ownerDocument = doc
+    return t
+
 
 super_mk_prop_response = PROPFIND.mk_prop_response
 def mk_prop_response(self, uri, good_props, bad_props, doc):
@@ -116,7 +133,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
                     # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
                     _prop_elem_child(ve, v[1], v[2], ns_prefix)
                 else:
-                    vt =doc.createTextNode(tools.ustr(v[2]))
+                    vt=createText2Node(doc,tools.ustr(v[2]))
                     ve.appendChild(vt)
             if len(v) > 3 and v[3]:
                 assert isinstance(v[3], dict)
@@ -124,7 +141,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
                     ve.setAttribute(ak, av)
             pnode.appendChild(ve)
         else:
-            ve=doc.createTextNode(tools.ustr(v))
+            ve=createText2Node(doc, tools.ustr(v))
             pnode.appendChild(ve)
 
     # write href information
@@ -143,6 +160,10 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     ps=doc.createElement("D:propstat")
     if good_props:
         re.appendChild(ps)
+    s=doc.createElement("D:status")
+    t=doc.createTextNode("HTTP/1.1 200 OK")
+    s.appendChild(t)
+    ps.appendChild(s)
 
     gp=doc.createElement("D:prop")
     for ns in good_props.keys():
@@ -156,10 +177,6 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
             _prop_child(gp, ns, p, v)
 
     ps.appendChild(gp)
-    s=doc.createElement("D:status")
-    t=doc.createTextNode("HTTP/1.1 200 OK")
-    s.appendChild(t)
-    ps.appendChild(s)
     re.appendChild(ps)
 
     # now write the errors!
@@ -169,6 +186,10 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
         for ecode in bad_props.keys():
             ps=doc.createElement("D:propstat")
             re.appendChild(ps)
+            s=doc.createElement("D:status")
+            t=doc.createTextNode(utils.gen_estring(ecode))
+            s.appendChild(t)
+            ps.appendChild(s)
             bp=doc.createElement("D:prop")
             ps.appendChild(bp)
 
@@ -182,10 +203,6 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
                 pe=doc.createElement(ns_prefix+str(p))
                 bp.appendChild(pe)
 
-            s=doc.createElement("D:status")
-            t=doc.createTextNode(utils.gen_estring(ecode))
-            s.appendChild(t)
-            ps.appendChild(s)
             re.appendChild(ps)
 
     # return the new response element

From 95de19744044f9b0e31677322f4726738e74bb97 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:40:44 +0300
Subject: [PATCH 094/294] CalDAV: more properties, hide WebCal support

WebCal entries, although permitted by the protocol, confuse some badly
implemented CalDAV clients, so hide them with an option at the calendar
definition.

bzr revid: p_christ@hol.gr-20101012104044-rjx63ucwjk0ys98r
---
 addons/caldav/caldav_node.py  | 57 +++++++++++++++++++++++++----------
 addons/caldav/caldav_view.xml |  3 ++
 addons/caldav/calendar.py     | 35 +++++----------------
 addons/caldav/orm_utils.py    | 49 ++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 43 deletions(-)
 create mode 100644 addons/caldav/orm_utils.py

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 52da451b567..f104b27ca15 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -24,6 +24,7 @@ from document_webdav import nodes
 from document.nodes import _str2time
 import logging
 import StringIO
+from orm_utils import get_last_modified
 
 from tools.dict_tools import dict_merge, dict_merge2
 
@@ -64,21 +65,24 @@ class node_calendar_collection(nodes.node_dir):
         for cal in fil_obj.browse(cr, uid, ids, context=ctx):
             if (not name) or not ext:
                 res.append(node_calendar(cal.name, self, self.context, cal))
-            if (not name) or ext:
+            if cal.has_webcal and (not name) or ext:
                 res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
             # May be both of them!
         return res
 
-    def _get_dav_owner(self, cr):
-        # Todo?
-        return False
-
     def _get_ttag(self, cr):
         return 'calen-dir-%d' % self.dir_id
 
     def _get_dav_getctag(self, cr):
-        result = self.get_etag(cr)
-        return str(result)
+        dirobj = self.context._dirobj
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        where = [('collection_id','=',self.dir_id)]
+        bc_obj = dirobj.pool.get('basic.calendar')
+        
+        res = get_last_modified(bc_obj, cr, uid, where, context=ctx)
+        return _str2time(res)
 
 class node_calendar_res_col(nodes.node_res_obj):
     """ Calendar collection, as a dynamically created node
@@ -116,7 +120,7 @@ class node_calendar_res_col(nodes.node_res_obj):
         for cal in fil_obj.browse(cr, uid, ids, context=ctx):
             if (not name) or not ext:
                 res.append(node_calendar(cal.name, self, self.context, cal))
-            if (not name) or ext:
+            if cal.has_webcal and (not name) or ext:
                 res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
             # May be both of them!
         return res
@@ -125,8 +129,15 @@ class node_calendar_res_col(nodes.node_res_obj):
         return 'calen-dir-%d' % self.dir_id
 
     def _get_dav_getctag(self, cr):
-        result = self.get_etag(cr)
-        return str(result)
+        dirobj = self.context._dirobj
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        where = [('collection_id','=',self.dir_id)]
+        bc_obj = dirobj.pool.get('basic.calendar')
+        
+        res = get_last_modified(bc_obj, cr, uid, where, context=ctx)
+        return _str2time(res)
 
 class node_calendar(nodes.node_class):
     our_type = 'collection'
@@ -138,7 +149,9 @@ class node_calendar(nodes.node_class):
             "urn:ietf:params:xml:ns:caldav" : (
                     'calendar-description', 
                     'supported-calendar-component-set',
-                    )}
+                    ),
+            "http://apple.com/ns/ical/": ("calendar-color", "calendar-order"),
+            }
     DAV_PROPS_HIDDEN = {
             "urn:ietf:params:xml:ns:caldav" : (
                     'calendar-data',
@@ -154,7 +167,9 @@ class node_calendar(nodes.node_class):
            # "http://cal.me.com/_namespace/": '_get_dav', 
            'http://groupdav.org/': '_get_gdav',
            "http://calendarserver.org/ns/" : '_get_dav',
-           "urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
+           "urn:ietf:params:xml:ns:caldav" : '_get_caldav',
+           "http://apple.com/ns/ical/": '_get_apple_cal',
+           }
 
     http_options = { 'DAV': ['calendar-access'] }
 
@@ -167,8 +182,12 @@ class node_calendar(nodes.node_class):
         self.content_length = 0
         self.displayname = calendar.name
         self.cal_type = calendar.type
-        # TODO owner
-        
+        self.cal_color = calendar.calendar_color or None
+        self.cal_order = calendar.calendar_order or None
+        try:
+            self.uuser = (calendar.user_id and calendar.user_id.login) or 'nobody'
+        except Exception:
+            self.uuser = 'nobody'
 
     def _get_dav_getctag(self, cr):
         dirobj = self.context._dirobj
@@ -186,8 +205,9 @@ class node_calendar(nodes.node_class):
 
     def get_dav_resourcetype(self, cr):
         res = [ ('collection', 'DAV:'),
+                ('calendar', 'urn:ietf:params:xml:ns:caldav'),
                 (str(self.cal_type + '-collection'), 'http://groupdav.org/'),
-                ('calendar', 'urn:ietf:params:xml:ns:caldav') ]
+                ]
         return res
 
     def get_domain(self, cr, filters):
@@ -373,6 +393,12 @@ class node_calendar(nodes.node_class):
 
     def _get_caldav_max_date_time(self, cr):
         return "21001231T235959Z" # I will be dead by then
+    
+    def _get_apple_cal_calendar_color(self, cr):
+        return self.cal_color
+
+    def _get_apple_cal_calendar_order(self, cr):
+        return self.cal_order
 
 class res_node_calendar(nodes.node_class):
     our_type = 'file'
@@ -445,7 +471,6 @@ class res_node_calendar(nodes.node_class):
             res = '%d' % (self.calendar_id)
         return res
 
-
     def rm(self, cr):
         uid = self.context.uid
         res = False
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2e9719efead..97656a954ad 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -74,6 +74,9 @@
                     <field name="type"/>
                     <field name="user_id"/>
                     <field name="collection_id" required="1"/>
+                    <field name="has_webcal" groups="base.group_extended" />
+                    <field name="calendar_color" groups="base.group_extended" />
+                    <field name="calendar_order" groups="base.group_extended" />
                     <notebook colspan="4">
                         <page string="Calendar Lines">
                             <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 2133e3be293..276f08c5f51 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -32,6 +32,7 @@ import tools
 import time
 import logging
 from caldav_node import res_node_calendar
+from orm_utils import get_last_modified
 from tools.safe_eval import safe_eval as eval
 
 try:
@@ -552,33 +553,6 @@ class CalDAV(object):
             self.ical_reset('value')
         return res
 
-if True: # we need this indentation level ;)
-
-    def get_last_modified(self, cr, user, args, context=None, access_rights_uid=None):
-        """Return the last modification date of objects in 'domain'
-        This function has similar semantics to orm.search(), apart from the
-        limit, offset and order arguments, which make no sense here.
-        It is useful when we want to find if the table (aka set of records)
-        has any modifications we should update at the client.
-        """
-        if context is None:
-            context = {}
-        self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context)
-
-        query = self._where_calc(cr, user, args, context=context)
-        self._apply_ir_rules(cr, user, query, 'read', context=context)
-        from_clause, where_clause, where_clause_params = query.get_sql()
-
-        where_str = where_clause and (" WHERE %s" % where_clause) or ''
-
-        cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) + 
-                    from_clause + where_str ,
-                    where_clause_params,
-                    debug=self._debug)
-        res = cr.fetchall()
-        return res[0][0]
-
-
 class Calendar(CalDAV, osv.osv):
     _name = 'basic.calendar'
     _calname = 'calendar'
@@ -607,6 +581,13 @@ class Calendar(CalDAV, osv.osv):
             'create_date': fields.datetime('Created Date', readonly=True),
             'write_date': fields.datetime('Modifided Date', readonly=True),
             'description': fields.text("description"),
+            'calendar_color': fields.char('Color', size=20, help="For supporting clients, the color of the calendar entries"),
+            'calendar_order': fields.integer('Order', help="For supporting clients, the order of this folder among the calendars"),
+            'has_webcal': fields.boolean('WebCal', required=True, help="Also export a <name>.ics entry next to the calendar folder, with WebCal content."),
+    }
+    
+    _defaults = {
+        'has_webcal': False,
     }
 
     def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None):
diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py
new file mode 100644
index 00000000000..badacc855c9
--- /dev/null
+++ b/addons/caldav/orm_utils.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP SA (www.openerp.com)
+#
+#    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/>.
+#
+##############################################################################
+
+
+if True: # we need this indentation level ;)
+
+    def get_last_modified(self, cr, user, args, context=None, access_rights_uid=None):
+        """Return the last modification date of objects in 'domain'
+        This function has similar semantics to orm.search(), apart from the
+        limit, offset and order arguments, which make no sense here.
+        It is useful when we want to find if the table (aka set of records)
+        has any modifications we should update at the client.
+        """
+        if context is None:
+            context = {}
+        self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context)
+
+        query = self._where_calc(cr, user, args, context=context)
+        self._apply_ir_rules(cr, user, query, 'read', context=context)
+        from_clause, where_clause, where_clause_params = query.get_sql()
+
+        where_str = where_clause and (" WHERE %s" % where_clause) or ''
+
+        cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) + 
+                    from_clause + where_str ,
+                    where_clause_params,
+                    debug=self._debug)
+        res = cr.fetchall()
+        return res[0][0]
+
+#eof

From 04aab94958c387cc9e0e092fc83973d9050a15b6 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:00 +0300
Subject: [PATCH 095/294] Doc nodes: Docstring and a node_context.get()
 convenience fn.

bzr revid: p_christ@hol.gr-20101012104100-2y269ne3v7s03xnh
---
 addons/document/nodes.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index e1a1e8bde49..a9b8b7167fc 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -61,8 +61,11 @@ def get_node_context(cr, uid, context):
     return node_context(cr, uid, context)
 
 class node_context(object):
-    """ This is the root node, representing access to some particular
-        context """
+    """ This is the root node, representing access to some particular context
+    
+    A context is a set of persistent data, which may influence the structure
+    of the nodes. All other transient information during a data query should
+    be passed down with function arguments.
     cached_roots = {}
     node_file_class = None
 
@@ -92,6 +95,9 @@ class node_context(object):
 
     def __ne__(self, other):
         return not self.__eq__(other)
+    
+    def get(self, name, default=None):
+        return self.context.get(name, default)
 
     def get_uri(self, cr,  uri):
         """ Although this fn passes back to doc.dir, it is needed since
@@ -272,7 +278,7 @@ class node_class(object):
         """ Return the modification time as a unique, compact string """
         return str(_str2time(self.write_date)).replace('.','')
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         """ Get a unique tag for this type/id of object.
             Must be overriden, so that each node is uniquely identified.
         """

From 51bf88f478faaac7113279279268c3816a35cab1 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:02 +0300
Subject: [PATCH 096/294] Doc WebDAV: pass the user-agent as a context to the
 nodes.

It is unavoidable. Some user agents (i-#$^%) have serious trouble with
protocol extensions they don't support. So, we have to hide a few of
our capabilities with quirk code.

bzr revid: p_christ@hol.gr-20101012104102-xakiyykjqsu16q2o
---
 addons/document_webdav/dav_fs.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 07ffeda4da1..031e8da5a15 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -184,6 +184,16 @@ class openerp_dav_handler(dav_interface):
             cr.close()
             return ret
 
+    def reduce_useragent(self):
+        ua = self.parent.headers.get('User-Agent', False)
+        ctx = {}
+        if ua:
+            if 'iPhone' in ua:
+                ctx['DAV-client'] = 'iPhone'
+            elif 'Konqueror' in ua:
+                ctx['DAV-client'] = 'GroupDAV'
+        return ctx
+
     def get_prop(self, uri, ns, propname):
         """ return the value of a given property
 
@@ -342,7 +352,8 @@ class openerp_dav_handler(dav_interface):
     def uri2object(self, cr, uid, pool, uri):
         if not uid:
             return None
-        return pool.get('document.directory').get_object(cr, uid, uri)
+        context = self.reduce_useragent()
+        return pool.get('document.directory').get_object(cr, uid, uri, context=context)
 
     def get_data(self,uri, rrange=None):
         self.parent.log_message('GET: %s' % uri)

From 7bd29d41546d0253d136b4a95c075d40947d3b11 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:03 +0300
Subject: [PATCH 097/294] CalDAV: quirks for iPhone, based on the node_context

bzr revid: p_christ@hol.gr-20101012104103-s7nyv4bsl5r5rdhc
---
 addons/caldav/caldav_node.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index f104b27ca15..e974f7c55c0 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -65,6 +65,9 @@ class node_calendar_collection(nodes.node_dir):
         for cal in fil_obj.browse(cr, uid, ids, context=ctx):
             if (not name) or not ext:
                 res.append(node_calendar(cal.name, self, self.context, cal))
+            if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
+                # these ones must not see the webcal entry.
+                continue
             if cal.has_webcal and (not name) or ext:
                 res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
             # May be both of them!
@@ -120,6 +123,9 @@ class node_calendar_res_col(nodes.node_res_obj):
         for cal in fil_obj.browse(cr, uid, ids, context=ctx):
             if (not name) or not ext:
                 res.append(node_calendar(cal.name, self, self.context, cal))
+            if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
+                # these ones must not see the webcal entry.
+                continue
             if cal.has_webcal and (not name) or ext:
                 res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
             # May be both of them!
@@ -206,8 +212,9 @@ class node_calendar(nodes.node_class):
     def get_dav_resourcetype(self, cr):
         res = [ ('collection', 'DAV:'),
                 ('calendar', 'urn:ietf:params:xml:ns:caldav'),
-                (str(self.cal_type + '-collection'), 'http://groupdav.org/'),
                 ]
+        if self.context.get('DAV-client', '') == 'GroupDAV':
+            res.append((str(self.cal_type + '-collection'), 'http://groupdav.org/'))
         return res
 
     def get_domain(self, cr, filters):
@@ -350,6 +357,11 @@ class node_calendar(nodes.node_class):
         return False
 
     def _get_caldav_calendar_data(self, cr):
+        if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
+            # Never return collective data to iClients, they get confused
+            # because they do propfind on the calendar node with Depth=1
+            # and only expect the childrens' data
+            return None
         res = []
         for child in self.children(cr):
             res.append(child._get_caldav_calendar_data(cr))

From d697bd94e5a860d91ddf3f5ffaa94a4c6f9c5384 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:03 +0300
Subject: [PATCH 098/294] Doc webdav, caldav: fix support for the
 calendar-multiget report

This report is a request to fetch multiple calendar entries. The
request contains a range of URIs to fetch, which must be processed
at the dav_fs.Report level.
The report is being called with Depth: 0 , for which the library could
not perform an iterator. Hack over it and explictly set Depth:1 in our
case.

bzr revid: p_christ@hol.gr-20101012104103-eu156146jy4a75af
---
 addons/caldav/caldav_node.py     | 19 +++----------------
 addons/document_webdav/dav_fs.py | 24 ++++++++++++++++++++++++
 addons/document_webdav/webdav.py | 16 ++++++++++++++++
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index e974f7c55c0..2ddd5ffa49e 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -260,22 +260,9 @@ class node_calendar(nodes.node_class):
                     _log.debug("Unknown calendar-query element: %s", filter_child.localName)
             return res
         elif filters.localName == 'calendar-multiget':
-            names = []
-            for filter_child in filters.childNodes:
-                if filter_child.nodeType == filter_child.TEXT_NODE:
-                    continue
-                if filter_child.localName == 'href':
-                    if not filter_child.firstChild:
-                        continue
-                    uri = filter_child.firstChild.data
-                    caluri = uri.split('/')
-                    if len(caluri):
-                        caluri = caluri[-2]
-                        if caluri not in names : names.append(caluri)
-                else:
-                    _log.debug("Unknonwn multiget element: %s", filter_child.localName)
-            res = [('name','in',names)]
-            return res
+            # this is not the place to process, as it wouldn't support multi-level
+            # hrefs. So, the code is moved to document_webdav/dav_fs.py
+            pass
         else:
             _log.debug("Unknown element in REPORT: %s", filters.localName)
         return res
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 031e8da5a15..7deb18f714c 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -309,12 +309,36 @@ class openerp_dav_handler(dav_interface):
                 domain = None
                 if filters:
                     domain = node.get_domain(cr, filters)
+                    
+                    if hasattr(filters, 'getElementsByTagNameNS'):
+                        hrefs = filters.getElementsByTagNameNS('DAV:', 'href')
+                        if hrefs:
+                            ul = self.parent.davpath + self.uri2local(uri)
+                            for hr in hrefs:
+                                turi = ''
+                                for tx in hr.childNodes:
+                                    if tx.nodeType == hr.TEXT_NODE:
+                                        turi += tx.data
+                                        
+                                if turi.startswith(ul):
+                                    result.append( turi[len(self.parent.davpath):])
+                                else:
+                                    self.parent.log_error("ignore href %s because it is not under request path", turi)
+                            return result
+                            # We don't want to continue with the children found below
+                            # Note the exceptions and that 'finally' will close the
+                            # cursor
                 for d in node.children(cr, domain):
                     self.parent.log_message('child: %s' % d.path)
                     if fp:
                         result.append( self.urijoin(dbname,fp,d.path) )
                     else:
                         result.append( self.urijoin(dbname,d.path) )
+        except DAV_Error:
+            raise
+        except Exception:
+            self.parent.log_error("cannot get_childs: "+ str(e))
+            raise
         finally:
             if cr: cr.close()
         return result
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 0a9f4cd1111..484a1054475 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -31,6 +31,7 @@ from osv import osv
 try:
     from DAV import utils
     from DAV.propfind import PROPFIND
+    from DAV.report import REPORT
 except ImportError:
     raise osv.except_osv('PyWebDAV Import Error!','Please install PyWebDAV \
 from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
@@ -257,3 +258,18 @@ def mk_propname_response(self,uri,propnames,doc):
 PROPFIND.mk_prop_response = mk_prop_response
 PROPFIND.mk_propname_response = mk_propname_response
 
+super_create_prop = REPORT.create_prop
+
+def create_prop(self):
+    try:
+        if (self.filter is not None) and self._depth == "0":
+            hrefs = self.filter.getElementsByTagNameNS('DAV:', 'href')
+            if hrefs:
+                self._depth = "1"
+    except Exception:
+        pass
+    return super_create_prop(self)
+
+REPORT.create_prop = create_prop
+
+#eof

From 39aa2bd391025246e4520e8e7d3b2dc0af23ec3d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:18 +0300
Subject: [PATCH 099/294] base_calendar, caldav: fixes for the queries.

bzr revid: p_christ@hol.gr-20101012104118-o02tug6x3t9gewaa
---
 addons/base_calendar/base_calendar.py | 18 +++++++-----------
 addons/caldav/calendar.py             |  3 ++-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 2a0b0cc60ad..a37630f8d96 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1017,7 +1017,8 @@ class calendar_event(osv.osv):
         elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
             rrule_type = 'custom'
 
-        qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' "
+        qry = "UPDATE \"%s\" set rrule_type=%%s " % self._table
+        qry_args = [ rrule_type, ]
 
         if rrule_type == 'custom':
             new_val = val.copy()
@@ -1055,17 +1056,12 @@ class calendar_event(osv.osv):
                     new_val.pop('bymonth')
 
             for k, v in new_val.items():
-                temp = ", %s='%s'" % (k, v)
-                qry += temp
+                qry += ", %s=%%s" % k
+                qry_args.append(v)
 
-        whr = " where id=%(id)s"
-        qry = qry + whr
-        val.update({
-            'table': self._table,
-            'rule_type': rrule_type,
-            'id': id,
-        })
-        cr.execute(qry, val) # Hopefully psycopg2 works with dicts. But, FIXME
+        qry = qry + " where id=%s"
+        qry_args.append(id)
+        cr.execute(qry, qry_args)
         return True
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 276f08c5f51..ae9aa909642 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -71,7 +71,8 @@ def uid2openobjectid(cr, uidval, oomodel, rdate):
             r_id = cr.fetchone()
             if r_id:
                 return (id, r_id[0])
-        
+            else:
+                return (False, None)
         cr.execute(qry)
         ids = map(lambda x: str(x[0]), cr.fetchall())
         if id in ids:

From 0bdc45e068d584220d2a1b399d5f0389fcd6e092 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:20 +0300
Subject: [PATCH 100/294] Document: fix behavior of dir.dctx lines, when dir is
 removed.

bzr revid: p_christ@hol.gr-20101012104120-n53iyh31z3zry6x9
---
 addons/document/document_directory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 30507f1cd2c..2b3aad859c0 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -293,7 +293,7 @@ class document_directory_dctx(osv.osv):
     _name = 'document.directory.dctx'
     _description = 'Directory Dynamic Context'
     _columns = {
-        'dir_id': fields.many2one('document.directory', 'Directory', required=True),
+        'dir_id': fields.many2one('document.directory', 'Directory', required=True, ondelete="cascade"),
         'field': fields.char('Field', size=20, required=True, select=1, help="The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."),
         'expr': fields.char('Expression', size=64, required=True, help="A python expression used to evaluate the field.\n" + \
                 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference to the current record, in dynamic folders"),

From 849548ccf167ead6755fc52d5baf4b43319436df Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 13:41:21 +0300
Subject: [PATCH 101/294] WebDAV, CalDAV: setup data for folders, calendars,
 properties

bzr revid: p_christ@hol.gr-20101012104121-e5k6f4vg8rnktiqh
---
 addons/caldav/__openerp__.py                  |  14 +-
 addons/caldav/caldav_setup.xml                |  88 ++++++
 addons/crm_caldav/__openerp__.py              |  28 +-
 addons/crm_caldav/crm_caldav_setup.xml        | 287 ++++++++++++++++++
 addons/document_webdav/__openerp__.py         |   7 +-
 addons/document_webdav/webdav_demo.xml        |  22 ++
 addons/document_webdav/webdav_setup.xml       |  99 ++++++
 addons/project_caldav/__openerp__.py          |   6 +-
 addons/project_caldav/project_caldav_data.xml |   8 +-
 .../project_caldav/project_caldav_setup.xml   | 272 +++++++++++++++++
 10 files changed, 803 insertions(+), 28 deletions(-)
 create mode 100644 addons/caldav/caldav_setup.xml
 create mode 100644 addons/crm_caldav/crm_caldav_setup.xml
 create mode 100644 addons/document_webdav/webdav_demo.xml
 create mode 100644 addons/document_webdav/webdav_setup.xml
 create mode 100644 addons/project_caldav/project_caldav_setup.xml

diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index cdb06a17a1f..40088cb0bac 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    "name" : "Share Calendar using Caldav", 
-    "version" : "1.0", 
+    "name" : "Share Calendar using CalDAV", 
+    "version" : "1.1", 
     "depends" : [
                     "base", 
                     "document_webdav",
-                ], 
+                ],
      'description': """
     This module Contains basic functionality for caldav system like:  
   - Webdav server that provides remote access to calendar
@@ -34,7 +34,10 @@
   - Customize calendar event and todo attribute with any of OpenERP model
   - Provides iCal Import/Export functionality
 
-    To access OpenERP Calendar using caldav to remote site use the URL like:
+    To access Calendars using CalDAV clients, point them to:
+        http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
+
+    To access OpenERP Calendar using WebCal to remote site use the URL like:
         http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
 
       Where,
@@ -53,7 +56,8 @@
                     'wizard/calendar_event_export_view.xml',
                     'wizard/calendar_event_import_view.xml',
                     'wizard/calendar_event_subscribe_view.xml',
-                    'caldav_view.xml'
+                    'caldav_view.xml',
+                    'caldav_setup.xml'
                     ], 
     "installable" : True, 
     "active" : False, 
diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
new file mode 100644
index 00000000000..c33edbc75f7
--- /dev/null
+++ b/addons/caldav/caldav_setup.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- /calendars tree -->
+        <record id="document_directory_calendars0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">calendars</field>
+        </record>
+        <record id="document_directory_resources1" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">resources</field>
+        </record>
+        <record id="document_directory_uids0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field name="type">ressource</field>
+            <field name="ressource_type_id" ref="base.model_res_users"/>
+            <field eval="[(6,0,[ref('base.group_system')])]" name="group_ids"/>
+            <field name="name">__uids__</field>
+        </record>
+        <record id="document_directory_users0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="resource_field" ref="base.field_res_users_login"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">ressource</field>
+            <field name="ressource_type_id" ref="base.model_res_users"/>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">users</field>
+        </record>
+        <record id="document_directory_dctx_0" model="document.directory.dctx">
+            <field model="document.directory" name="dir_id" ref="document_directory_users0"/>
+            <field name="field">user_id</field>
+            <field name="expr">res_id</field>
+        </record>
+        <record id="document_directory_c0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_users0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">c</field>
+            <field eval="1" name="calendar_collection"/>
+        </record>
+        <record id="document_directory_groups1" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">groups</field>
+        </record>
+        <record id="document_webdav_dir_property_calendarhomeset0" model="document.webdav.dir.property">
+            <field model="document.directory" name="dir_id" ref="document_directory_calendars0"/>
+            <field name="namespace">urn:ietf:params:xml:ns:caldav</field>
+            <!-- no parent, it is a global property -->
+            <field name="name">calendar-home-set</field>
+            <field name="value">('href','DAV:','/%s/%s/calendars/users/%s/c' % ('webdav',dbname,username) )</field>
+            <field eval="1" name="do_subst"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index ce8f72a3e17..d0e04576b3b 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,24 +22,24 @@
 
 {
     'name': 'Extened Module to Add CalDav future on Meeting',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Generic Modules/CRM & SRM',
     'description': """
-    New Futures in Meeting:        
-        *  Share meeting with other calendar clients like sunbird         
-""", 
-    'author': 'OpenERP SA', 
-    'website': 'http://www.openerp.com', 
-    'depends': ['caldav', 'crm'
-                    ], 
-    'init_xml': [ 
-                'crm_caldav_data.xml',                 
-    ], 
+    New Futures in Meeting:
+        *  Share meeting with other calendar clients like sunbird
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['caldav', 'crm' ],
+    'init_xml': [
+                'crm_caldav_data.xml',
+                'crm_caldav_setup.xml',
+                ],
 
     'update_xml': [],
-    'demo_xml': [], 
-    'installable': True, 
-    'active': False,     
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
new file mode 100644
index 00000000000..1a103f61811
--- /dev/null
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+
+    <record id="basic_calendar_meetings0" model="basic.calendar">
+        <field eval="1" name="has_webcal"/>
+        <field name="description">Meetings per user</field>
+        <field name="calendar_color">#1E25FF</field>
+        <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
+        <field name="type">vevent</field>
+        <field name="name">Meetings</field>
+    </record>
+
+    <record id="basic_calendar_lines_attendee0" model="basic.calendar.lines">
+        <field name="calendar_id" ref="basic_calendar_meetings0"/>
+        <field name="domain">[]</field>
+        <field name="name">attendee</field>
+        <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
+    </record>
+
+    <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
+        <field name="calendar_id" ref="basic_calendar_meetings0"/>
+        <field name="domain">[]</field>
+        <field name="name">valarm</field>
+        <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
+    </record>
+
+    <record id="basic_calendar_lines_vevent0" model="basic.calendar.lines">
+        <field name="calendar_id" ref="basic_calendar_meetings0"/>
+        <field name="domain">[('user_id','=', dctx_user_id)]</field>
+        <field name="name">vevent</field>
+        <field name="object_id" ref="crm.model_crm_meeting"/>
+    </record>
+
+
+    <record id="basic_calendar_fields_1" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_attendee"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_2" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_duration"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_3" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_description"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_4" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_attach"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_5" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_6" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_interval"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_7" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_summary"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_8" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_duration"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_9" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_repeat"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_10" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_action"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_11" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_related"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
+        <field name="fn">field</field>
+    </record>
+
+    <record id="basic_calendar_fields_12" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_organizer"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="crm.field_crm_meeting_organizer"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_13" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_uid"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_id"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_14" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_recurrence-id"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_recurrent_id"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_15" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_vtimezone"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_vtimezone"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_16" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_attendee"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="crm.field_crm_meeting_attendee_ids"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_17" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_rrule"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_rrule"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_18" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_dtend"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_date_deadline"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_19" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_valarm"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_alarm_id"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_20" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_location"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_location"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_21" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_exrule"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_exrule"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_22" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_status"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="crm.field_crm_meeting_state"/>
+        <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_23" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_exdate"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_exdate"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_24" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_dtstamp"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_25" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_description"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_description"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_26" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_dtstart"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_27" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_class"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_class"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_28" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_created"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_create_date"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_29" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_url"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_url"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_30" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_summary"/>
+        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_name"/>
+        <field name="fn">field</field>
+    </record>
+
+    <record id="basic_calendar_fields_31" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_cn"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_32" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_sent-by"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_33" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_language"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_34" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_delegated-from"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_35" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_member"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_36" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_cutype"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_37" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_role"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_38" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_partstat"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_39" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_delegated-to"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_40" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_dir"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_41" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_rsvp"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
+        <field name="fn">field</field>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 3a573dc5a2b..1c2e232e914 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -30,7 +30,7 @@
 
 {
         "name" : "WebDAV server for Document Management",
-        "version" : "2.1",
+        "version" : "2.2",
         "author" : "OpenERP SA",
         "category" : "Generic Modules/Others",
         "website": "http://www.openerp.com",
@@ -41,7 +41,10 @@
 """,
         "depends" : ["base", "document"],
         "init_xml" : [],
-        "update_xml" : ['security/ir.model.access.csv', "webdav_view.xml", ],
+        "update_xml" : ['security/ir.model.access.csv', 
+                        'webdav_view.xml',
+                        'webdav_setup.xml',
+                        ],
         "demo_xml" : [],
         "active": False,
         "installable": True
diff --git a/addons/document_webdav/webdav_demo.xml b/addons/document_webdav/webdav_demo.xml
new file mode 100644
index 00000000000..45cd17ed288
--- /dev/null
+++ b/addons/document_webdav/webdav_demo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+<record id="document_webdav_dir_property_nodeclass0" model="document.webdav.dir.property">
+	<field name="namespace">debug:</field>
+	<field name="name">node_class</field>
+	<field name="value">%(node_classname)s</field>
+	<field eval="1" name="do_subst"/>
+</record>
+
+<!--
+<record id="document_webdav_dir_property_debug0" model="document.webdav.dir.property">
+	<field name="namespace">debug:</field>
+	<field name="name">node_context</field>
+	<field name="value">%r</field>
+	<! dash dash This will expose the whole context at the property !>
+	<field eval="1" name="do_subst"/>
+</record>
+-->
+
+</data>
+</openerp>
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
new file mode 100644
index 00000000000..2bd41ddb69c
--- /dev/null
+++ b/addons/document_webdav/webdav_setup.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+<!--This file contains a typical setup of a WebDAV folders' structure, 
+    which conforms to the RFCs and extensions of the protocol.
+    In OpenERP, this is not enforced by any code inside the server, it
+    is rather a matter of setting these records in our document configuration.
+-->
+
+        <!-- /principals tree -->
+        <record id="document_directory_principals0" model="document.directory">
+                <field name="domain">[]</field>
+                <field eval="1" name="resource_find_all"/>
+                <field eval="0" name="ressource_tree"/>
+                <field name="user_id" ref="base.user_root"/>
+                <field name="company_id" ref="base.main_company"/>
+                <field name="storage_id" ref="document.storage_default"/>
+                <field name="type">directory</field>
+                <field eval="[(6,0,[])]" name="group_ids"/>
+                <field name="name">principals</field>
+        </record>
+
+        <record id="document_directory_groups0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">groups</field>
+        </record>
+
+        <record id="document_directory_resources0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">resources</field>
+        </record>
+        <record id="document_directory_uids1" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="resource_field" ref="base.field_res_users_login"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">ressource</field>
+            <field name="ressource_type_id" ref="base.model_res_users"/>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">__uids__</field>
+        </record>
+        <record id="document_directory_users1" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="resource_field" ref="base.field_res_users_login"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">ressource</field>
+            <field name="ressource_type_id" ref="base.model_res_users"/>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">users</field>
+        </record>
+        <record id="document_directory_locations0" model="document.directory">
+            <field name="domain">[]</field>
+            <field eval="1" name="resource_find_all"/>
+            <field eval="0" name="ressource_tree"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="storage_id" ref="document.storage_default"/>
+            <field name="type">directory</field>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="name">locations</field>
+        </record>
+        <record id="document_webdav_dir_property_currentuserprincipal0" model="document.webdav.dir.property">
+            <field name="namespace">DAV:</field>
+            <field name="name">current-user-principal</field>
+            <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
+            <field eval="1" name="do_subst"/>
+        </record>
+        <record id="document_webdav_dir_property_principalurl0" model="document.webdav.dir.property">
+            <field name="namespace">DAV:</field>
+            <field name="name">principal-URL</field>
+            <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
+            <field eval="1" name="do_subst"/>
+        </record>
+
+</data>
+</openerp>
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 1e78db79bf0..f298fc9e1d5 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name": "Caldav task management",
-    "version": "1.0",
+    "name": "CalDAV for task management",
+    "version": "1.1",
     "author": "OpenERP SA",
     "category": "Generic Modules/Others",
     "description": """ Synchronize between Project task and Caldav Vtodo.""",
     "depends": ["project", "caldav", "base_calendar"],
-    "init_xml": ["project_caldav_data.xml"],
+    "init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ],
     "demo_xml": [],
     "update_xml": ["project_caldav_view.xml"],
     "active": False,
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index 0a4d36580fc..3030b28dba9 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -3,10 +3,10 @@
 	<data noupdate="1">       
 
         <record model="basic.calendar" id="caldav.basic_calendar2">
-			<field name="name">Tasks</field>
-            <field name="collection_id" ref="document.dir_calendars"></field>
-            <field name="type">vtodo</field>
-		</record>
+	    <field name="name">Tasks</field>
+		<field name="collection_id" ref="document.dir_calendars"></field>
+		<field name="type">vtodo</field>
+	    </record>
 		
         <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
 			<field name="name">vtodo</field>
diff --git a/addons/project_caldav/project_caldav_setup.xml b/addons/project_caldav/project_caldav_setup.xml
new file mode 100644
index 00000000000..96d9c0ad3b6
--- /dev/null
+++ b/addons/project_caldav/project_caldav_setup.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+    <record id="basic_calendar_tasks0" model="basic.calendar">
+        <field eval="1" name="has_webcal"/>
+        <field name="description">Tasks per user</field>
+        <field name="calendar_color">#FFEF74</field>
+        <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
+        <field name="type">vtodo</field>
+        <field name="name">Tasks</field>
+    </record>
+
+    <record id="basic_calendar_lines_attendee0" model="basic.calendar.lines">
+        <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
+        <field name="domain">[]</field>
+        <field name="name">attendee</field>
+        <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
+    </record>
+    <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
+        <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
+        <field name="domain">[]</field>
+        <field name="name">valarm</field>
+        <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
+    </record>
+    <record id="basic_calendar_lines_vtodo0" model="basic.calendar.lines">
+        <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
+        <field name="domain">[('user_id','=', dctx_user_id)]</field>
+        <field name="name">vtodo</field>
+        <field name="object_id" ref="project.model_project_task"/>
+    </record>
+
+    <record id="basic_calendar_fields_0" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_status"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="project.field_project_task_state"/>
+        <field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_1" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_exdate"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_exdate"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_2" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_attendee"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="project_caldav.field_project_task_attendee_ids"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_3" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_valarm"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_base_calendar_alarm_id"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_4" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_description"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_description"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_5" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_url"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_base_calendar_url"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_6" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_percent"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="project.field_project_task_progress"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_7" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_vtimezone"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_vtimezone"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_8" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_summary"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_name"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_9" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_event_priority"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="project.field_project_task_priority"/>
+        <field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_10" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_location"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_location"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_11" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_exrule"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_exrule"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_12" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_duration"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="project.field_project_task_planned_hours"/>
+        <field name="fn">hours</field>
+    </record>
+    <record id="basic_calendar_fields_13" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_dtstart"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_date"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_14" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_rrule"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_rrule"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_15" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_class"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_class"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_16" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_todo_uid"/>
+        <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_id"/>
+        <field name="fn">field</field>
+    </record>
+
+    <record id="basic_calendar_fields_17" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_attendee"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_18" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_duration"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_19" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_description"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_20" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_attach"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_21" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_22" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_interval"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_23" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_summary"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_24" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_duration"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_25" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_repeat"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_226" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_action"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_27" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_alarm_trigger_related"/>
+        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
+        <field name="fn">field</field>
+    </record>
+
+    <record id="basic_calendar_fields_28" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_cn"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_29" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_sent-by"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_30" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_language"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_31" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_delegated-from"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_32" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_member"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_33" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_cutype"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_34" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_role"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_35" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_partstat"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_36" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_delegated-to"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_37" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_dir"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
+        <field name="fn">field</field>
+    </record>
+    <record id="basic_calendar_fields_38" model="basic.calendar.fields">
+        <field name="name" ref="caldav.field_attendee_rsvp"/>
+        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
+        <field name="fn">field</field>
+    </record>
+
+</data>
+</openerp>
\ No newline at end of file

From 305b48abe3195f3a7d93852637c79228885d01a2 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 14:20:30 +0300
Subject: [PATCH 102/294] Document, calendar: Patch code from trunk-xrg branch

several fixes that hadn't been backported or applied correctly.

bzr revid: p_christ@hol.gr-20101012112030-snnb4fjkya4ndqkm
---
 .../security/ir.model.access.csv              |  2 +-
 addons/caldav/caldav_node.py                  |  2 +-
 addons/caldav/calendar.py                     |  4 +-
 addons/document/__openerp__.py                |  2 +-
 addons/document/content_index.py              |  2 +-
 addons/document/nodes.py                      | 23 ++++++---
 .../document_ftp/ftpserver/abstracted_fs.py   |  1 -
 .../document_ftp/test/document_ftp_test3.yml  | 48 +++++++++----------
 addons/document_webdav/webdav_server.py       |  9 +++-
 9 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 0ae628fb720..aa269e9ff18 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,0
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
 "access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
 "access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
 "access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 2ddd5ffa49e..e1181726bbf 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -421,7 +421,7 @@ class res_node_calendar(nodes.node_class):
         self.calendar_id = hasattr(parent, 'calendar_id') and parent.calendar_id or False
         if res_obj:
             if not self.calendar_id: self.calendar_id = res_obj.id
-            pr = res_obj.perm_read()[0]
+            pr = res_obj.perm_read(context=context, details=False)[0]
             self.create_date = pr.get('create_date')
             self.write_date = pr.get('write_date') or pr.get('create_date')
             self.displayname = res_obj.name
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index ae9aa909642..9ca6b924e4d 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -335,8 +335,8 @@ class CalDAV(object):
             if cal_data.name.lower() in self.__attribute__:
                 if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
                     self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
-                    date_utc = cal_data.value.astimezone(pytz.utc)
-                    self.ical_set(cal_data.name.lower(), date_utc, 'value')
+                    date_local = cal_data.value.astimezone(_server_tzinfo)
+                    self.ical_set(cal_data.name.lower(), date_local, 'value')
                     continue
                 self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
         vals = map_data(cr, uid, self, context=context)
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 16bbcd41c83..5741a7223e0 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     'name': 'Integrated Document Management System',
-    'version': '1.1',
+    'version': '2.0',
     'category': 'Generic Modules/Others',
     'description': """This is a complete document management system:
     * User Authentication
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index e3b37914f8c..df2b12b5456 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -21,11 +21,11 @@
 import logging
 import os
 import tempfile
+from subprocess import Popen, PIPE
 
 class NhException(Exception):
     pass
 
-from subprocess import Popen, PIPE
 
 class indexer(object):
     """ An indexer knows how to parse the content of some file.
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index a9b8b7167fc..67105e6bd05 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -66,6 +66,7 @@ class node_context(object):
     A context is a set of persistent data, which may influence the structure
     of the nodes. All other transient information during a data query should
     be passed down with function arguments.
+    """
     cached_roots = {}
     node_file_class = None
 
@@ -101,7 +102,8 @@ class node_context(object):
 
     def get_uri(self, cr,  uri):
         """ Although this fn passes back to doc.dir, it is needed since
-        it is a potential caching point """
+            it is a potential caching point.
+        """
         (ndir, duri) =  self._dirobj._locate_child(cr, self.uid, self.rootdir, uri, None, self)
         while duri:
             ndir = ndir.child(cr, duri[0])
@@ -495,7 +497,10 @@ class node_dir(node_database):
         self.write_date = dirr and (dirr.write_date or dirr.create_date) or False
         self.content_length = 0
         self.unixperms = 040750
-        self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+        try:
+            self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+        except Exception:
+            self.uuser = 'nobody'
         self.ugroup = mkdosname(dirr.company_id and dirr.company_id.name, default='nogroup')
         self.uidperms = dirr.get_dir_permissions()
         if dctx:
@@ -692,7 +697,10 @@ class node_res_dir(node_class):
         self.write_date = dirr.write_date or dirr.create_date
         self.content_length = 0
         self.unixperms = 040750
-        self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+        try:
+            self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+        except Exception:
+            self.uuser = 'nobody'
         self.ugroup = mkdosname(dirr.company_id and dirr.company_id.name, default='nogroup')
         self.uidperms = dirr.get_dir_permissions()
         self.res_model = dirr.ressource_type_id and dirr.ressource_type_id.model or False
@@ -1003,9 +1011,9 @@ class node_res_obj(node_class):
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
-        res_obj = dirobj.pool.get(self.context.context['res_model'])
+        res_obj = dirobj.pool.get(self.res_model)
 
-        object2 = res_obj.browse(cr, uid, self.context.context['res_id']) or False
+        object2 = res_obj.browse(cr, uid, self.res_id) or False
 
         obj = dirobj.browse(cr, uid, self.dir_id)
         if obj and (obj.type == 'ressource') and not object2:
@@ -1079,7 +1087,10 @@ class node_file(node_class):
             elif not parent.check_perms('w'):
                 self.uidperms = 4
     
-        self.uuser = (fil.user_id and fil.user_id.login) or 'nobody'
+        try:
+            self.uuser = (fil.user_id and fil.user_id.login) or 'nobody'
+        except Exception:
+            self.uuser = 'nobody'
         self.ugroup = mkdosname(fil.company_id and fil.company_id.name, default='nogroup')
 
         # This only propagates the problem to get_data. Better
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index f69a0bbbaad..9c16e7dde55 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -363,7 +363,6 @@ class abstracted_fs(object):
         """Remove the specified directory."""
         cr, node, rem = datacr
         assert node
-        cr = self.get_node_cr(node)
         node.rmcol(cr)
         cr.commit()
 
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
index a3e9bd5cb40..a51f259f44e 100644
--- a/addons/document_ftp/test/document_ftp_test3.yml
+++ b/addons/document_ftp/test/document_ftp_test3.yml
@@ -5,10 +5,10 @@
         from document_ftp import test_easyftp as te
         ftp = te.get_plain_ftp(timeout=1.0)
 -
-    I create a folder called '������������ ��������' in the server.
+    I create in the server a folder called 'Äïêéìáóôéêüò ÖÜêåëëïò'
 -
     !record {model: document.directory, id: dir_itests }:
-        name: '������������ ��������'
+        name: 'Äïêéìáóôéêüò ÖÜêåëëïò'
         parent_id: document.dir_root
 -
     And then I create another folder, under it, through FTP
@@ -16,68 +16,68 @@
     !python {model: ir.attachment}: |
         cr.commit()
         from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������')
-        ftp.mkd("�������� ��� ����")
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò')
+        ftp.mkd("ÖÜêåëëïò áðü êÜôù")
 -
     I check that this folder exists at the server
 -
-    !assert {model: document.directory, id: , search: "[('name','=','�������� ��� ����')]" }:
+    !assert {model: document.directory, id: , search: "[('name','=','ÖÜêåëëïò áðü êÜôù')]" }:
       - parent_id != False
 -
-    I login with FTP and check that '������������ ��������' is there
+    I login with FTP and check that 'Äïêéìáóôéêüò ÖÜêåëëïò' is there
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����')
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
 -
-    I create a file named '������' into that folder
+    I create a file named 'ÄïêéìÞ' into that folder
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����')
-        fdata = StringIO('������� �� utf-8')
-        ftp.storbinary('STOR ������.txt', fdata)
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
+        fdata = StringIO('êåßìåíï ìå utf-8')
+        ftp.storbinary('STOR ÄïêéìÞ.txt', fdata)
 -
-    I remove the '������.txt' file
+    I remove the 'ÄïêéìÞ.txt' file
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����')
-        ftp.delete('������.txt')
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
+        ftp.delete('ÄïêéìÞ.txt')
 -
-    I rename '�������� ��� ����' into '�����'
+    I rename 'ÖÜêåëëïò áðü êÜôù' into 'Üëëïò'
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������')
-        ftp.rename("�������� ��� ����", "�����")
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò')
+        ftp.rename("ÖÜêåëëïò áðü êÜôù", "Üëëïò")
 -
-    I place a file 'file �3' in '�����'
+    I place a file 'file Ö3' in 'Üëëïò'
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
-        fdata = StringIO('�� ���� �������')
-        ftp.storbinary('STOR file �3.txt', fdata)
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
+        fdata = StringIO('êé Üëëï êåßìåíï')
+        ftp.storbinary('STOR file Ö3.txt', fdata)
 -
     I rename the file into file+range(1..200) (large filename)
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
         vuvuzela = 'b'+''.join('z' * 200)+'!'
-        ftp.rename("file �3.txt", vuvuzela)
+        ftp.rename("file Ö3.txt", vuvuzela)
 -
     I delete the file with the large name
 -
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
         vuvuzela = 'b'+''.join('z' * 200)+'!'
         ftp.delete(vuvuzela)
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 7e4bb69fa0a..548c9539b96 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -81,7 +81,14 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
 
     def setup(self):
         self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
-        self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port)
+        addr, port = self.server.server_name, self.server.server_port
+        server_proto = getattr(self.server,'proto', 'http').lower()
+        try:
+            addr, port = self.request.getsockname()
+        except Exception, e:
+            self.log_error("Cannot calculate own address:" , e)
+        # Too early here to use self.headers
+        self.baseuri = "%s://%s:%d/"% (server_proto, addr, port)
         self.IFACE_CLASS  = openerp_dav_handler(self, self.verbose)
 
     def copymove(self, CLASS):

From 60f2488febb54174ff0b8e2dfd51b5c1963efb41 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 14:27:33 +0300
Subject: [PATCH 103/294] Document, caldav: inhibit features not found on trunk
 server.

bzr revid: p_christ@hol.gr-20101012112733-sqcnvobi5q8ztj3l
---
 addons/caldav/caldav_node.py     |  5 ++-
 addons/caldav/orm_utils.py       |  3 +-
 addons/document/dict_tools.py    | 57 ++++++++++++++++++++++++++++++++
 addons/document_webdav/dav_fs.py |  5 ++-
 addons/document_webdav/nodes.py  |  6 +++-
 5 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 addons/document/dict_tools.py

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index e1181726bbf..d91db94fc90 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -26,7 +26,10 @@ import logging
 import StringIO
 from orm_utils import get_last_modified
 
-from tools.dict_tools import dict_merge, dict_merge2
+try:
+    from tools.dict_tools import dict_merge, dict_merge2
+except ImportError:
+    from document.dict_tools import dict_merge, dict_merge2
 
 # TODO: implement DAV-aware errors, inherit from IOError
 
diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py
index badacc855c9..ab0b4bbb8db 100644
--- a/addons/caldav/orm_utils.py
+++ b/addons/caldav/orm_utils.py
@@ -41,8 +41,7 @@ if True: # we need this indentation level ;)
 
         cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) + 
                     from_clause + where_str ,
-                    where_clause_params,
-                    debug=self._debug)
+                    where_clause_params)
         res = cr.fetchall()
         return res[0][0]
 
diff --git a/addons/document/dict_tools.py b/addons/document/dict_tools.py
new file mode 100644
index 00000000000..10d2fdc69f3
--- /dev/null
+++ b/addons/document/dict_tools.py
@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+# Copyright P. Christeas <p_christ@hol.gr> 2008-2010
+# Copyright 2010 OpenERP SA. http://www.openerp.com
+#
+# This program 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; version 2 of the License.
+#
+# 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+###############################################################################
+
+
+def dict_merge(*dicts):
+    """ Return a dict with all values of dicts
+    """
+    res = {}
+    for d in dicts:
+        res.update(d)
+    return res
+
+def dict_merge2(*dicts):
+    """ Return a dict with all values of dicts.
+        If some key appears twice and contains iterable objects, the values
+        are merged (instead of overwritten).
+    """
+    res = {}
+    for d in dicts:
+        for k in d.keys():
+            if k in res and isinstance(res[k], (list, tuple)):
+                res[k] = res[k] + d[k]
+            elif k in res and isinstance(res[k], dict):
+                res[k].update(d[k])
+            else:
+                res[k] = d[k]
+    return res
+
+def dict_filter(srcdic, keys, res=None):
+    ''' Return a copy of srcdic that has only keys set.
+    If any of keys are missing from srcdic, the result won't have them, 
+    either.
+    @param res If given, result will be updated there, instead of a new dict.
+    '''
+    if res is None:
+        res = {}
+    for k in keys:
+        if k in srcdic:
+            res[k] = srcdic[k]
+    return res
+
+#eof
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 7deb18f714c..5b5b1341679 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -37,7 +37,10 @@ import urllib
 from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 from cache import memoize
 from tools import misc
-from tools.dict_tools import dict_merge2
+try:
+    from tools.dict_tools import dict_merge2
+except ImportError:
+    from document.dict_tools import dict_merge2
 
 CACHE_SIZE=20000
 
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 67dc9fd2a4f..8bea54ab7d3 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -22,7 +22,11 @@
 
 from document import nodes
 from tools.safe_eval import safe_eval as eval
-from tools.dict_tools import dict_filter
+try:
+    from tools.dict_tools import dict_filter
+except ImportError:
+    from document.dict_tools import dict_filter
+
 import urllib
 
     

From 567f02338b5c7e30d51fc9f0ec5d630d3cee7449 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 17:13:30 +0530
Subject: [PATCH 104/294] [FIX] project: calculate planned hours, effective
 hours, total hours and progress bar when tasks and tasks work modified

bzr revid: hmo@tinyerp.com-20101012114330-37n22hl9qmczwmfm
---
 addons/project/project.py            | 82 ++++++++++++++++++++++++----
 addons/project/test/test_project.yml | 17 ------
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 27bbb2f8c7f..25e2421e758 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -129,7 +129,7 @@ class project(osv.osv):
                 state<>'cancelled'
             GROUP BY
                 project_id''',(tuple(all_projects),))
-        progress = dict(map(lambda x: (x[0], (x[1], x[2], x[3])), cr.fetchall()))
+        progress = dict(map(lambda x: (x[0], (x[1] or 0.0, x[2] or 0.0, x[3] or 0.0)), cr.fetchall()))
 
         user_uom, def_uom = self._get_user_and_default_uom_ids(cr, uid)
         for project in self.browse(cr, uid, par_child_projects.keys(), context=context):
@@ -145,12 +145,10 @@ class project(osv.osv):
                 s[0] = uom_obj._compute_qty(cr, uid, user_uom, s[0], def_uom)
                 s[1] = uom_obj._compute_qty(cr, uid, user_uom, s[1], def_uom)
                 s[2] = uom_obj._compute_qty(cr, uid, user_uom, s[2], def_uom)
-
             if project.state == 'close':
                 progress_rate = 100.0
             else:
                 progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
-
             res[project.id] = {
                 'planned_hours': s[0],
                 'effective_hours': s[2],
@@ -159,6 +157,23 @@ class project(osv.osv):
             }
         return res
 
+    def _get_project_task(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        result = {}
+        for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
+            if task.project_id: result[task.project_id.id] = True
+        return result.keys()
+
+    def _get_project_work(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        result = {}
+        for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
+            if work.task_id and work.task_id.project_id: result[work.task_id.project_id.id] = True
+        return result.keys()
+
+
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for proj in self.browse(cr, uid, ids):
             if proj.tasks:
@@ -174,10 +189,30 @@ class project(osv.osv):
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", store=True),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.", store=True),
-        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.", store=True),
-        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.", store=True),
+        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", 
+            store = {
+                'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
+                'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours'], 10),
+                'project.task.work': (_get_project_work, ['hours'], 10),
+            }),
+        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.", 
+            store = {
+                'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
+                'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours'], 10),
+                'project.task.work': (_get_project_work, ['hours'], 10),
+            }),
+        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
+            store = {
+                'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
+                'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours'], 10),
+                'project.task.work': (_get_project_work, ['hours'], 10),
+            }),
+        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
+            store = {
+                'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
+                'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours'], 10),
+                'project.task.work': (_get_project_work, ['hours'], 10),
+            }),
         'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -414,6 +449,14 @@ class task(osv.osv):
                     res[task.id] = False
         return res
 
+    def _get_task(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        result = {}
+        for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
+            if work.task_id: result[work.task_id.id] = True
+        return result.keys()
+
     _columns = {
         'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
@@ -433,12 +476,27 @@ class task(osv.osv):
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
         'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
-        'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', store=True, help="Computed using the sum of the task work done."),
+        'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
+            store = {
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task.work': (_get_task, ['hours'], 10),
+            }),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
-        'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."),
-        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", store=True, help="Computed as: Time Spent / Total Time."),
-        'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as difference of the time estimated by the project manager and the real time to close the task."),
-
+        'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
+            store = {
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task.work': (_get_task, ['hours'], 10),
+            }),
+        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
+            store = {
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task.work': (_get_task, ['hours'], 10),
+            }),
+        'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
+            store = {
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task.work': (_get_task, ['hours'], 10),
+            }),
         'user_id': fields.many2one('res.users', 'Assigned to'),
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index d57cc274366..bc65ab67f77 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -136,7 +136,6 @@
        - planned_hours == 30
        - remaining_hours == 30
        - delay_hours == 0.0
-       - total_hours == 30
        - effective_hours == 0.0     
 - 
   Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
@@ -153,8 +152,6 @@
    !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 10 hours effective_hours must be equal to 10}:
        - remaining_hours == 20
        - effective_hours == 10.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours    
 - 
   Make a work task entry 'Training on OpenERP xml views' of 10 hours
 - 
@@ -170,8 +167,6 @@
    !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 20}:
        - remaining_hours == 10
        - effective_hours == 20.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours           
 - 
   Make a work task entry 'Training on workflows' of 10 hours        
 - 
@@ -187,8 +182,6 @@
    !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 30}:
        - remaining_hours == 0
        - effective_hours == 30.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours       
 - 
   Set remaining hours of 10 hours for reevaluating the task  
 - 
@@ -210,8 +203,6 @@
        - planned_hours == 30
        - remaining_hours == 10.0
        - effective_hours == 30.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours       
 - 
   Make a work task entry 'Training on reports and wizards' of 10 hours
 - 
@@ -228,8 +219,6 @@
        - planned_hours == 30
        - remaining_hours == 0
        - effective_hours == 40.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours
 - 
   Close the task
 - 
@@ -265,8 +254,6 @@
        - planned_hours == 30
        - remaining_hours == 10.0
        - effective_hours == 40.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours           
 - 
   Make a work task entry 'Training on yml' of 5 hours
 - 
@@ -283,8 +270,6 @@
        - planned_hours == 30
        - remaining_hours == 5.0
        - effective_hours == 45.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours    
 - 
   Close the task
 - 
@@ -302,8 +287,6 @@
        - planned_hours == 30
        - remaining_hours == 0.0
        - effective_hours == 45.0
-       - total_hours == effective_hours + remaining_hours
-       - delay_hours == total_hours - planned_hours     
 - 
   Close project 'OpenERP Training Programme'
 - 

From 829a82a598f9cbf872a488484c6277ad86bf2422 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 14:44:36 +0300
Subject: [PATCH 105/294] document: fix for directory.get_full_path()

The trunk ORM would call this function with dir_id=[id,] rather than
the pg84's dir_id=id argument.

bzr revid: p_christ@hol.gr-20101012114436-9xtfjm3oe1oj7d3f
---
 addons/document/document_directory.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 2b3aad859c0..0c49bb53952 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -126,6 +126,10 @@ class document_directory(osv.osv):
     def get_full_path(self, cr, uid, dir_id, context=None):
         """ Return the full path to this directory, in a list, root first
         """
+        if isinstance(dir_id, (tuple, list)):
+            assert len(dir_id) == 1
+            dir_id = dir_id[0]
+
         def _parent(dir_id, path):
             parent=self.browse(cr, uid, dir_id)
             if parent.parent_id and not parent.ressource_parent_type_id:

From e60ac8c09cd49b8231abc699cfdefd5b6cb4fb11 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 17:17:09 +0530
Subject: [PATCH 106/294] [FIX] project_long_term: typo

bzr revid: hmo@tinyerp.com-20101012114709-6xmskawchy8msv77
---
 addons/project_long_term/project_long_term_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 30acac99377..013b0b0b154 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -7,7 +7,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
         <!-- Users -->
         
         <record id="res_users_analyst" model="res.users">
-            <field name="name">Phoung</field>
+            <field name="name">Phuong</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="login">phu</field>
             <field name="password">phu</field>
@@ -19,7 +19,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="password">al</field>
         </record>
         <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Qwintin</field>
+            <field name="name">Quentin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">qdp</field>
             <field name="password">qdp</field>

From 258e6edff630270a9ac7b5b70ef67ca2c5cefe5f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 17:22:33 +0530
Subject: [PATCH 107/294] [IMP] project: add stage in search filter on task
 list view

bzr revid: hmo@tinyerp.com-20101012115233-dqul4w5a8mcuvxqz
---
 addons/project/project_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5afa16a092a..2cc959a21da 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -390,6 +390,8 @@
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
+                        <field name="type_id" widget="selection"/>
+                        <separator orientation="vertical"/>
                         <field name="project_id" select="1">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>

From 8ce30bcea65ae55572506e2f8b895192fc944305 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 12 Oct 2010 14:55:34 +0300
Subject: [PATCH 108/294] doc webdav: fix against older websrv_lib that has no
 getsockname()

bzr revid: p_christ@hol.gr-20101012115534-0un3ip9jpw8hia4g
---
 addons/document_webdav/webdav_server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 548c9539b96..299789bec11 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -84,9 +84,10 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
         addr, port = self.server.server_name, self.server.server_port
         server_proto = getattr(self.server,'proto', 'http').lower()
         try:
-            addr, port = self.request.getsockname()
+            if hasattr(self.request, 'getsockname'):
+                addr, port = self.request.getsockname()
         except Exception, e:
-            self.log_error("Cannot calculate own address:" , e)
+            self.log_error("Cannot calculate own address: %s" , e)
         # Too early here to use self.headers
         self.baseuri = "%s://%s:%d/"% (server_proto, addr, port)
         self.IFACE_CLASS  = openerp_dav_handler(self, self.verbose)

From 467edb6094f68da432d982a5660ff190c4e43538 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 17:38:50 +0530
Subject: [PATCH 109/294] [FIX] project_timesheet: fixed regression if task
 does not has project

bzr revid: hmo@tinyerp.com-20101012120850-h4nd4w3mf30ck8hr
---
 addons/project_timesheet/project_timesheet.py | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index d6ed37a8aae..f5480793adc 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -82,27 +82,28 @@ class project_work(osv.osv):
         user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
         if result['product_uom_id'] != default_uom:
             vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-        acc_id = obj_task.project_id.analytic_account_id.id
-        vals_line['account_id'] = acc_id
-        res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
-        if res.get('value'):
-            vals_line.update(res['value'])
-        vals_line['general_account_id'] = result['general_account_id']
-        vals_line['journal_id'] = result['journal_id']
-        vals_line['amount'] = 0.0
-        vals_line['product_uom_id'] = result['product_uom_id']
-        amount = vals_line['unit_amount']
-        prod_id = vals_line['product_id']
-        unit = False
-        timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
+        acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
+        if acc_id:
+            vals_line['account_id'] = acc_id
+            res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
+            if res.get('value'):
+                vals_line.update(res['value'])
+            vals_line['general_account_id'] = result['general_account_id']
+            vals_line['journal_id'] = result['journal_id']
+            vals_line['amount'] = 0.0
+            vals_line['product_uom_id'] = result['product_uom_id']
+            amount = vals_line['unit_amount']
+            prod_id = vals_line['product_id']
+            unit = False
+            timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
 
-        # Compute based on pricetype
-        amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
-            prod_id, amount, False, unit, context=context)
-        if amount_unit and 'amount' in amount_unit.get('value',{}):
-            updv = { 'amount': amount_unit['value']['amount'] }
-            obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
-        vals['hr_analytic_timesheet_id'] = timeline_id
+            # Compute based on pricetype
+            amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
+                prod_id, amount, False, unit, context=context)
+            if amount_unit and 'amount' in amount_unit.get('value',{}):
+                updv = { 'amount': amount_unit['value']['amount'] }
+                obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
+            vals['hr_analytic_timesheet_id'] = timeline_id
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -196,6 +197,8 @@ class task(osv.osv):
             for task_obj in task_obj_l:
                 if len(task_obj.work_ids):
                     for task_work in task_obj.work_ids:
+                        if not task_work.hr_analytic_timesheet_id:
+                            continue
                         line_id = task_work.hr_analytic_timesheet_id.id
                         if vals.get('project_id',False):
                             vals_line['account_id'] = acc_id

From 78084e8c40fee2478fec2137b6576d001c55a14f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 17:43:48 +0530
Subject: [PATCH 110/294] [FIX] project_scrum: put scrum_id as a readonly in
 task form view

bzr revid: hmo@tinyerp.com-20101012121348-2bbficp0aezyny8l
---
 addons/project_scrum/project_scrum_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..e43407b1e59 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -558,7 +558,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@string='Extra Info']/group/field[@name='sequence']" position="after">
-                    <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" />
+                    <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" readonly="1"/>
                 </xpath>
             </field>
         </record>

From 63484b5e311169b264e85cd1bbbce5562b6b7a20 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 17:48:27 +0530
Subject: [PATCH 111/294] [FIX] project: In task list view, red lines for
 ovepassed deadline

bzr revid: hmo@tinyerp.com-20101012121827-rwn3nhpvnwn0q0k4
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 2cc959a21da..39417cbd918 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -302,7 +302,7 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&gt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','open'))" string="Tasks">
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>

From 56249a5de31f1c725c1ea0c9caf6c13df9d1c0e9 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 18:12:23 +0530
Subject: [PATCH 112/294] [FIX] project_issue: remove domain in type_id on
 project.issue

bzr revid: hmo@tinyerp.com-20101012124223-29boouihsbe4sj0d
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index d892c8cdf87..888ca29c3d6 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -177,7 +177,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
-        'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('object_id.model', '=', 'project.issue')]"),
+        'type_id': fields.many2one ('project.task.type', 'Resolution'),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),

From aac1861009d4fcf3c867b1807949dd79ae784f93 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 18:42:05 +0530
Subject: [PATCH 113/294] [FIX] project_issue: progress bar should update on
 task progress

bzr revid: hmo@tinyerp.com-20101012131205-3ea7dnljgxwlzx1j
---
 addons/project_issue/project_issue.py | 36 ++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 888ca29c3d6..f58cc9f1d20 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -141,6 +141,35 @@ class project_issue(crm.crm_case, osv.osv):
                 else:
                     res[issue.id][field] = abs(float(duration))
         return res
+
+    def _get_issue_task(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        issues = []
+        issue_pool = self.pool.get('project.issue')
+        for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
+            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])            
+        return issues
+
+    def _get_issue_work(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        issues = []
+        issue_pool = self.pool.get('project.issue')
+        for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
+            if work.task_id:
+                issues += issue_pool.search(cr, uid, [('task_id','=',work.task_id.id)])
+        return issues
+
+    def _hours_get(self, cr, uid, ids, field_names, args, context=None):
+        task_pool = self.pool.get('project.task')
+        res = {}
+        for issue in self.browse(cr, uid, ids, context=context):
+            progress = 0.0
+            if issue.task_id:
+                progress = task_pool._hours_get(cr, uid, [issue.task_id.id], field_names, args, context=context)[issue.task_id.id]['progress']
+            res[issue.id] = {'progress' : progress}     
+        return res        
     
     _columns = {
         'id': fields.integer('ID'),
@@ -193,7 +222,12 @@ class project_issue(crm.crm_case, osv.osv):
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
-        'progress': fields.related('task_id', 'progress', string='Progress (%)',group_operator="avg", store=True),
+        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
+            store = {
+                'project.issue': (lambda self, cr, uid, ids, c={}: ids, ['task_id'], 10),
+                'project.task': (_get_issue_task, ['progress'], 10),
+                'project.task.work': (_get_issue_work, ['hours'], 10),
+            }),
     }
 
     def _get_project(self, cr, uid, context):

From 2648dff04dd9d5a0ebababc0af9cc5e156cfc27b Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 18:47:59 +0530
Subject: [PATCH 114/294] [IMP] project,project_gtd,project_scrum : improved
 Project Management->Tasks and Scrum->Product Backlogs

bzr revid: jas@tinyerp.com-20101012131759-m2o39yruaz9qcpht
---
 addons/project/project_view.xml                      | 4 ++--
 addons/project/wizard/project_task_delegate_view.xml | 2 +-
 addons/project_gtd/project_gtd.py                    | 2 +-
 addons/project_scrum/project_scrum_view.xml          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6efc64dd494..af29d46d9c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,7 +112,7 @@
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1">
                             <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/>
-                       </field> 
+                       </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
@@ -380,7 +380,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index dc299826419..e5eeed35573 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -18,7 +18,7 @@
                       <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
 		                    <field name="planned_hours_me"  widget="float_time" colspan="4"/>
-           	                <field name="prefix" string="Validatation Task Title" colspan="4"/>
+           	                <field name="prefix" string="Validation Task Title" colspan="4"/>
                             <field name="state" colspan="4"/>
 		              </group>
                       <separator string="" colspan="4"/>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 47c7c02cba8..972b89c0cbb 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -107,7 +107,7 @@ class project_task(osv.osv):
         if res['type'] == 'search':
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
             search_extended ='''<newline/><group col="%d" expand="0" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 14a1c84e1d9..2aa7771f89a 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -141,7 +141,7 @@
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Backlogs"/>
                         <separator orientation="vertical"/>
-                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
+                        <filter string="Edit" icon="gtk-execute" domain="[]" context="{'set_editable':'1'}"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id"/>

From 802541e5c78daac2cfc2a1273780193306ba5522 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:51:51 +0530
Subject: [PATCH 115/294] [IMP] Project->Long Term Planning--Changes Demo data
 for user:Projects Phases--Useability should be availablity,rename group by
 user into responsible and default group on project,top area field
 arrange:Resources Allocations--change icon in group by Project and resource

bzr revid: ron@tinyerp.com-20101012132151-39z9a08pwj71c7pt
---
 addons/document/board_document_view.xml       |  1 +
 addons/project_long_term/project_long_term.py | 32 ++++++++--------
 .../project_long_term_demo.xml                | 26 ++++++-------
 .../project_long_term_view.xml                | 37 +++++++++----------
 4 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 7ba8c498271..8f102f5936d 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -26,6 +26,7 @@
                             <action
                                 string="Files by Resource Type"
                                 name="%(document.action_view_document_by_resourcetype_graph)d"
+                                view_mode="graph,tree"
                                 />
 
                             <action
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 2caf36766b0..e843c6952a7 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -91,7 +91,7 @@ class project_phase(osv.osv):
        model_data_obj = self.pool.get('ir.model.data')
        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
-    
+
     def _compute(self, cr, uid, ids, context=None):
         res = {}
         if not ids:
@@ -145,7 +145,7 @@ class project_phase(osv.osv):
             project_id = project_obj.browse(cr, uid, project, context=context)
             result['date_start'] = project_id.date_start
         return {'value': result}
-    
+
     def onchange_days(self, cr, uid, ids, project, context=None):
         result = {}
         for id in ids:
@@ -221,7 +221,7 @@ class project_phase(osv.osv):
                 cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
                 if cal_id:
                     calendar_id = cal_id
-        
+
             avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
             # Change the date_start and date_end
             # for previous and next phases respectively based on valid condition
@@ -234,7 +234,7 @@ class project_phase(osv.osv):
                     if prv_phase.id == phase.id:
                         continue
                     self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
-                        
+
             if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
                 dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
                 work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
@@ -244,7 +244,7 @@ class project_phase(osv.osv):
                     if next_phase.id == phase.id:
                         continue
                     self._check_date_end(cr, uid, next_phase, dt_end, context=context)
-                    
+
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -295,7 +295,7 @@ class project_phase(osv.osv):
         Schedule phase with the start date till all the next phases are completed.
         @param: start_dsate : start date for the phase
         @param: calendar_id : working calendar of the project
-        """ 
+        """
         if context is None:
             context = {}
         resource_pool = self.pool.get('resource.resource')
@@ -306,7 +306,7 @@ class project_phase(osv.osv):
         for phase in self.browse(cr, uid, ids, context=context):
             if not phase.responsible_id:
                 raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
-            
+
             phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
             avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
             duration = str(avg_hours) + 'H'
@@ -371,7 +371,7 @@ class project_phase(osv.osv):
             if not start_date and phase.project_id.date_start:
                 start_date = phase.project_id.date_start
             if not start_date:
-                start_date = datetime.now().strftime("%Y-%m-%d")                    
+                start_date = datetime.now().strftime("%Y-%m-%d")
             resources = resources_list.get(phase.id, [])
             calendar_id = phase.project_id.resource_calendar_id.id
             task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
@@ -398,7 +398,7 @@ class project_resource_allocation(osv.osv):
         'user_id': fields.related('resource_id', 'user_id', type='many2one', relation="res.users", string='User'),
         'date_start': fields.date('Start Date', help="Starting Date"),
         'date_end': fields.date('End Date', help="Ending Date"),
-        'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
+        'useability': fields.float('Availability', help="Usability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
         'useability': 100,
@@ -460,19 +460,19 @@ class project(osv.osv):
         resource_pool = self.pool.get('resource.resource')
         if context is None:
             context = {}
-        
+
         resources_list = self.generate_members(cr, uid, ids, context=context)
         return_msg = {}
         for project in self.browse(cr, uid, ids, context=context):
             start_date = project.date_start
             if not start_date:
-                start_date = datetime.now().strftime("%Y-%m-%d")                    
+                start_date = datetime.now().strftime("%Y-%m-%d")
             resources = resources_list.get(project.id, [])
             calendar_id = project.resource_calendar_id.id
             task_ids = task_pool.search(cr, uid, [('project_id', '=', project.id),
                                               ('state', 'in', ['draft', 'open', 'pending'])
                                               ])
-            
+
 
             if task_ids:
                 task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
@@ -483,7 +483,7 @@ class project(osv.osv):
                 else:
                     return_msg["warning"] = return_msg["warning"] + "\n" + warning_msg
 
-        return return_msg    
+        return return_msg
 
 project()
 
@@ -506,7 +506,7 @@ class project_task(osv.osv):
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
     }
-    
+
     def generate_schedule(self, cr, uid, ids, resources, calendar_id, start_date, context=None):
         """
         Schedule the tasks according to resource available and priority.
@@ -556,10 +556,10 @@ class project_task(osv.osv):
                         if task_resource.__name__ == task_resource:
                             real_resource = task_resource
                             break
-                
+
                 task = create_tasks(task_number, hours, priorty, real_resource)
                 task_number += 1
-        
+
 
         face_projects = Task.BalancedProject(Project)
         loop_no = 0
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 30acac99377..4de53c0f38d 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-<!-- 
+<!--
 This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
         <!-- Users -->
-        
+
         <record id="res_users_analyst" model="res.users">
-            <field name="name">Phoung</field>
+            <field name="name">Phuong</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="login">phu</field>
             <field name="password">phu</field>
@@ -19,7 +19,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="password">al</field>
         </record>
         <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Qwintin</field>
+            <field name="name">Quentin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">qdp</field>
             <field name="password">qdp</field>
@@ -91,8 +91,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
-        
-        
+
+
 
         <!-- Projects -->
         <record id="project_integrate_openerp" model="project.project">
@@ -101,12 +101,12 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="type">normal</field>
             <field name="description">Integrate an Sale and Warehouse Management.</field>
             <field eval="[(6, 0, [
-                    ref('res_users_analyst'), 
-                    ref('res_users_project_manager'), 
-                    ref('res_users_technical_leader'), 
-                    ref('res_users_developer'), 
-                    ref('res_users_designer'), 
-                    ref('res_users_tester'), 
+                    ref('res_users_analyst'),
+                    ref('res_users_project_manager'),
+                    ref('res_users_technical_leader'),
+                    ref('res_users_developer'),
+                    ref('res_users_designer'),
+                    ref('res_users_tester'),
                     ref('res_users_finacial_manager')])]" name="members"/>
             <field name="user_id" ref="res_users_project_manager"/>
             <field name="name">Integrate an Sale and Warehouse Management.</field>
@@ -213,7 +213,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="resource_id" ref="resource_project_manager"/>
             <field name="phase_id" ref="project_phase_5"/>
         </record>
-        
+
         <record id="resource_allocation_9" model="project.resource.allocation">
             <field name="resource_id" ref="resource_analyst"/>
             <field name="phase_id" ref="project_phase_6"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6575d2e03ae..bb8e05770ed 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -81,9 +81,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -111,21 +111,18 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-	                    <group colspan="2" col="2">
-	                        <field name="name" select="1"/>
-	                        <field name="date_start"/>
-	                    </group>
-	                    <group colspan="2" col="4">
-	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
-                           <newline/>
-	                       <field name="duration" colspan="1" on_change="onchange_days(project_id)" />
-                           <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-	                    </group>
-	                    <group colspan="2" col="2">
-	                       <field name="responsible_id"/>
-	                       <field name="date_end"/>
-                    	</group>
-					</group>
+                        <group colspan="6" col="6" >
+                            <field name="name" select="1"/>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                            <field name="responsible_id"/>
+                        </group>
+                        <group colspan="6" col="6">
+                            <field name="date_start"/>
+                            <field name="duration"  on_change="onchange_days(project_id)" />
+                            <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
+                            <field name="date_end"/>
+                        </group>
+                     </group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
@@ -274,7 +271,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
@@ -291,7 +288,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid}</field>
+            <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
@@ -301,7 +298,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid}</field>
+ 			<field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 

From 2814e43651b33e156d129767bea86017e1c01161 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:11:21 +0530
Subject: [PATCH 116/294] [FIX] project_issue: correct domain on today button
 in issue list view

bzr revid: hmo@tinyerp.com-20101012134121-gubg71dirjqzpqny
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a5032047c2a..b7c7a58dec4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -213,7 +213,7 @@
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
+                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" groups="base.group_extended"/>

From 7b7323d09ed5ea68940a77fef64ef18f6257c8d2 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:19:40 +0530
Subject: [PATCH 117/294] [FIX] progress_issue: regression on board of project

bzr revid: hmo@tinyerp.com-20101012134940-ga9qe8glwe9rxyjj
---
 addons/project_issue/board_project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 62b31b7732e..ff8bf0801f1 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -126,7 +126,7 @@
             	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
 						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='Remaining Hours Per Project']" position="after">
+            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
 						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
             	</xpath>
             </field>

From bec19711583354c40d1f2b692817c758da41389f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:24:53 +0530
Subject: [PATCH 118/294] [FIX] project_messages: correct domain on today
 button

bzr revid: hmo@tinyerp.com-20101012135453-z5ecbvber6cllqvy
---
 addons/project_messages/project_messages_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index e8a013cf2ae..e270d2d001a 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -70,7 +70,7 @@
            <field name="arch" type="xml">
                <search string="Project Messages">
                		<group>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                			<field name="project_id"/>
                         <field name="from_id"/>

From 5c8330e35bd779105fe6aa4bc55585ef2e9b727a Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:37:35 +0530
Subject: [PATCH 119/294] [FIX] project: type

bzr revid: hmo@tinyerp.com-20101012140735-lq9o5pbjxnxgu609
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 39417cbd918..a55f24a8619 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -405,7 +405,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Stages" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>

From ecc70c87dc68c580813b4baa8a732e4b868c5a20 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:42:31 +0530
Subject: [PATCH 120/294] [IMP] project_issue: tooltip

bzr revid: hmo@tinyerp.com-20101012141231-vnfejjv3tti9zso3
---
 addons/project_issue/report/project_issue_report_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 365f217dee4..8cb5b157739 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -138,13 +138,13 @@
                             context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Current Day"/>
+                            domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
 
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Current Month"/>
+                            domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
 
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Current Year"/>
+                            domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
 
                   </group>
                </search>

From 2115bddc7a85e8fbcb33c11f0251935517314af4 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:51:09 +0530
Subject: [PATCH 121/294] [IMP] project_issue: typo

bzr revid: hmo@tinyerp.com-20101012142109-sm2yh0272o6hofpy
---
 addons/project_issue/report/project_issue_report.py       | 2 +-
 addons/project_issue/report/project_issue_report_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index ba4c2850c6e..d6f8cae363b 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -38,7 +38,7 @@ class project_issue_report(osv.osv):
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 8cb5b157739..eed71191d59 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">project.issue.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Project Issue">
+                <tree string="Issues Analysis">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
@@ -152,7 +152,7 @@
         </record>
 
         <record id="action_project_issue_report" model="ir.actions.act_window">
-            <field name="name">Issue Analysis</field>
+            <field name="name">Issues Analysis</field>
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
               <field name="view_mode">graph,tree</field>

From be7d482967d61b60890a9db918d431b49a9db3f6 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 19:57:51 +0530
Subject: [PATCH 122/294] [IMP] project: improve extended panel in tasks
 analysis

bzr revid: hmo@tinyerp.com-20101012142751-40ypdu1dtt1iblqs
---
 addons/project/report/project_report_view.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index cb30a4b861c..682a2c99485 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -108,14 +108,16 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                        <field name="priority"/>
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <field name="date_deadline"/>
-                        <field name="date_end"/>
-                        <separator orientation="vertical"/>
-                        <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <newline/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="date_deadline"/>                        
+                        <separator orientation="vertical"/>
+                        
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
@@ -129,9 +131,9 @@
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Current Day"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Current Month"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Current Year"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
                     </group>
                 </search>
             </field>

From d1664dadfc3927fd742a24027a2c9ea32e922d6e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 20:13:01 +0530
Subject: [PATCH 123/294] [IMP] project_scrum: remove project in meeting list
 view

bzr revid: hmo@tinyerp.com-20101012144301-kw3ww9euzei3z6kt
---
 addons/project_scrum/project_scrum_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index e43407b1e59..187f745d585 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -378,7 +378,6 @@
                 <tree string="Scrum Meeting">
                     <field name="date"/>
                     <field name="sprint_id"/>
-                    <field name="project_id"/>
                     <field name="user_id"/>
                 </tree>
             </field>

From 38c792a70ed23597ab4556e0e049f99de2a32c21 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Oct 2010 20:20:30 +0530
Subject: [PATCH 124/294] [IMP] project_Scrum: rename string

bzr revid: hmo@tinyerp.com-20101012145030-2cf2f2f5mx930tgr
---
 addons/project_scrum/project_scrum.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index f472369211b..a5c7d0178b6 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -319,7 +319,7 @@ class project_scrum_meeting(osv.osv):
         'question_blocks': fields.text('Blocks encountered'),
         'question_backlog': fields.text('Backlog Accurate'),
         'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks'),
-        'user_id': fields.related('sprint_id', 'scrum_master_id', type='many2one', relation='res.users', string='Responsible', readonly=True),
+        'user_id': fields.related('sprint_id', 'scrum_master_id', type='many2one', relation='res.users', string='Scrum Master', readonly=True),
     }
     #
     # TODO: Find the right sprint thanks to users and date

From 2e6d551372b260b301123ee6a387d07da1037d01 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 17:26:02 +0200
Subject: [PATCH 125/294] [IMP] do not delete res.log items after reading them

Just mark them as read

bzr revid: xmo@openerp.com-20101012152602-0adn5ed1ztgch2xa
---
 bin/addons/base/res/res_log.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 8165d05acac..39a9bac9983 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -33,20 +33,26 @@ class res_log(osv.osv_memory):
         'res_id': fields.integer('Object ID'),
         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
         'create_date': fields.datetime('Created Date', readonly=True),
+        'read': field.boolean('Read status', help="If this log item has been read, get() should not send it to the client")
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
         'create_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-        'context': lambda *args: "{}"
+        'context': lambda *args: "{}",
+        'read': False
     }
     _order='create_date desc'
 
     # TODO: do not return secondary log if same object than in the model (but unlink it)
-    def get(self, cr, uid, context={}):
-        ids = self.search(cr, uid, [('user_id','=',uid)], context=context)
-        result = self.read(cr, uid, ids, ['name','res_model','res_id'], context=context)
-        self.unlink(cr, uid, ids, context=context)
-        return result
+    def get(self, cr, uid, context=None):
+        unread_log_ids = self.search(cr, uid, [('user_id','=',uid),
+                                               ('read', '=', False)],
+                                     context=context)
+        unread_logs = self.read(cr, uid, unread_log_ids,
+                                ['name','res_model','res_id'],
+                                context=context)
+        self.write(cr, uid, ids, {'read': True}, context=context)
+        return unread_logs
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         res = []

From d515172dd982402c35b7296d86ca9f4c9e5f31b4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 17:26:30 +0200
Subject: [PATCH 126/294] [IMP] res.log: no need to use lambda for a constant
 in trunk

bzr revid: xmo@openerp.com-20101012152630-3sf9k6p3yc6e3s78
---
 bin/addons/base/res/res_log.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 39a9bac9983..1c0102c1c79 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -38,7 +38,7 @@ class res_log(osv.osv_memory):
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
         'create_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-        'context': lambda *args: "{}",
+        'context': "{}",
         'read': False
     }
     _order='create_date desc'
@@ -66,4 +66,3 @@ class res_log(osv.osv_memory):
         return tools.flatten(res)
 
 res_log()
-

From 040f2ce15b8d6c512116ae75cb7d8bad5e499b81 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 18:01:30 +0200
Subject: [PATCH 127/294] [FIX] use correct default callable for a datetime to
 get the current datetime as of the object's creation

Add staticmethods to fields.time, fields.date and fields.datetime so they can generate default values which they can actually consume

bzr revid: xmo@openerp.com-20101012160130-jwgl7cok853fiyap
---
 bin/addons/base/res/res_log.py |  7 +++----
 bin/osv/fields.py              | 29 +++++++++++++++++++++++++++++
 bin/tools/misc.py              |  5 ++++-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 1c0102c1c79..8d5f501866a 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -33,11 +33,11 @@ class res_log(osv.osv_memory):
         'res_id': fields.integer('Object ID'),
         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
         'create_date': fields.datetime('Created Date', readonly=True),
-        'read': field.boolean('Read status', help="If this log item has been read, get() should not send it to the client")
+        'read': fields.boolean('Read status', help="If this log item has been read, get() should not send it to the client")
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
-        'create_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'create_date': fields.datetime.now,
         'context': "{}",
         'read': False
     }
@@ -51,7 +51,7 @@ class res_log(osv.osv_memory):
         unread_logs = self.read(cr, uid, unread_log_ids,
                                 ['name','res_model','res_id'],
                                 context=context)
-        self.write(cr, uid, ids, {'read': True}, context=context)
+        self.write(cr, uid, unread_log_ids, {'read': True}, context=context)
         return unread_logs
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
@@ -64,5 +64,4 @@ class res_log(osv.osv_memory):
             logs.update({log.res_model: res_dict})
         res = map(lambda x: x.values(), logs.values())
         return tools.flatten(res)
-
 res_log()
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 64432ba15d7..f4442761bb8 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -32,6 +32,7 @@
 #   size
 #
 from collections import defaultdict
+import datetime as DT
 import string
 import netsvc
 import sys
@@ -189,14 +190,42 @@ class float(_column):
 
 class date(_column):
     _type = 'date'
+    @staticmethod
+    def today(*args):
+        """ Returns the current date in a format fit for being a
+        default value to a ``date`` field.
 
+        This method should be provided as is to the _defaults dict, it
+        should not be called.
+        """
+        return DT.date.today().strftime(
+            tools.DEFAULT_SERVER_DATE_FORMAT)
 
 class datetime(_column):
     _type = 'datetime'
+    @staticmethod
+    def now(*args):
+        """ Returns the current datetime in a format fit for being a
+        default value to a ``datetime`` field.
 
+        This method should be provided as is to the _defaults dict, it
+        should not be called.
+        """
+        return DT.datetime.now().strftime(
+            tools.DEFAULT_SERVER_DATETIME_FORMAT)
 
 class time(_column):
     _type = 'time'
+    @staticmethod
+    def now( *args):
+        """ Returns the current time in a format fit for being a
+        default value to a ``time`` field.
+
+        This method should be proivided as is to the _defaults dict,
+        it should not be called.
+        """
+        return DT.datetime.now().strftime(
+            tools.DEFAULT_SERVER_TIME_FORMAT)
 
 class binary(_column):
     _type = 'binary'
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index b3b3d7d9baa..81707156244 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -1323,7 +1323,10 @@ def get_server_timezone():
 
 
 DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
-DEFAULT_SERVER_DATETIME_FORMAT = DEFAULT_SERVER_DATE_FORMAT + " %H:%M:%S"
+DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
+DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
+    DEFAULT_SERVER_DATE_FORMAT,
+    DEFAULT_SERVER_TIME_FORMAT)
 
 def server_to_local_timestamp(src_tstamp_str, src_format, dst_format, dst_tz_name,
         tz_offset=True, ignore_unparsable_time=True):

From 727c9f171abec26a4824cfa742205cb23943fc88 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 18:23:48 +0200
Subject: [PATCH 128/294] [IMP] labelling of read field on res.log

bzr revid: xmo@openerp.com-20101012162348-94jbd5ufwgh1cm5c
---
 bin/addons/base/res/res_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 8d5f501866a..e475f2f6278 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -33,7 +33,7 @@ class res_log(osv.osv_memory):
         'res_id': fields.integer('Object ID'),
         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
         'create_date': fields.datetime('Created Date', readonly=True),
-        'read': fields.boolean('Read status', help="If this log item has been read, get() should not send it to the client")
+        'read': fields.boolean('Read', help="If this log item has been read, get() should not send it to the client")
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,

From 370f2a477d6439bc3ef3717cb3389c2352e12df4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 18:32:41 +0200
Subject: [PATCH 129/294] [IMP] add read status in the log views (and search)

bzr revid: xmo@openerp.com-20101012163241-ly59hdn375nfg0pt
---
 bin/addons/base/res/res_log_view.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 6dac6c044c6..aa85272cfac 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -13,6 +13,7 @@
                     <field name="user_id"/>
                     <field name="res_model"/>
                     <field name="create_date"/>
+                    <field name="read"/>
                 </search>
             </field>
         </record>
@@ -22,9 +23,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Logs">
-                    <field name="create_date"/>
                     <field name="name"/>
+                    <field name="create_date"/>
                     <field name="user_id"/>
+                    <field name="read"/>
                 </tree>
             </field>
         </record>
@@ -34,8 +36,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Logs">
+                  <group colspan="4" col="6">
                     <field name="name"/>
                     <field name="create_date"/>
+                    <field name="read" readonly="1"/>
+                  </group>
                     <group colspan="4" col="6">
                         <field name="user_id" />
                         <field name="res_model"/>

From 9efc48eadfb896a70197f8963caa6034d9b4856d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 19:09:04 +0200
Subject: [PATCH 130/294] [IMP] store res_log in database instead of memory,
 add index

bzr revid: xmo@openerp.com-20101012170904-o3woe7qpdie2pflv
---
 bin/addons/base/res/res_log.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index e475f2f6278..39fa8ec8969 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 import tools
 import time
 
-class res_log(osv.osv_memory):
+class res_log(osv.osv):
     _name = 'res.log'
     _columns = {
         'name': fields.char('Message', size=128, help='The logging message.', required=True),
@@ -37,12 +37,20 @@ class res_log(osv.osv_memory):
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
-        'create_date': fields.datetime.now,
         'context': "{}",
         'read': False
     }
     _order='create_date desc'
 
+    _index_name = 'res_log_uid_read'
+    def _auto_init(self, cr, context={}):
+        super(res_log, self)._auto_init(cr, context)
+        cr.execute('SELECT 1 FROM pg_indexes WHERE indexname=%s',
+                   (self._index_name,))
+        if not cr.fetchone():
+            cr.execute('CREATE INDEX %s ON res_log (user_id, read)' %
+                       self._index_name)
+
     # TODO: do not return secondary log if same object than in the model (but unlink it)
     def get(self, cr, uid, context=None):
         unread_log_ids = self.search(cr, uid, [('user_id','=',uid),

From 3af1a322d4a246a20df58bb9541b1671231e31ab Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 20:20:42 +0200
Subject: [PATCH 131/294] [IMP] tools.translate: log at debug level rather than
 warning when a translation fails

bzr revid: odo@openerp.com-20101012182042-d2wcjr2jru9k7j17
---
 bin/tools/translate.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 64c30af5600..e2b4d64949e 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -170,8 +170,8 @@ class GettextAlias(object):
                 cr.execute('SELECT value FROM ir_translation WHERE lang=%s AND type IN (%s, %s) AND src=%s', (lang, 'code','sql_constraint', source))
                 res_trans = cr.fetchone()
                 res = res_trans and res_trans[0] or source
-        except:
-            logger.warn('translation went wrong for string %s', repr(source))
+        except Exception:
+            logger.debug('translation went wrong for string %s', repr(source))
         finally:
             if is_new_cr:
                 cr.close()

From 22919bb1de3c44af9a21476d941cb651eee0f2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU=20-=20http=3A//www=2Eakretion=2Ecom?=
 <>
Date: Wed, 13 Oct 2010 00:52:59 +0530
Subject: [PATCH 132/294] [FIX]Speed improvement : Call of write() should go
 when there is vals

bzr revid: jvo@tinyerp.com-20101012192259-w3jbfm9ocb2zkr5m
---
 bin/osv/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index bc2d1b03d86..7e3529f9b6f 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3497,7 +3497,8 @@ class orm(orm_template):
             for val in updend:
                 if self._inherit_fields[val][0] == table:
                     v[val] = vals[val]
-            self.pool.get(table).write(cr, user, nids, v, context)
+            if v:
+                self.pool.get(table).write(cr, user, nids, v, context)
 
         self._validate(cr, user, ids, context)
 

From 9a1dfb0ce86d62e8ec40909d191fcbd819e6ab7c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 13 Oct 2010 04:58:23 +0000
Subject: [PATCH 133/294] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101013045823-oz0caykqxg95ofxd
---
 bin/addons/base/i18n/bg.po    | 27 ++++++++++----
 bin/addons/base/i18n/ca.po    | 27 ++++++++++----
 bin/addons/base/i18n/de.po    | 35 +++++++++++++-----
 bin/addons/base/i18n/el.po    | 27 ++++++++++----
 bin/addons/base/i18n/en_GB.po | 28 ++++++++++----
 bin/addons/base/i18n/es.po    | 27 ++++++++++----
 bin/addons/base/i18n/fa.po    | 27 ++++++++++----
 bin/addons/base/i18n/fi.po    | 43 ++++++++++++++++------
 bin/addons/base/i18n/fr.po    | 69 +++++++++++++++++++++++------------
 bin/addons/base/i18n/it.po    | 29 +++++++++++----
 bin/addons/base/i18n/lv.po    | 44 +++++++++++++++++-----
 bin/addons/base/i18n/mn.po    | 26 +++++++++----
 bin/addons/base/i18n/nl.po    | 29 +++++++++++----
 bin/addons/base/i18n/pl.po    | 29 +++++++++++----
 bin/addons/base/i18n/pt.po    | 26 +++++++++----
 bin/addons/base/i18n/pt_BR.po | 27 ++++++++++----
 bin/addons/base/i18n/ru.po    | 29 +++++++++++----
 bin/addons/base/i18n/tr.po    | 26 +++++++++----
 bin/addons/base/i18n/zh_CN.po | 20 +++++++---
 debian/po/fr.po               | 16 ++++----
 20 files changed, 443 insertions(+), 168 deletions(-)

diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index f81214368cc..779d1d960bc 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:37+0000\n"
+"PO-Revision-Date: 2010-10-12 08:03+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1405,8 +1405,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Въведете поле/израз, който връща �пи�ък. �апример, изберете поръчка за продажба в обект и ще може да имате цикъл върху редовете от поръчка за продажба. Израз = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Въведете поле/израз, който връща �пи�ък. �апример, изберете поръчка за "
+"продажба в обект и ще може да имате цикъл върху редовете от поръчка за "
+"продажба. Израз = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,8 +3250,13 @@ msgstr "Групиране по"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' �ъдържа твърде много точки. XML-идентификаторите не тр�бва да �ъдържат точки! Те �е използват за �вързване към данни от други модули, например в module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' �ъдържа твърде много точки. XML-идентификаторите не тр�бва да �ъдържат "
+"точки! Те �е използват за �вързване към данни от други модули, например в "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8165,7 +8176,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Others Partners"
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index b0963e20e96..33b033fe95f 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:36+0000\n"
+"PO-Revision-Date: 2010-10-12 07:54+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1405,8 +1405,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Introduïu el camp/expressió que tornarà la llista. Per ex. si seleccioneu la comanda de venda en Objecte podrà realitzar un bucle sobre les línies del comanda de venda. Expressió = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Introduïu el camp/expressió que tornarà la llista. Per ex. si seleccioneu "
+"la comanda de venda en Objecte podrà realitzar un bucle sobre les línies del "
+"comanda de venda. Expressió = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3243,8 +3249,13 @@ msgstr "Agrupa per"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' conté massa punts. ¡Els ids l'XML no haurien de contenir punts! Els punts es fan servir per referir-se a dades d'altres mòduls, per exemple mòdul.referència_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' conté massa punts. ¡Els ids l'XML no haurien de contenir punts! Els "
+"punts es fan servir per referir-se a dades d'altres mòduls, per exemple "
+"mòdul.referència_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8161,7 +8172,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached ID"
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index b6e59ea5a83..497b88f9d30 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-11 17:20+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 08:02+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1409,8 +1409,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Eingabe des Feldes/Ausdruckes, das die Liste erzeugt. zB Auswahl von sale order in Objekt und alle Averkaufsauftragszeilen werden ausgewählt.Ausdruck = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Eingabe des Feldes/Ausdruckes, das die Liste erzeugt. zB Auswahl von sale "
+"order in Objekt und alle Averkaufsauftragszeilen werden ausgewählt.Ausdruck "
+"= `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3243,8 +3249,13 @@ msgstr "Gruppiere nach"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' beinhaltet zu viele Punkte. XML IDs sollen keine Punkte enthalten. Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' beinhaltet zu viele Punkte. XML IDs sollen keine Punkte enthalten. "
+"Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4406,8 +4417,14 @@ msgstr "Objekt"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment:0
-msgid "This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables."
-msgstr "Das ist der Dateiname des Anhanges unter dem Ausdrucke gespeichert werden. Leer lassen, wenn Ausdrucke nicht gespeichert wreden sollen. Die Verwendung von Python Ausdrücken sowie Objekt und Zeitvariablen ist möglich."
+msgid ""
+"This is the filename of the attachment used to store the printing result. "
+"Keep empty to not save the printed reports. You can use a python expression "
+"with the object and time variables."
+msgstr ""
+"Das ist der Dateiname des Anhanges unter dem Ausdrucke gespeichert werden. "
+"Leer lassen, wenn Ausdrucke nicht gespeichert wreden sollen. Die Verwendung "
+"von Python Ausdrücken sowie Objekt und Zeitvariablen ist möglich."
 
 #. module: base
 #: model:res.country,name:base.ng
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index cd8089d36d0..e5a7c3b2bc6 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -6,13 +6,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:06+0000\n"
+"PO-Revision-Date: 2010-10-12 07:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -1405,8 +1405,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3248,8 +3254,13 @@ msgstr "Ομαδοποίηση Ανά"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' πε�ιέχει πολλές τελείες. Οι XML ταυτότητες (ids) δεν π�έπει να πε�ιέχουν τελείες! Οι τελείες χ�ησιμοποιο�νται σε αναφο�ές σε άλλες ενότητες όπως στο module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' πε�ιέχει πολλές τελείες. Οι XML ταυτότητες (ids) δεν π�έπει να "
+"πε�ιέχουν τελείες! Οι τελείες χ�ησιμοποιο�νται σε αναφο�ές σε άλλες ενότητες "
+"όπως στο module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8169,7 +8180,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #, python-format
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 68d70c6c092..3281e740ae9 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-29 08:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:42+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1402,8 +1402,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3237,8 +3243,12 @@ msgstr "Group By"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8146,5 +8156,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 6e5c5d3ca68..3f33a004833 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:09+0000\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1408,8 +1408,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
+"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
+"pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3247,8 +3253,13 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' contiene demasiados puntos. ¡Los ids del XML no deberían contener puntos! Los puntos se usan para referirse a datos de otros módulos, por ejemplo módulo.referencia_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contiene demasiados puntos. ¡Los ids del XML no deberían contener "
+"puntos! Los puntos se usan para referirse a datos de otros módulos, por "
+"ejemplo módulo.referencia_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8168,7 +8179,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached ID"
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index cc76d6182e3..e0e1eed02c6 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:36+0000\n"
+"PO-Revision-Date: 2010-10-12 07:54+0000\n"
 "Last-Translator: Sadegh Ismael Nattaj <nat@sethack.com>\n"
 "Language-Team: OpenERP Iran <info@openerp-iran.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
@@ -1402,8 +1402,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "�یلد/عبارتی که �هرست را باز خواهد گرداند وارد کنید. برای نمونه برگزیدن س�ارش �روش در شی، بنابراین شما می‌توانید در ردی�‌های س�ارشات �روش حلقه داشته باشید. عبارت = 'object.order_line'."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"�یلد/عبارتی که �هرست را باز خواهد گرداند وارد کنید. برای نمونه برگزیدن س�ارش "
+"�روش در شی، بنابراین شما می‌توانید در ردی�‌های س�ارشات �روش حلقه داشته "
+"باشید. عبارت = 'object.order_line'."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3238,8 +3244,13 @@ msgstr "گروه‌بندی برمبنای"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' دارای تیک نقطه بیش از حد است. شناسه‌های XML نباید دارای نقطه باشنتد!آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در module.reference_id آمده، هستند."
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' دارای تیک نقطه بیش از حد است. شناسه‌های XML نباید دارای نقطه "
+"باشنتد!آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در "
+"module.reference_id آمده، هستند."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8146,7 +8157,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached ID"
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index 165b6a929a6..e459976e809 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-24 05:45+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:53+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1395,8 +1395,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Syötä kenttä tai lauseke joka palauttaa listan. Esim. valitse myyntitilaus objektista ja voit luoda silmukan myyntitilauksen rivistä. Lauseke = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Syötä kenttä tai lauseke joka palauttaa listan. Esim. valitse myyntitilaus "
+"objektista ja voit luoda silmukan myyntitilauksen rivistä. Lauseke = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3232,8 +3238,13 @@ msgstr "Ryhmittele"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' sisältää liikaa pisteitä. XML ids eivät saa sisältää pisteitä ! Näitä käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id kerrotaan"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' sisältää liikaa pisteitä. XML ids eivät saa sisältää pisteitä ! Näitä "
+"käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id "
+"kerrotaan"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7739,8 +7750,16 @@ msgstr "Logo - Käytä kokoa noin 450x150 pikseliä."
 
 #. module: base
 #: help:res.lang,grouping:0
-msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be 1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as 106,500. Provided ',' as the thousand separator in each case."
-msgstr "Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa erottelun. Esimerkiksi luku 106500 (tuhaterottimena on käytetty pilkkua):[3,2,-1] esittää sen muodossa 1,06,500;[1,2,-1] esittää sen muodossa 106,50,0;[3] esittää sen muodossa 106,500."
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+"Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa "
+"erottelun. Esimerkiksi luku 106500 (tuhaterottimena on käytetty "
+"pilkkua):[3,2,-1] esittää sen muodossa 1,06,500;[1,2,-1] esittää sen "
+"muodossa 106,50,0;[3] esittää sen muodossa 106,500."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form_new
@@ -8123,7 +8142,7 @@ msgstr ""
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Käyttäjä virhe"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
@@ -8140,7 +8159,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached Model"
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index cbc62e30b72..69beee59704 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-29 08:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:54+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1408,8 +1408,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Entrez le champ/expression qui retournera la liste. Exemple: sélectionnez la commande client dans l'objet, et vous pourrez boucler sur les lignes de commandes client. Expression = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Entrez le champ/expression qui retournera la liste. Exemple: sélectionnez la "
+"commande client dans l'objet, et vous pourrez boucler sur les lignes de "
+"commandes client. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3249,7 +3255,9 @@ msgstr "Grouper par"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
 msgstr ""
 "\"%s\" contient trop de points. Les ids XML ne devraient pas contenir de "
 "points! Les points sont utilisés pour faire référence à des données d'autres "
@@ -8065,75 +8073,77 @@ msgstr "Vous ne pouvez pas avoir deux utilsiateurs avec le même login !"
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "Un raccourci pour ce menu existe déjà !"
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Vous ne pouvez pas avoir plusieurs enregistrements avec le même identifiant "
+"pour le même module !"
 
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
+msgstr "Votre contrat de maintenance est déjà enregistré dans le système !"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "Le nom d'un module doit être unique !"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "L'ID du certificat pour un module doit être unique !"
 
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
+msgstr "Le Code de la Fonction du Partenaire doit être unique !"
 
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
+msgstr "Le nom du Partenaire doit être unique !"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Le nom du pays doit être unique !"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Le code du pays doit être unique !"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "Le nom de la langue doit être unique !"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "Le code de la langue doit être unique"
 
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "Le nom du groupe doit être unique !"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Erreur de contrainte"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8144,6 +8154,10 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"L'opération n'a pas pu être terminée, probablement à la suite d'une :\n"
+"- suppression : vous avez essayer de supprimer un enregistrement auquel "
+"d'autres enregistrements font référence\n"
+"- création/modification : un champ requis n'a pas été correctement rempli"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8153,36 +8167,45 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[objet ayant pour référence : %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Erreur d'intégrité"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Erreur Utilisateur"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "Langue de base 'en_US' ne peut pas être supprimée !"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
+"Vous ne pouvez pas supprimer une langue qui est utilisée par un des "
+"utilisateurs !"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
+"Vous ne pouvez pas supprimer une langue qui est Active !\n"
+"Veuillez désactiver cette langue."
 
 #~ msgid "Others Partners"
 #~ msgstr "Autres partenaires"
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 473adcfb865..cf7e0535c12 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-29 08:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 08:02+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1408,8 +1408,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Inserire il campo/espressione che ritornerà la lista. Per esempio, selezionare l'ordine di vendita fra gli oggetti, è possibile evere un loop nelle righe dellìordine di vendita. Expression = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Inserire il campo/espressione che ritornerà la lista. Per esempio, "
+"selezionare l'ordine di vendita fra gli oggetti, è possibile evere un loop "
+"nelle righe dellìordine di vendita. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3246,8 +3252,13 @@ msgstr "Raggruppa per"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' contiene troppi punti. Gli IDS XML non devono contenere punti! Questi sono usati per riferisti ad altri modelli di dato, come in: module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
+"sono usati per riferisti ad altri modelli di dato, come in: "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8176,7 +8187,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached ID"
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index c5aca228c86..02a43f834c3 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-19 12:29+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -785,8 +785,15 @@ msgstr ">="
 
 #. module: base
 #: view:res.lang:0
-msgid "%%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0."
-msgstr "%%W - gada nedēļas numurs k� decim�ls skaitlis (pirmdiena k� pirm� nedēļas diena).Visas jauna gada dienas, kas iekrīt pirms pirm�s pirmdienas tiek ieskaitītas 0 nedēļ�."
+msgid ""
+"%W - Week number of the year (Monday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Monday "
+"are considered to be in week 0."
+msgstr ""
+"%W - gada nedēļas numurs k� decim�ls skaitlis (pirmdiena k� pirm� nedēļas "
+"diena).\r\n"
+"Visas jauna gada dienas, kas iekrīt pirms pirm�s pirmdienas tiek ieskaitītas "
+"0 nedēļ�."
 
 #. module: base
 #: field:res.partner.event,planned_cost:0
@@ -1389,8 +1396,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Ievadiet lauku/izteiksmi, kas atspoguļos sarakstu. Piem., izvēloties tirdzn. pasūtījumu noteikt� objekt�, var iegūt \"cilpu\" tirdzniecības saraksta rindai. Izteiksme = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Ievadiet lauku/izteiksmi, kas atspoguļos sarakstu. Piem., izvēloties tirdzn. "
+"pasūtījumu noteikt� objekt�, var iegūt \"cilpu\" tirdzniecības saraksta "
+"rindai. Izteiksme = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3231,7 +3244,9 @@ msgstr "Grupēt pēc"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
@@ -8134,7 +8149,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #, python-format
@@ -8337,3 +8354,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Padarīt noteikumus glob�lus, pretēj� gadījum� tie j�pieliek lietot�jam vai "
 #~ "grupai."
+
+#~ msgid ""
+#~ "%%W - Week number of the year (Monday as the first day of the week) as a "
+#~ "decimal number [00,53]. All days in a new year preceding the first Monday "
+#~ "are considered to be in week 0."
+#~ msgstr ""
+#~ "%%W - gada nedēļas numurs k� decim�ls skaitlis (pirmdiena k� pirm� nedēļas "
+#~ "diena).Visas jauna gada dienas, kas iekrīt pirms pirm�s pirmdienas tiek "
+#~ "ieskaitītas 0 nedēļ�."
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 93b90ef3e82..8c30a28818f 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-29 08:13+0000\n"
+"PO-Revision-Date: 2010-10-12 08:01+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1399,8 +1399,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Жаг�аалт гаргах талбар ��в�л ил�рхийл�л бичн�. Жнь. Object д��р борлуулалтын захиалгыг �онговол борлуулалтын захиалгын мөрүүд��р гүйх боломжтой болно. Expression = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Жаг�аалт гаргах талбар ��в�л ил�рхийл�л бичн�. Жнь. Object д��р борлуулалтын "
+"захиалгыг �онговол борлуулалтын захиалгын мөрүүд��р гүйх боломжтой болно. "
+"Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3226,8 +3232,12 @@ msgstr "Бүл�гл�х"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' нь х�т олон ц�г агуулж байна. XML id ц�г агуулах ё�гүй ! Бу�ад модульд байгаа өгөгдлийг module.reference_id байдлаар заахад ц�гийг х�р�гл�н�"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' нь х�т олон ц�г агуулж байна. XML id ц�г агуулах ё�гүй ! Бу�ад модульд "
+"байгаа өгөгдлийг module.reference_id байдлаар заахад ц�гийг х�р�гл�н�"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8103,7 +8113,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #, python-format
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index d364e1b388d..22856b19ad6 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-08 06:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 08:02+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-09 12:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1408,8 +1408,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Voer het veld/expressie in die de lijst teruggeeft. Bijv. kies verkooporder in object, en u kunt een lus hebben op verkoopopdrachtregel. Expressie = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Voer het veld/expressie in die de lijst teruggeeft. Bijv. kies verkooporder "
+"in object, en u kunt een lus hebben op verkoopopdrachtregel. Expressie = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3246,8 +3252,13 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' bevat teveel punten. XML-ids behoren geen punten te bevatten ! Punten worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' bevat teveel punten. XML-ids behoren geen punten te bevatten ! Punten "
+"worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8175,7 +8186,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Main Company"
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 2f772243af9..3f980010537 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-29 08:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:53+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1404,8 +1404,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Wprowadź pole/wyrażenie, które zwróci listę. Tzn. wybierz zamówienie sprzedaży w obiekcie, a będziesz mógł uzyskać pętlę na pozycjach zamówienia sprzedaży. Wyrażenie = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Wprowadź pole/wyrażenie, które zwróci listę. Tzn. wybierz zamówienie "
+"sprzedaży w obiekcie, a będziesz mógł uzyskać pętlę na pozycjach zamówienia "
+"sprzedaży. Wyrażenie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3239,8 +3245,13 @@ msgstr "Pogrupuj wg"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' zawiera zbyt dużo kropek. XML ids nie powinno zawierać kropek ! Kropki są stosowane di budowania odnośników do innych modułów jak module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' zawiera zbyt dużo kropek. XML ids nie powinno zawierać kropek ! Kropki "
+"są stosowane di budowania odnośników do innych modułów jak "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8157,7 +8168,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #, python-format
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 0886f8cacdc..9dda7254c18 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:37+0000\n"
+"PO-Revision-Date: 2010-10-12 08:03+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1404,8 +1404,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Preencha o campo/expressão que irá devolver a lista. Ex: Seleccione a ordem da venda no Objecto e terá acesso às linhas da ordem de venda. Expressão = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Preencha o campo/expressão que irá devolver a lista. Ex: Seleccione a ordem "
+"da venda no Objecto e terá acesso às linhas da ordem de venda. Expressão = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3238,8 +3244,12 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' contem demasiados pontos. Ids XML não devem conter pontos! Pontos são usados para referir dados de outros módulos, como em module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contem demasiados pontos. Ids XML não devem conter pontos! Pontos são "
+"usados para referir dados de outros módulos, como em module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8153,7 +8163,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached ID"
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index ffd25625bfb..90c7aebf8cc 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-29 08:12+0000\n"
+"PO-Revision-Date: 2010-10-12 07:48+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1404,8 +1404,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Entre com campo / expressão que devolverá a lista. Por exemplo. Selecione o pedido de vendas no objeto, e voce terá as linhas dos itens. Expressão = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Entre com campo / expressão que devolverá a lista. Por exemplo. Selecione o "
+"pedido de vendas no objeto, e voce terá as linhas dos itens. Expressão = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3242,8 +3248,13 @@ msgstr "Agrupar Por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' contem muitos pontos. Identificações XML não devem conter ponto final! Estes devem ser utilizados para referência a dados de outros módulos como em: module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' contem muitos pontos. Identificações XML não devem conter ponto final! "
+"Estes devem ser utilizados para referência a dados de outros módulos como "
+"em: module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8154,7 +8165,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Attached Model"
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 3a10ca26aaa..b7a7d63c77d 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:58+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1404,8 +1404,14 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Введите поле/выражение, которое возвращает �пи�ок. �апример, выберите �чёт в Object, и Вы �можете получить в�е позиции в �чёте на оплату. Выражение = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Введите поле/выражение, которое возвращает �пи�ок. �апример, выберите �чёт в "
+"Object, и Вы �можете получить в�е позиции в �чёте на оплату. Выражение = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3243,7 +3249,9 @@ msgstr "Группировать по"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
 msgstr ""
 "\"%s\" �одержит �лишком много точек. XML идентификаторы не должны �одержать "
 "точки! Они и�пользуют�� дл� ��ылки на данные в других модул�х, например, "
@@ -3789,6 +3797,11 @@ msgstr ""
 msgid "Inherited View"
 msgstr "Уна�ледованный вид"
 
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr "ir.translation"
+
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -8131,7 +8144,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Others Partners"
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 3bd4bcc0d76..07a33dbf62c 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:06+0000\n"
+"PO-Revision-Date: 2010-10-12 07:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1402,8 +1402,13 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve "
+"satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3234,8 +3239,13 @@ msgstr "Gruplama Anahtarı"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
-msgstr "'%s' çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, module.reference_id ."
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+"'%s' çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! "
+"Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, "
+"module.reference_id ."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -8141,7 +8151,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #, python-format
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 038d1fb7c8a..da9fef6cc4e 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:09+0000\n"
+"PO-Revision-Date: 2010-10-12 07:39+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1372,8 +1372,12 @@ msgstr "本�导将自动检测应用程�中的新术语以便您手工更新
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
-msgstr "输入返回列表的字段�表达�。比如当选择的对象是销售订�，那么您�以在销售订�明细中使用循环，表达�：`object.order_line`。"
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+"输入返回列表的字段�表达�。比如当选择的对象是销售订�，那么您�以在销售订�明细中使用循环，表达�：`object.order_line`。"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3177,7 +3181,9 @@ msgstr "分组方�"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
 msgstr "'%s'包�太多点。XML 标识符�应该包括点�其作用是引用到其他模�数�，如module.reference_id"
 
 #. module: base
@@ -8035,7 +8041,9 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
 
 #~ msgid "Main Company"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 414a4999f6b..52dabb310be 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: 5.0.1-0-2\n"
 "Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: Steve Petruzzello <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:15+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr "Identifiant dédié pour le serveur Open ERP:"
+msgstr "Compte dédié au serveur Open ERP :"
 
 #. Type: string
 #. Description
@@ -30,12 +30,12 @@ msgid ""
 "the system's security is not compromised by running it with superuser "
 "privileges."
 msgstr ""
-"Le serveur Open ERP doit être exécuté avec un identifiant spécifique, "
-"différent du superutilisateur, afin de ne pas compromettre la sécurité du "
-"système."
+"Afin de ne pas compromettre la sécurité du système, les opérations du "
+"serveur Open ERP doivent être exécutée avec un compte dédié et différent du "
+"superutilisateur."
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr "Veuillez choisir cet identifiant."
+msgstr "Veuillez choisir l'identifiant de ce compte."

From dcc2dff5213763b21a898d9f792f951c0be1ae66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 13 Oct 2010 11:42:42 +0530
Subject: [PATCH 134/294] [MOD/IMP]: Usability Improvement, Change Icon of
 Project Filter/Button

bzr revid: dbr@tinyerp.com-20101013061242-ojqo1ff1db368sab
---
 addons/project/project_view.xml                           | 2 +-
 addons/project/report/project_report_view.xml             | 4 ++--
 addons/project_issue/project_issue_view.xml               | 2 +-
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 addons/project_long_term/project_long_term_view.xml       | 6 +++---
 addons/project_messages/project_messages_view.xml         | 2 +-
 addons/project_scrum/project_scrum_view.xml               | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6fd11bd245f..fe9aa5c4e43 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -403,7 +403,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Stages" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index cb30a4b861c..b7c9cb20dba 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -89,7 +89,7 @@
                     			domain="[('state','=','done')]"/>
                        <separator orientation="vertical"/>
 	                    <field name="project_id">
-	                        <filter icon="terp-folder-blue"
+	                        <filter icon="terp-folder-violet"
 	                        		string="My Projects"
 	                        		help="My Projects" domain="[('project_id','=',uid)]"/>
                           </field>
@@ -119,7 +119,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4623f968c05..3592afee3a8 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -236,7 +236,7 @@
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Project"  icon="terp-folder-blue" domain="[]"
+                        <filter string="Project"  icon="terp-folder-violet" domain="[]"
                             context="{'group_by':'project_id'}" />
                         <filter string="Version" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'version_id'}" />
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 365f217dee4..bb9e665290e 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -121,7 +121,7 @@
                             domain="[]"
                             context="{'group_by':'section_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
+                        <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f2e4c6efd68..5205b14f1bd 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -83,7 +83,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -268,7 +268,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         </field>
                         <field name="responsible_id"/>
                         <field name="date_start"/>
@@ -277,7 +277,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index e8a013cf2ae..ef9c72f7ce6 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -82,7 +82,7 @@
                         <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
                         <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
                         <separator orientation="vertical"/>
-                    	<filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                    	<filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                     </group>
                </search>
            </field>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7ae07d9eea8..e022434bf58 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -167,7 +167,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -331,7 +331,7 @@
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
                         <filter string="Scrum Master" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>

From 0e53783ff20fc451d02a8c19958cbcce75ba2d74 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 13 Oct 2010 11:59:06 +0530
Subject: [PATCH 135/294] [MOD/IMP]: Usability Improvement, Change Icon of
 Analytic account Filter/Button

bzr revid: dbr@tinyerp.com-20101013062906-lted0vxn51u52o8d
---
 addons/hr_expense/report/hr_expense_report_view.xml             | 2 +-
 .../report/hr_timesheet_invoice_report_view.xml                 | 2 +-
 addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml   | 2 +-
 addons/sale/report/sale_report_view.xml                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 3de4776b29f..ecb2ae37d9a 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -94,7 +94,7 @@
                 <separator orientation="vertical"/>
                 <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                 <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+                <filter string="Analytic account" icon="terp-folder-violet" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
                 <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 33b92d09241..2e83f863992 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -468,7 +468,7 @@
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" domain="[]" context="{'group_by':'analytic_account_id'}"/>
+                        <filter string="Analytic Account" icon="terp-folder-violet" domain="[]" context="{'group_by':'analytic_account_id'}"/>
                        <filter string="General Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'general_account_id'}"/>
                    </group>
                </search>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 05cba7f1e49..82ee593910f 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -72,7 +72,7 @@
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
+                        <filter string="Analytic Account" icon="terp-folder-violet" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 3d93d45cfc5..0835c849ebd 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -102,7 +102,7 @@
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Analytic Account" icon="terp-folder-violet" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>

From fc7ac059851a109dbaede976bef1dfb72c2b55b6 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 13 Oct 2010 13:04:25 +0530
Subject: [PATCH 136/294] [REM] Removed not used security files

bzr revid: vir@tinyerp.com-20101013073425-03z20ylsxwq1or3y
---
 addons/hr_attendance/__openerp__.py                  | 1 -
 addons/hr_attendance/security/hr_security.xml        | 6 ------
 addons/hr_contract/__openerp__.py                    | 1 -
 addons/hr_contract/security/hr_contract_security.xml | 6 ------
 4 files changed, 14 deletions(-)
 delete mode 100644 addons/hr_attendance/security/hr_security.xml
 delete mode 100644 addons/hr_contract/security/hr_contract_security.xml

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 3714050cbdb..8a52d0e2577 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -32,7 +32,6 @@
     'author': 'OpenERP SA',
     'depends': ['hr'],
     'update_xml': [
-        'security/hr_security.xml',
         'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_report.xml',
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
deleted file mode 100644
index 39f923a895b..00000000000
--- a/addons/hr_attendance/security/hr_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    </data>
-</openerp>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 2851a9aa86b..aea686e4279 100755
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -36,7 +36,6 @@
     'depends': ['hr'],
     'init_xml': ['hr_contract_data.xml'],
     'update_xml': [
-        'security/hr_contract_security.xml',
         'security/ir.model.access.csv',
         'hr_contract_view.xml'
         ],
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
deleted file mode 100644
index 39f923a895b..00000000000
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    </data>
-</openerp>

From cd5659e4a6053bfa39accdebacbbd3cb5cf7e436 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Oct 2010 12:57:13 +0200
Subject: [PATCH 137/294] [IMP] netsvc: remove plain password from logs, safer
 for forwarding for diagnostics/debugging

bzr revid: odo@openerp.com-20101013105713-y1m8baczvdjbab1c
---
 bin/netsvc.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index 54a8ac68b14..7cb7e73c9df 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -464,6 +464,14 @@ class OpenERPDispatcherException(Exception):
         self.exception = exception
         self.traceback = traceback
 
+def replace_request_password(args):
+    # password is always 3rd argument in a request, we replace it in RPC logs
+    # so it's easier to forward logs for diagnostics/debugging purposes...
+    args = list(args)
+    if len(args) > 2:
+        args[2] = '*'
+    return args
+
 class OpenERPDispatcher:
     def log(self, title, msg, channel=logging.DEBUG_RPC, depth=2):
         logger = logging.getLogger(title)
@@ -476,7 +484,7 @@ class OpenERPDispatcher:
             logger = logging.getLogger('result')
             self.log('service', service_name)
             self.log('method', method)
-            self.log('params', params, depth=(logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) and 3 or 1))
+            self.log('params', replace_request_password(params), depth=(logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) and 3 or 1))
             auth = getattr(self, 'auth_provider', None)
             result = ExportService.getService(service_name).dispatch(method, auth, params)
             self.log('result', result, channel=logging.DEBUG_RPC_ANSWER, depth=(logger.isEnabledFor(logging.DEBUG_SQL) and 5 or 3))

From d553fc7f3d53a53861d2dd7b6a13719220d6ef0d Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 13 Oct 2010 16:39:40 +0530
Subject: [PATCH 138/294] [FIX/IMP]
 hr_timesheet_sheet,project_gtd,project_scrum : removed access
 model_timesheet_report and improved view

bzr revid: jas@tinyerp.com-20101013110940-jc3phacbsyl6kojl
---
 addons/hr_timesheet_sheet/security/ir.model.access.csv      | 1 -
 addons/project_gtd/project_gtd.py                           | 2 +-
 .../wizard/project_scrum_backlog_create_task.py             | 4 ++--
 .../wizard/project_scrum_backlog_create_task_view.xml       | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index c11a3ce7099..9d0159bbc1a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -4,6 +4,5 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index e8008b65357..092738d2cf6 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -108,7 +108,7 @@ class project_task(osv.osv):
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
             search_extended ='''<newline/><group col="%d" expand="1" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
             search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
-            search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('GTD'),)
+            search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" string="%s"/>''' % (_('GTD'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index 1e0e9df66d5..827c88b0630 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -24,7 +24,7 @@ class backlog_create_task(osv.osv_memory):
     _name = 'project.scrum.backlog.create.task'
     _description = 'Create Tasks from Product Backlogs'
     _columns = {
-        'user_id': fields.many2one('res.users', 'Assign To', help="Resposible user who can work on task")
+        'user_id': fields.many2one('res.users', 'Assign To', help="Responsible user who can work on task")
     }
 
     def do_create(self, cr, uid, ids, context=None):
@@ -40,7 +40,7 @@ class backlog_create_task(osv.osv_memory):
         backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
         result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-        
+
         for backlog in backlogs:
             task_id = task.create(cr, uid, {
                 'product_backlog_id': backlog.id,
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
index 91056bb1918..9ffbd3222ee 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
@@ -7,8 +7,8 @@
             <field name="model">project.scrum.backlog.create.task</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Convert into Tasks">
-                <separator string="Convert into Tasks" colspan="4"/>
+			<form string="Convert to Task">
+                <separator string="Convert to Task" colspan="4"/>
 			    <field name="user_id"/>
 				<separator colspan="4"/>
                 <group col="2" colspan="2">
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_scrum_backlog_to_task" model="ir.actions.act_window">
-            <field name="name">Convert into Tasks</field>
+            <field name="name">Convert to Task</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">project.scrum.backlog.create.task</field>
             <field name="view_type">form</field>

From ce485ebb66b1683e5d491a599339a4dd183ed9c4 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 13 Oct 2010 16:59:57 +0530
Subject: [PATCH 139/294] [FIX] project_issue_sheet,ir.model.access.csv:Problem
 to install Module

bzr revid: ron@tinyerp.com-20101013112957-pitx78yvk1zpfeu5
---
 addons/hr_timesheet_sheet/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index c11a3ce7099..9d0159bbc1a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -4,6 +4,5 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From 2d426ad6cef57dcf62cccf333d6ff8e1f66f1f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU=20-=20http=3A//www=2Eakretion=2Ecom?=
 <>
Date: Wed, 13 Oct 2010 17:47:05 +0530
Subject: [PATCH 140/294] [FIX] Fields : correction on get() of O2M

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

bzr revid: jvo@tinyerp.com-20101013121705-2dqetjqp9viavk0e
---
 bin/osv/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index f4442761bb8..fddb9742fe1 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -457,7 +457,8 @@ class one2many(_column):
 
         ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-            res[r[self._fields_id]].append(r['id'])
+            if r[self._fields_id] in res:
+                res[r[self._fields_id]].append(r['id'])
         return res
 
     def set(self, cr, obj, id, field, values, user=None, context=None):

From c000866aa34de54bdc9f90c0ea9b82b540bba578 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 13 Oct 2010 17:55:19 +0530
Subject: [PATCH 141/294] [IMP] project: view improvement on delegrate wizard

bzr revid: hmo@tinyerp.com-20101013122519-8f2gjt5lzxzgr23q
---
 addons/project/wizard/project_task_delegate_view.xml | 5 +++--
 addons/project_long_term/project_long_term.py        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index e5eeed35573..f9b27af05b3 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -13,7 +13,8 @@
 		                    <field name="user_id" colspan="4"/>
 		                    <field name="planned_hours" widget="float_time" colspan="4"/>
 		                    <field name="name" colspan="4"/>
-		                    <field name="new_task_description" colspan="4" />
+                            <separator string="New Task Description" colspan="4"/>
+		                    <field name="new_task_description" colspan="4" nolabel="1"/>
                       </group>
                       <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
@@ -25,7 +26,7 @@
                       <group colspan="2" col="2">
                       </group>
 		              <group colspan="2" col="2">
-		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
 		              </group>
 			  	</form>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 903dbb3b17e..e6f65ba1fa9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -396,7 +396,7 @@ class project_resource_allocation(osv.osv):
         'user_id': fields.related('resource_id', 'user_id', type='many2one', relation="res.users", string='User'),
         'date_start': fields.date('Start Date', help="Starting Date"),
         'date_end': fields.date('End Date', help="Ending Date"),
-        'useability': fields.float('Availability', help="Usability of this resource for this project phase in percentage (=50%)"),
+        'useability': fields.float('Availability', help="Availability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
         'useability': 100,

From 268da4799600808fd48ab50ffeb78c3bc71ce4c0 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 13 Oct 2010 18:09:02 +0530
Subject: [PATCH 142/294] [FIX] project: useability

bzr revid: hmo@tinyerp.com-20101013123902-lzcr18xw08n7v0cc
---
 addons/project/project_view.xml             | 2 +-
 addons/project_scrum/project_scrum_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 59bd8a6aff5..3ea6dab6649 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -328,7 +328,7 @@
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
 					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
-                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
+                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index debf9316435..9b913f76294 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -104,7 +104,7 @@
                                         <field name="state" invisible="context.get('set_visible',False)"/>
                                         <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="terp-camera_test" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
-                                        <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
+                                        <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                 </tree>
                             </field>

From 984eedc0a6858e64024a318810a9e60f4ef3a6ca Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Thu, 13 Jan 2011 17:12:07 +0530
Subject: [PATCH 143/294] [IMP] Fixing incorrect date range expressions in
 search filters: Month-1 in all rport

bzr revid: jam@tinyerp.com-20110113114207-arrf8mzf0g4dkrm9
---
 addons/crm/report/crm_lead_report_view.xml                    | 2 +-
 addons/crm/report/crm_phonecall_report_view.xml               | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml             | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml       | 2 +-
 addons/hr_evaluation/report/hr_evaluation_report_view.xml     | 3 ++-
 addons/hr_expense/report/hr_expense_report_view.xml           | 3 ++-
 addons/hr_holidays/report/available_holidays_view.xml         | 4 +++-
 addons/hr_holidays/report/hr_holidays_report_view.xml         | 3 ++-
 addons/hr_recruitment/report/hr_recruitment_report_view.xml   | 2 +-
 addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml | 2 +-
 addons/idea/report/report_vote_view.xml                       | 2 +-
 addons/lunch/lunch_view.xml                                   | 2 +-
 addons/project/report/project_report_view.xml                 | 2 +-
 addons/project_issue/report/project_issue_report_view.xml     | 2 +-
 addons/purchase/report/purchase_report_view.xml               | 2 +-
 addons/sale/report/sale_report_view.xml                       | 2 +-
 addons/stock/report/report_stock_move_view.xml                | 2 +-
 18 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c37c7bcec57..f93dde0560b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -78,7 +78,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                             help="Leads/Opportunities created in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in last month"/>
                             
                         <separator orientation="vertical" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 0f5452ad736..1bd1bb8a922 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -83,7 +83,7 @@
                            help="Phone calls made in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
 
                            <separator orientation="vertical" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5eeecf3d3ad..76debbf2c96 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -86,7 +86,7 @@
                            help="Claims created in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Claims created in last month"/>
 
                            <separator orientation="vertical" />
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index ab90f7ad0c1..c15c73e5838 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -85,7 +85,7 @@
                     	   help="Funds raised in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Funds raised in last month"/>
 
                    		<separator orientation="vertical" />
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9490172e3e8..d9a1605838c 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -83,7 +83,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                             help="Helpdesk requests occurred in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in last month"/>
 
                    		<separator orientation="vertical" />
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 59dade23d6f..b656838f721 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -51,7 +51,8 @@
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
                     <filter icon="terp-go-month" string=" Month " name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Evaluation done in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                        domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Evaluation done in last month"/>
+                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Evaluation done in last month"/>
                     <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 3de4776b29f..2d7f3092c98 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -61,7 +61,8 @@
                       domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                       help="Expenses during current month"/>
                 <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                      domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last month"/>
+                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                      help="Expenses during last month"/>
                   <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b4cb2a99b7a..f9bdb6fd35a 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -52,7 +52,9 @@
 	            	<group>
 						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
 						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
-						<filter icon="terp-go-month" string="    Month-1    " separator="1" domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Available Leaves of last month"/>
+						<filter icon="terp-go-month" string="    Month-1    " separator="1" 
+                                domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+						        help="Available Leaves of last month"/>
 						<separator orientation="vertical"/>
 						<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"/>
 		                <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e2ffc0fc0e9..9c61f074677 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -50,7 +50,8 @@
                     	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
                     <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                       domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Leaves taken in last month"/>
+                       domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                       help="Leaves taken in last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
 	                	help = "Draft and Confirmed leaves"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index d29ecabefb0..ac304567867 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -60,7 +60,7 @@
 		            <filter icon="terp-go-month"
 	                    string="    Month-1    "
 	                    separator="1"
-	                    domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+	                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Recruitment during last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="New"
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 05cba7f1e49..22863a85288 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -51,7 +51,7 @@
                             help="Timesheet in current month"/>
                         <filter icon="terp-go-month"
                             string=" Month-1 "
-                            domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet of last month"/>
                         <separator orientation="vertical"/>
                             <field name="account_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index c68c829794b..44b2735ea95 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -38,7 +38,7 @@
                         <filter icon="terp-go-month"
                              string="    Month-1    "
                              separator="1"
-                             domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created last month"/>
                          <separator orientation="vertical"/>
                          <filter icon="terp-go-today"
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 0ecdea5c017..a2cbe64bda6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -374,7 +374,7 @@
                         <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Box amount in last month"/>
                     <separator orientation="vertical"/>
                         <field name="user_id" select="1"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index cb30a4b861c..2dd6753bc01 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -68,7 +68,7 @@
 		                <filter icon="terp-go-week"
 	                            string="    Month-1    "
 	                            separator="1"
-	                            domain="[('date_start','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                                domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Previous Month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Draft"
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 365f217dee4..050d9d986e6 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -62,7 +62,7 @@
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"                           
                         />
                        <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         />
 
                            <separator orientation="vertical" />
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 816efd65ac3..caac05a0e25 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -63,7 +63,7 @@
                 <filter icon="terp-go-month"
                  string="    Month-1    "
                  separator="1"
-                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                  help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 3d93d45cfc5..7a5546e012a 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -61,7 +61,7 @@
                     <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Sales order created in last month"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 1d9dc4a5ce4..c969b09e92b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -74,7 +74,7 @@
                 <filter icon="terp-go-month"
                  string="Month-1"
                  name="month-1"
-                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>
                 <filter icon="terp-go-month" string="Month"
                 name="month"

From 114843c9f222e0af7e59cc356ef8d328f9bdd5ea Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 13 Oct 2010 18:43:43 +0530
Subject: [PATCH 144/294] [IMP] filter on Current Month in report view in
 addons

bzr revid: jam@tinyerp.com-20101013131343-gkqnw9awzt341jy9
---
 addons/crm/report/crm_lead_report_view.xml         |  2 +-
 addons/crm/report/crm_phonecall_report_view.xml    |  2 +-
 addons/crm_claim/report/crm_claim_report_view.xml  |  2 +-
 .../report/crm_fundraising_report_view.xml         |  2 +-
 .../report/crm_helpdesk_report_view.xml            |  2 +-
 .../report/hr_evaluation_report_view.xml           |  4 +++-
 addons/hr_expense/hr_expense_view.xml              |  2 +-
 .../hr_expense/report/hr_expense_report_view.xml   |  2 +-
 addons/hr_holidays/hr_holidays_view.xml            |  2 +-
 .../hr_holidays/report/available_holidays_view.xml |  4 +++-
 .../hr_holidays/report/hr_holidays_report_view.xml |  4 +++-
 .../report/hr_timesheet_invoice_report_view.xml    |  2 +-
 .../report/hr_timesheet_report_view.xml            |  2 +-
 addons/idea/report/report_vote_view.xml            |  2 +-
 addons/lunch/lunch_view.xml                        |  6 +++---
 addons/mrp/report/mrp_production_order_view.xml    |  4 ++--
 .../report/report_cash_register_view.xml           |  4 ++--
 .../point_of_sale/report/report_pos_order_view.xml |  4 ++--
 addons/project/report/project_report_view.xml      |  2 +-
 .../report/project_issue_report_view.xml           |  2 +-
 addons/purchase/report/purchase_report_view.xml    | 14 +++++++-------
 addons/sale/report/sale_report_view.xml            |  2 +-
 addons/stock/report/report_stock_move_view.xml     |  2 +-
 23 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index f93dde0560b..6ef227238b9 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -75,7 +75,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Leads/Opportunities created in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 1bd1bb8a922..b0d03766825 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -79,7 +79,7 @@
                                help="Phone calls made in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Phone calls made in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 76debbf2c96..5636c07d784 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -82,7 +82,7 @@
                                help="Claims created in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Claims created in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index c15c73e5838..deaef2666fa 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -81,7 +81,7 @@
                    			help="Funds raised in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                     	   help="Funds raised in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index d9a1605838c..e039a14e2c1 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -80,7 +80,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b656838f721..c766390025c 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -49,7 +49,9 @@
             	<group>
             		<filter icon="terp-go-year" string=" Year "
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <filter icon="terp-go-month" string=" Month " name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Evaluation done in current month"/>
+                    <filter icon="terp-go-month" string=" Month " name="month" 
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Evaluation done in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Evaluation done in last month"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5d22113272c..3d92a76a3c3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -139,7 +139,7 @@
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id" select='1'/>
                       <field name="date" select='1'/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 2d7f3092c98..70b8625d7b6 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -58,7 +58,7 @@
                       help="Expenses during current year"/>
                   <filter icon="terp-go-month" string="   Month   "
                       name="month"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                       help="Expenses during current month"/>
                 <filter icon="terp-go-month" string="    Month-1    " separator="1"
                       domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1f57b25d402..b5380c4e5a9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -16,7 +16,7 @@
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
                         <filter string="This Month" icon="terp-go-month" name="This Month"
-                           domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                                domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id">
                             <filter icon="terp-personal"
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index f9bdb6fd35a..5d173764ff6 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -51,7 +51,9 @@
 	            <search string="Leaves">
 	            	<group>
 						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
-						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
+						<filter icon="terp-go-month" string=" Month " name="month" 
+								domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+								help="Available Leaves of current month"/>
 						<filter icon="terp-go-month" string="    Month-1    " separator="1" 
                                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 						        help="Available Leaves of last month"/>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 9c61f074677..e59cf852366 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -48,7 +48,9 @@
             	<group>
 	            	<filter icon="terp-go-year" string=" Year "
                     	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
-                    <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
+                    <filter icon="terp-go-month" string=" Month " name="month" 
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Leaves taken in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                        help="Leaves taken in last month"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 33b92d09241..6b436f4ef99 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -52,7 +52,7 @@
                             help="Timesheet lines in this year"/>
                       <filter icon="terp-go-month" string="This Month"
                           name="month"
-                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                           help="Timesheet lines in this month"/>
                     <filter icon="terp-go-week"
                               string="    7 Days    "
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 22863a85288..36ea5b6418a 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -47,7 +47,7 @@
                             help="Timesheet in current year"/>
                         <filter icon="terp-go-month" string=" Month "
                             name="month"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet in current month"/>
                         <filter icon="terp-go-month"
                             string=" Month-1 "
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 44b2735ea95..26608a71301 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -33,7 +33,7 @@
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Idea Vote created in curren year"/>
                         <filter icon="terp-go-month" string="   Month   "
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Idea Vote created in current month"/>
                         <filter icon="terp-go-month"
                              string="    Month-1    "
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index a2cbe64bda6..7fb2a7056ef 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -368,9 +368,9 @@
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Box amount in current year"/>
                         <filter icon="terp-go-month" string="   Month   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                        help="Box amount in current month"/>
+                                name="month"
+                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                                help="Box amount in current month"/>
                         <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 6f88981fd5f..01b3381b0bb 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -53,12 +53,12 @@
 	                    	    help="Production performed during current year"/>
 	                    <filter icon="terp-go-month" string="Month"
 	                    		name="month"
-	                    		domain="[('month','=',time.strftime('%%m'))]"
+	                    		domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Production performed during current month"/>
 		                <filter icon="terp-go-week"
 	                            string="Month -1"
 	                            separator="1"
-	                            domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+	                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Production during last month"/>
                       <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index df0dfc877de..40e59e38f0b 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -31,12 +31,12 @@
 	                        domain="[('year','=',time.strftime('%%Y'))]"
 	                        help="Cash Analysis created during this year"/>
 	                    <filter icon="terp-go-month" string="Month"
-	                        domain="[('month','=',time.strftime('%%m'))]"
+	                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Cash Analysis created in current month"/>
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                         help="Cash Analysis created in last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index 1ca4e9876ea..c72a6b6d415 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -42,12 +42,12 @@
 	                        domain="[('year','=',time.strftime('%%Y'))]"
 	                        help="POS ordered created during current year"/>
 	                    <filter icon="terp-go-month" string="Month"
-	                        domain="[('month','=',time.strftime('%%m'))]"
+	                       domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                        help="POS ordered created during current month"/>
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                         help="POS ordered created last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 2dd6753bc01..788d5501683 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -63,7 +63,7 @@
 	                    	    help="Current Year"/>
 	                    <filter icon="terp-go-month" string="   Month   "
 	                    		name="month"
-	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    		domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Current Month"/>
 		                <filter icon="terp-go-week"
 	                            string="    Month-1    "
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 050d9d986e6..46292e954af 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -59,7 +59,7 @@
                         />                               
 
                        <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"                           
+                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         />
                        <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index caac05a0e25..d2dbff3be94 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -57,14 +57,14 @@
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Order in current year"/>
                 <filter icon="terp-go-month" string="   Month   "
-                name="month"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                help="Order in  current month"/>
+                        name="month"
+                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Order in  current month"/>
                 <filter icon="terp-go-month"
-                 string="    Month-1    "
-                 separator="1"
-                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                 help="Order in last month"/>
+                         string="    Month-1    "
+                         separator="1"
+                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
                         string="Quotations"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 7a5546e012a..87f134e857c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -56,7 +56,7 @@
                         help="Sales order created in current year"/>
                     <filter icon="terp-go-month" string="   Month   "
                         name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Sales order created in current month"/>
                     <filter icon="terp-go-month"
                          string="    Month-1    "
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index c969b09e92b..34e6e53dbdf 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -78,7 +78,7 @@
                  help="Last month"/>
                 <filter icon="terp-go-month" string="Month"
                 name="month"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                 help="Current month"/>
                 <separator orientation="vertical"/>
                 <filter string="Done"

From 92e84f4bf22b5a4039654199b300ee987ca97bf3 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 15:21:49 +0200
Subject: [PATCH 145/294] [FIX] base: added access right for everybody for
 res.log object

bzr revid: olt@tinyerp.com-20101013132149-je1q80yp5mpk7ld7
---
 bin/addons/base/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index a8144a44834..96576dd945d 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -122,4 +122,4 @@
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
 "access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1
 "access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
-
+"access_res_log_all","res.log","model_res_log",,1,1,1,1

From b77cad685a012325d466338bb31a7ff089340dfa Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 13 Oct 2010 18:53:17 +0530
Subject: [PATCH 146/294] [MOD/IMP] hr_holidays : Remove Leave Analysis report
 and changes in view file

bzr revid: amp@tinyerp.com-20101013132317-do4ylbfso07qdc66
---
 addons/hr_holidays/hr_holidays_view.xml       |   2 +-
 .../report/available_holidays_view.xml        |   4 +-
 .../hr_holidays/report/hr_holidays_report.py  |  61 -----------
 .../report/hr_holidays_report_view.xml        | 102 ------------------
 .../hr_holidays/security/ir.model.access.csv  |   1 -
 5 files changed, 3 insertions(+), 167 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1f57b25d402..b334d340b98 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -137,7 +137,7 @@
                         <field name="notes" nolabel="1" colspan="4" />
                         <newline/>
                         <field name="state" colspan="2"/>
-                        <group colspan="2">
+                        <group colspan="2" col="6">
                             <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b4cb2a99b7a..75b639b1b79 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -87,7 +87,7 @@
 	    </record>
 
         <record id="action_hr_available_holidays_report" model="ir.actions.act_window">
-            <field name="name">Available Holidays</field>
+            <field name="name">Leaves Analysis</field>
             <field name="res_model">available.holidays.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
@@ -109,7 +109,7 @@
                 <field name="act_window_id" ref="action_hr_available_holidays_report"/>
         </record>
 
-        <menuitem name="Available Holidays" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
+        <menuitem name="Leaves Analysis" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
 
 	</data>
 </openerp>
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 5d2dc27c0de..f7b813f9cc5 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -22,67 +22,6 @@
 import tools
 from osv import fields,osv
 
-class hr_holidays_report(osv.osv):
-    _name = "hr.holidays.report"
-    _description = "Leaves Statistics By Employee and category"
-    _auto = False
-    _rec_name = 'date'
-    _columns = {
-        'date': fields.date('Date', readonly=True),
-        'delay_approve': fields.float('Delay to Approve', digits=(16,2),readonly=True),
-        'year': fields.char('Year', size=4, readonly=True),
-        'day': fields.char('Day', size=15, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
-        'date_from' : fields.datetime('Start Date', readonly=True),
-        'date_to' : fields.datetime('End Date', readonly=True),
-        'number_of_days_temp': fields.float('Number of Days', readonly=True),
-        'employee_id' : fields.many2one('hr.employee', "Employee's Name", readonly=True),
-        'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type",readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'state': fields.selection([('draft', 'Draft'),
-                                   ('confirm', 'Waiting Validation'),
-                                   ('refuse', 'Refused'),
-                                   ('validate', 'Validated'),
-                                   ('cancel', 'Cancelled')]
-                                   ,'State', readonly=True),
-    }
-    _order = 'date desc'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'hr_holidays_report')
-        cr.execute("""
-            create or replace view hr_holidays_report as (
-                 select
-                     min(s.id) as id,
-                     date_trunc('day',s.create_date) as date,
-                     date_trunc('day',s.date_from) as date_from,
-                     date_trunc('day',s.date_to) as date_to,
-                     sum(s.number_of_days_temp) as number_of_days_temp,
-                     s.employee_id,
-                     s.category_id,
-                     s.user_id as user_id,
-                     to_char(s.date_from, 'YYYY') as year,
-                     to_char(s.date_from, 'MM') as month,
-                     to_char(s.date_from, 'YYYY-MM-DD') as day,
-                     s.holiday_status_id,
-                     s.department_id,
-                     s.state,
-                     avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as  delay_approve                     
-                     from
-                 hr_holidays s
-                 WHERE type='remove'
-                 GROUP BY
-                     s.create_date,s.state,s.date_from,s.date_to,
-                     s.employee_id,s.user_id,s.holiday_status_id,
-                     s.department_id, s.category_id
-            )
-        """)
-
-hr_holidays_report()
-
 class hr_holidays_remaining_leaves_user(osv.osv):
     _name = "hr.holidays.remaining.leaves.user"
     _description = "Total holidays by type"
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e2ffc0fc0e9..51ff25fea75 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -2,108 +2,6 @@
 <openerp>
 	<data>
 
-    <record id="view_hr_holidays_report_tree" model="ir.ui.view">
-        <field name="name">hr.holidays.report.tree</field>
-        <field name="model">hr.holidays.report</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('confirm','refuse','validate');gray:state in('cancel')" string="Leaves Statistics">
-                <field name="date" invisible="1"/>
-                <field name="employee_id" invisible="1"/>
-                <field name="category_id" invisible="1"/>
-                <field name="user_id" invisible="1"/>
-                <field name="date_from" invisible="1"/>
-                <field name="date_to" invisible="1"/>
-                <field name="number_of_days_temp" sum="#Days"/>
-                <field name="delay_approve"/>
-                <field name="holiday_status_id" invisible="1"/>
-                <field name="department_id" invisible="1"/>
-                <field name="year" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="state" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_hr_holidays_report_graph" model="ir.ui.view">
-         <field name="name">hr.holidays.report.graph</field>
-         <field name="model">hr.holidays.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Leaves Statistics" type="bar">
-                 <field name="employee_id"/>
-                 <field name="number_of_days_temp" operator="+"/>
-                 <field name="state" group = "True"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="view_hr_holidays_report_search" model="ir.ui.view">
-        <field name="name">hr.holidays.report.search</field>
-        <field name="model">hr.holidays.report</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Leaves">
-            	<group>
-	            	<filter icon="terp-go-year" string=" Year "
-                    	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
-                    <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                       domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Leaves taken in last month"/>
-	                <separator orientation="vertical"/>
-	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
-	                	help = "Draft and Confirmed leaves"/>
-	               	<filter string="Validated" name="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
-	               		help = "Pending Leaves"/>
-                  <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
-					<separator orientation="vertical"/>
-                    <field name="department_id"/>
-					<field name="employee_id"/>
-	            </group>
-	            <newline/>
-                <group expand="0" string="Extended Filters..." colspan="10" col="12">
-                    <field name="holiday_status_id"/>
-                    <field name="category_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
-                            help="Leaves by empolyee"/>
-                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                     <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
-                            help="Leaves by category"/>
-                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
-        <field name="name">Leaves Analysis</field>
-        <field name="res_model">hr.holidays.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
-        <field name="search_view_id" ref="view_hr_holidays_report_search"/>
-    </record>
-
-    <menuitem action="action_hr_holidays_report_all" id="menu_hr_holidays_report_all" parent="menu_hr_reporting_holidays" sequence="0"/>
-
 	<record id="view_hr_holidays_remaining_leaves_user_tree" model="ir.ui.view">
         <field name="name">hr.holidays.remaining.leaves.user.tree</field>
         <field name="model">hr.holidays.remaining.leaves.user</field>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 20da4832fe2..f350b73ed64 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -2,6 +2,5 @@
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
 "access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
 "access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
-"access_hr_holidays_report_manager","hr.holidays.report.manager","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
 "access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1

From 092c4dff88f22a1cb0b59819399930c72663330d Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 13 Oct 2010 18:58:33 +0530
Subject: [PATCH 147/294] [REVERT] Reverted above fix , defaultdict seems
 faulty

bzr revid: jvo@tinyerp.com-20101013132833-1ogy3q3ci5zy6bh4
---
 bin/osv/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index fddb9742fe1..0edd39cdf5e 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -457,8 +457,8 @@ class one2many(_column):
 
         ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-            if r[self._fields_id] in res:
-                res[r[self._fields_id]].append(r['id'])
+#            if r[self._fields_id] in res.values():
+            res[r[self._fields_id]].append(r['id'])
         return res
 
     def set(self, cr, obj, id, field, values, user=None, context=None):

From 80e627bb64bdb64dc45e099444db3f0f7099fb6e Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 13 Oct 2010 19:12:56 +0530
Subject: [PATCH 148/294] [IMP] Report Month Improvment

bzr revid: jam@tinyerp.com-20101013134256-lwwg9css5h62oyyi
---
 addons/hr_recruitment/report/hr_recruitment_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index ac304567867..f5e74724c25 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -55,7 +55,7 @@
 	                    help="Recruitment performed in current year"/>
 	                <filter icon="terp-go-month" string="Month"
 	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Recruitment performed in current month"/>
 		            <filter icon="terp-go-month"
 	                    string="    Month-1    "

From 0664e7e05f9128bfeeef637a6a779900c939984c Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Wed, 13 Oct 2010 15:57:07 +0200
Subject: [PATCH 149/294] [FIX] pwd module does not exist on non posix platform
 (win32).

bzr revid: jth@openerp.com-20101013135707-zt73h89o6du3dpvy
---
 bin/openerp-server.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index 9486d6e49d5..8d210fc2906 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -35,7 +35,6 @@ GNU Public Licence.
 #----------------------------------------------------------
 import logging
 import os
-import pwd
 import signal
 import sys
 import threading
@@ -45,11 +44,13 @@ import release
 __author__ = release.author
 __version__ = release.version
 
-# We DON't log this using the standard logger, because we might mess
-# with the logfile's permissions. Just do a quick exit here.
-if pwd.getpwuid(os.getuid())[0] == 'root' :
-    sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
-    sys.exit(1)
+if os.name == 'posix':
+    import pwd
+    # We DON't log this using the standard logger, because we might mess
+    # with the logfile's permissions. Just do a quick exit here.
+    if pwd.getpwuid(os.getuid())[0] == 'root' :
+        sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
+        sys.exit(1)
 
 #----------------------------------------------------------
 # get logger

From 2cfe39726e678fc3965077a715a4bc2a2d1ef606 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 13 Oct 2010 20:30:40 +0530
Subject: [PATCH 150/294] [FIX] fields : Use of defaultdict removed

bzr revid: jvo@tinyerp.com-20101013150040-r26sek4x6049u9l7
---
 bin/osv/fields.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 0edd39cdf5e..3800775b30c 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -31,7 +31,6 @@
 #   required
 #   size
 #
-from collections import defaultdict
 import datetime as DT
 import string
 import netsvc
@@ -453,12 +452,14 @@ class one2many(_column):
         if not values:
             values = {}
 
-        res = defaultdict(list)
+        res = {}
+        for id in ids:
+            res[id] = []
 
         ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-#            if r[self._fields_id] in res.values():
-            res[r[self._fields_id]].append(r['id'])
+            if r[self._fields_id] in res.values():
+                res[r[self._fields_id]].append(r['id'])
         return res
 
     def set(self, cr, obj, id, field, values, user=None, context=None):

From a79d0ee8e3d7284169e00e57351aaff17983b52b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Oct 2010 18:39:27 +0200
Subject: [PATCH 151/294] [FIX] osv.fields.one2many: corrected get() after
 incorrect patches

bzr revid: odo@openerp.com-20101013163927-rsvoademz4iumjbh
---
 bin/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 3800775b30c..c3a3c38826e 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -458,7 +458,7 @@ class one2many(_column):
 
         ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-            if r[self._fields_id] in res.values():
+            if r[self._fields_id] in res:
                 res[r[self._fields_id]].append(r['id'])
         return res
 

From 88117959b5e8c5e02e9e3c8c5a21691e0e78cf53 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Oct 2010 23:53:40 +0200
Subject: [PATCH 152/294] [REM] base, workflow: removed res.roles object,
 replaced by dedicated res.groups

bzr revid: odo@openerp.com-20101013215340-jaiihef9chsym48z
---
 bin/addons/base/base.sql                      | 16 +----
 bin/addons/base/base_update.xml               |  5 +-
 bin/addons/base/ir/ir.xml                     | 64 +------------------
 bin/addons/base/ir/ir_model.py                |  2 +-
 bin/addons/base/ir/workflow/workflow.py       |  4 +-
 bin/addons/base/ir/workflow/workflow_view.xml |  2 +-
 bin/addons/base/res/res_user.py               | 27 --------
 bin/addons/base/security/ir.model.access.csv  |  2 -
 bin/osv/orm.py                                | 54 ++++++----------
 bin/workflow/wkf_expr.py                      | 16 ++---
 10 files changed, 35 insertions(+), 157 deletions(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index eb9eb5b9d75..ad9deada1f3 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -159,20 +159,6 @@ CREATE TABLE res_groups (
     primary key(id)
 );
 
-create table res_roles (
-    id serial NOT NULL,
-    parent_id int references res_roles on delete set null,
-    name varchar(64) NOT NULL,
-    primary key(id)
-);
-
-CREATE TABLE res_roles_users_rel (
-    uid integer NOT NULL references res_users on delete cascade,
-    rid integer NOT NULL references res_roles on delete cascade
-);
-create index res_roles_users_rel_uid_idx on res_roles_users_rel (uid);
-create index res_roles_users_rel_rid_idx on res_roles_users_rel (rid);
-
 CREATE TABLE res_groups_users_rel (
     uid integer NOT NULL references res_users on delete cascade,
     gid integer NOT NULL references res_groups on delete cascade
@@ -222,7 +208,7 @@ create table wkf_transition
     trigger_expr_id varchar(128) default NULL,
 
     signal varchar(64) default null,
-    role_id int references res_roles on delete set null,
+    group_id int references res_groups on delete set null,
 
     primary key(id)
 );
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index a397b39cba2..0cf6eae845e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -144,13 +144,10 @@
                                 <field colspan="2" name="signature" nolabel="1"/>
                             </group>
                             <group colspan="2" col="2" expand="1">
-                                <separator string="Access Rights (groups)" colspan="2"/>
+                                <separator string="Groups" colspan="2"/>
                                 <field colspan="2" nolabel="1" name="groups_id"/>
                             </group>
                         </page>
-                        <page string="Roles">
-                            <field colspan="4" nolabel="1" name="roles_id"/>
-                        </page>
                         <page string="Companies" groups="base.group_multi_company">
                             <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 5821e3cafdb..1f815ed1604 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -708,7 +708,7 @@
         </record>
         <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_res_company_global"/>
 
-        <!-- User Roles -->
+        <!-- Users -->
         <record id="action_res_users" model="ir.actions.act_window">
             <field name="name">Users</field>
             <field name="type">ir.actions.act_window</field>
@@ -761,68 +761,6 @@
         <menuitem action="action_res_groups" id="menu_action_res_groups" parent="base.menu_users"
             groups="base.group_extended"/>
 
-        <record id="view_roles_form" model="ir.ui.view">
-            <field name="name">res.roles.form</field>
-            <field name="model">res.roles</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Role">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <separator string="Description" colspan="4"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                    <separator string="Workflow transitions" colspan="4"/>
-                     <field name="workflow_transition_ids" nolabel="1" colspan="4">
-                        <tree string="Workflow transitions">
-                            <field name="wkf_id"/>
-                            <field name="act_from"/>
-                            <field name="act_to"/>
-                            <field name="signal"/>
-                            <field name="condition"/>
-                        </tree>
-                     </field>
-                </form>
-            </field>
-        </record>
-        <record id="view_roles_tree" model="ir.ui.view">
-            <field name="name">res.roles.tree</field>
-            <field name="model">res.roles</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_id</field>
-            <field name="arch" type="xml">
-                <tree string="Roles">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="description"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_roles_search" model="ir.ui.view">
-            <field name="name">res.roles.search</field>
-            <field name="model">res.roles</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Role">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="description"/>
-                    <newline/>
-                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Parent" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-       <record id="action_res_roles_form" model="ir.actions.act_window">
-            <field name="name">Roles</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.roles</field>
-            <field name="view_type">form</field>
-            <field name="search_view_id" ref="view_roles_search"/>
-        </record>
-        <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="base.menu_users"/>
-
         <!-- View -->
         <record id="view_view_form" model="ir.ui.view">
             <field name="name">ir.ui.view</field>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index b87e8bc9801..e6b4a2da98f 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -554,7 +554,7 @@ class ir_model_data(osv.osv):
                 if model=='workflow.activity':
                     cr.execute('select res_type,res_id from wkf_instance where id IN (select inst_id from wkf_workitem where act_id=%s)', (res_id,))
                     wkf_todo.extend(cr.fetchall())
-                    cr.execute("update wkf_transition set condition='True', role_id=NULL, signal=NULL,act_to=act_from,act_from=%s where act_to=%s", (res_id,res_id))
+                    cr.execute("update wkf_transition set condition='True', group_id=NULL, signal=NULL,act_to=act_from,act_from=%s where act_to=%s", (res_id,res_id))
                     cr.execute("delete from wkf_transition where act_to=%s", (res_id,))
 
         for model,id in wkf_todo:
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 30fd666c03e..4815c482ae4 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -149,8 +149,8 @@ class wkf_transition(osv.osv):
         'signal': fields.char('Signal (button Name)', size=64, 
                               help="When the operation of transition comes from a button pressed in the client form, "\
                               "signal tests the name of the pressed button. If signal is NULL, no button is necessary to validate this transition."),
-        'role_id': fields.many2one('res.roles', 'Role Required', 
-                                   help="The role that a user must have to validate this transition."),
+        'group_id': fields.many2one('res.groups', 'Group Required', 
+                                   help="The group that a user must have to be authorized to validate this transition."),
         'condition': fields.char('Condition', required=True, size=128, 
                                  help="Expression to be satisfied if we want the transition done."),
         'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade',
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index b4e9b0daf46..a207eea52ab 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -217,7 +217,7 @@
                 <field name="condition"/>
                 <field name="trigger_model"/>
                   <field name="trigger_expr_id"/>
-                <field name="role_id"/>
+                <field name="group_id"/>
             </group>
         </form>
       </field>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 10d4b0f9ce9..0ea344561f9 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -82,32 +82,6 @@ class groups(osv.osv):
 
 groups()
 
-class roles(osv.osv):
-    _name = "res.roles"
-    _columns = {
-        'name': fields.char('Role Name', size=64, required=True),
-        'parent_id': fields.many2one('res.roles', 'Parent', select=True,
-            help="The parent role can be used to construct a hierarchy of roles. Parent roles inherit from the roles of their descendants."),
-        'child_id': fields.one2many('res.roles', 'parent_id', 'Children'),
-        'users': fields.many2many('res.users', 'res_roles_users_rel', 'rid', 'uid', 'Users'),
-        'description': fields.text('Description', help="Description of this role and where it is relevant in workflows and processes"),
-        'workflow_transition_ids': fields.one2many('workflow.transition', 'role_id', 'Workflow Transitions',
-            help="The workflow transitions associated with this role"),
-    }
-    def check(self, cr, uid, ids, role_id):
-        """Verifies that the role with id ``role_id`` is granted directly or indirectly to a
-           user that possesses the roles with ids ``ids``. Indirectly means that one of the
-           roles with id in ``ids`` is an ancestor role of the role with id ``role_id``.
-        """
-        if role_id in ids:
-            return True
-        cr.execute('select parent_id from res_roles where id=%s', (role_id,))
-        roles = cr.fetchone()[0]
-        if roles:
-            return self.check(cr, uid, ids, roles)
-        return False
-roles()
-
 def _lang_get(self, cr, uid, context={}):
     obj = self.pool.get('res.lang')
     ids = obj.search(cr, uid, [('translatable','=',True)])
@@ -236,7 +210,6 @@ class users(osv.osv):
         'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
-        'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 
         # Special behavior for this field: res.company.search() will only return the companies
         # available to the current user (should be the user's companies?), when the user_preference
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 96576dd945d..92b21dd96d1 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -108,8 +108,6 @@
 "access_ir_actions_server_group_system","ir_actions_server_group_system","model_ir_actions_server","group_system",1,1,1,1
 "access_res_bank_group_system","res_bank_group_system","model_res_bank","group_system",1,1,1,1
 "access_res_payterm_group_system","res_payterm_group_system","model_res_payterm","group_system",1,1,1,1
-"access_res_roles_group_erpmanager","res_roles_group_erp_manager","model_res_roles","group_erp_manager",1,1,1,1
-"access_res_roles_all","res_roles_all","model_res_roles",,1,0,0,0
 "access_res_bank_group_partner_manager","res_bank_group_partner_manager","model_res_bank","group_partner_manager",1,1,1,1
 "access_res_bank_user","res_bank user","model_res_bank","group_user",1,0,0,0
 "access_maintenance_group_user","maintenance_contract group_user","model_maintenance_contract","group_system",1,1,1,1
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 7e3529f9b6f..9f33379184c 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1365,47 +1365,33 @@ class orm_template(object):
 
         return fields
 
-    def __view_look_dom_arch(self, cr, user, node, view_id, context=None):
-        fields_def = self.__view_look_dom(cr, user, node, view_id, context=context)
+    def _disable_workflow_buttons(self, cr, user, node):
+        if user == 1:
+            # admin user can always activate workflow buttons
+            return node
 
-        rolesobj = self.pool.get('res.roles')
+        # TODO handle the case of more than one workflow for a model or multiple
+        # transitions with different groups and same signal
         usersobj = self.pool.get('res.users')
-
         buttons = (n for n in node.getiterator('button') if n.get('type') != 'object')
         for button in buttons:
-            can_click = True
-            if user != 1: # admin user has all roles
-                user_roles = usersobj.read(cr, user, [user], ['roles_id'])[0]['roles_id']
-                # TODO handle the case of more than one workflow for a model
-                cr.execute("""SELECT DISTINCT t.role_id
-                                FROM wkf
-                          INNER JOIN wkf_activity a ON a.wkf_id = wkf.id
-                          INNER JOIN wkf_transition t ON (t.act_to = a.id)
-                               WHERE wkf.osv = %s
-                                 AND t.signal = %s
-                           """, (self._name, button.get('name'),))
-                roles = cr.fetchall()
-
-                # draft -> valid = signal_next (role X)
-                # draft -> cancel = signal_cancel (no role)
-                #
-                # valid -> running = signal_next (role Y)
-                # valid -> cancel = signal_cancel (role Z)
-                #
-                # running -> done = signal_next (role Z)
-                # running -> cancel = signal_cancel (role Z)
-
-                # As we don't know the object state, in this scenario,
-                #   the button "signal_cancel" will be always shown as there is no restriction to cancel in draft
-                #   the button "signal_next" will be show if the user has any of the roles (X Y or Z)
-                # The verification will be made later in workflow process...
-                if roles:
-                    can_click = any((not role) or rolesobj.check(cr, user, user_roles, role) for (role,) in roles)
-
+            user_groups = usersobj.read(cr, user, [user], ['groups_id'])[0]['groups_id']
+            cr.execute("""SELECT DISTINCT t.group_id
+                        FROM wkf
+                  INNER JOIN wkf_activity a ON a.wkf_id = wkf.id
+                  INNER JOIN wkf_transition t ON (t.act_to = a.id)
+                       WHERE wkf.osv = %s
+                         AND t.signal = %s
+                   """, (self._name, button.get('name')))
+            group_ids = [x[0] for x in cr.fetchall()]
+            can_click = not group_ids or bool(set(user_groups).intersection(group_ids))
             button.set('readonly', str(int(not can_click)))
+        return node
 
+    def __view_look_dom_arch(self, cr, user, node, view_id, context=None):
+        fields_def = self.__view_look_dom(cr, user, node, view_id, context=context)
+        node = self._disable_workflow_buttons(cr, user, node)
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
-
         fields = {}
         if node.tag == 'diagram':
             if node.getchildren()[0].tag == 'node':
diff --git a/bin/workflow/wkf_expr.py b/bin/workflow/wkf_expr.py
index 0150105c3ab..71a15a181f9 100644
--- a/bin/workflow/wkf_expr.py
+++ b/bin/workflow/wkf_expr.py
@@ -68,17 +68,17 @@ def execute(cr, ident, workitem, activity):
     return _eval_expr(cr, ident, workitem, activity['action'])
 
 def check(cr, workitem, ident, transition, signal):
-    ok = True
-    if transition['signal']:
-        ok = (signal==transition['signal'])
+    if transition['signal'] and signal != transition['signal']:
+        return False
 
     uid = ident[0]
-    if transition['role_id'] and uid != 1:
+    if transition['group_id'] and uid != 1:
         pool = pooler.get_pool(cr.dbname)
-        user_roles = pool.get('res.users').read(cr, uid, [uid], ['roles_id'])[0]['roles_id']
-        ok = ok and pool.get('res.roles').check(cr, uid, user_roles, transition['role_id'])
-    ok = ok and _eval_expr(cr, ident, workitem, transition['condition'])
-    return ok
+        user_groups = pool.get('res.users').read(cr, uid, [uid], ['groups_id'])[0]['groups_id']
+        if not transition['group_id'] in user_groups:
+            return False
+
+    return _eval_expr(cr, ident, workitem, transition['condition'])
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 68e483e40e086585b2c80bbff0af219e05e0bd7a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 14 Oct 2010 04:44:53 +0000
Subject: [PATCH 153/294] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101014044453-jx27p14fjlkbd617
---
 bin/addons/base/i18n/fi.po | 4 ++--
 bin/addons/base/i18n/fr.po | 4 ++--
 bin/addons/base/i18n/lv.po | 4 ++--
 bin/addons/base/i18n/ru.po | 4 ++--
 debian/po/fr.po            | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index e459976e809..57db0f4b3dd 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-12 07:53+0000\n"
+"PO-Revision-Date: 2010-10-13 07:43+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 69beee59704..cec2ad67d08 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-12 07:54+0000\n"
+"PO-Revision-Date: 2010-10-13 07:43+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 02a43f834c3..32738b300ea 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"PO-Revision-Date: 2010-10-13 07:41+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index b7a7d63c77d..f9cf0df4e04 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-12 07:58+0000\n"
+"PO-Revision-Date: 2010-10-13 07:44+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 52dabb310be..5aa65424e38 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: 5.0.1-0-2\n"
 "Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-10-12 07:15+0000\n"
+"PO-Revision-Date: 2010-10-13 07:40+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string

From 1eb5f7cc5fff832ed9dcd3d8f40b8489a9f41191 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Thu, 14 Oct 2010 11:10:00 +0530
Subject: [PATCH 154/294] [IMP] document: imporved search view for Document

bzr revid: jas@tinyerp.com-20101014054000-mr0h707ba2odbt5t
---
 addons/document/document_view.xml | 65 ++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b978cd222db..699918c47e9 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -278,37 +278,66 @@
         </field>
     </record>
 
-    <record id="view_attach_filter" model="ir.ui.view">
+         <record id="view_attach_filter_inherit" model="ir.ui.view">
             <field name="name">IR Attachment</field>
             <field name="model">ir.attachment</field>
             <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-             <search string="Document">
-             <filter icon="terp-go-month" string="Month"
-                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                />
-                 <separator orientation="vertical"/>
-                 <field name="name"/>
-                 <field name="parent_id" />
-                 <field name="user_id">
+                <filter string="Binary" position="after">
+                    <filter icon="terp-go-month" string="Month"
+                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
+                </filter>
+            </field>
+         </record>
+
+        <record id="view_attach_filter_inherit0" model="ir.ui.view">
+            <field name="name">IR Attachment0</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <field name="type" position="replace">
+                    <field name="parent_id" />
+                </field>
+                <field name="datas_fname" position="replace">
+                   <field name="user_id">
                     <filter icon="terp-personal"
                         domain="[('user_id','=',uid)]"
                         help="Filter on my documents" />
                  </field>
-                <field name="partner_id"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <newline/>
-                <group expand="0" string="Group By...">
+                </field>
+            </field>
+         </record>
+
+         <record id="view_attach_filter_inherit1" model="ir.ui.view">
+            <field name="name">IR Attachment1</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <filter string="Creator" position="replace">
+                   <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                </filter>
+            </field>
+         </record>
+
+         <record id="view_attach_filter_inherit2" model="ir.ui.view">
+            <field name="name">IR Attachment2</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <filter string="Owner" position="after">
                     <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
-                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                </group>
-              </search>
-             </field>
+                 </filter>
+            </field>
          </record>
+
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
@@ -319,6 +348,7 @@
                 <field name="name"/>
                 <field name="parent_id" />
                 <field name="user_id"/>
+                <field name="company_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
                 <field name="partner_id" groups="base.group_extended" />
@@ -333,7 +363,6 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
-        <field name="search_view_id" ref="view_attach_filter"/>
         <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>

From 6c34dc63a27d1d95fa3cdfeb09a35065ef374983 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 14 Oct 2010 11:12:59 +0530
Subject: [PATCH 155/294] [IMP] stock : Remove the stock_picking_makwizard

bzr revid: sbh@tinyerp.com-20101014054259-umw0er3gzua08o40
---
 addons/stock/__openerp__.py                   |  1 -
 addons/stock/wizard/__init__.py               |  2 +-
 addons/stock/wizard/stock_picking_make.py     | 80 -------------------
 .../stock/wizard/stock_picking_make_view.xml  | 31 -------
 4 files changed, 1 insertion(+), 113 deletions(-)
 delete mode 100644 addons/stock/wizard/stock_picking_make.py
 delete mode 100644 addons/stock/wizard/stock_picking_make_view.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 79d6c860e65..0b85511050d 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -58,7 +58,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_splitinto_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
-        'wizard/stock_picking_make_view.xml',
         'wizard/stock_return_picking_view.xml',
         "stock_workflow.xml",
         "stock_incoterms.xml",
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index f6021e0fbe2..485059b83bf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -34,6 +34,6 @@ import stock_location_product
 import stock_change_standard_price
 import stock_picking_make
 import stock_return_picking
-import stock_picking_make
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_picking_make.py b/addons/stock/wizard/stock_picking_make.py
deleted file mode 100644
index 9d26595f00e..00000000000
--- a/addons/stock/wizard/stock_picking_make.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import netsvc
-
-class stock_picking_make(osv.osv_memory):
-    _name = 'stock.picking.make'
-    _description = "Make Picking"
-    
-    _columns = {
-        'picking_ids': fields.many2many('stock.picking', 'stock_picking_ids', 'parent_id', 'child_id', 'Pickings'),
-    }
-
-    def default_get(self, cursor, user, fields, context):
-        """ 
-         To get default values for the object.
-         @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(stock_picking_make, self).default_get(cursor, user, fields, context=context)
-        record_ids = context and context.get('active_ids',False) or False
-        if record_ids:
-            picking_obj = self.pool.get('stock.picking')
-            picking_ids = picking_obj.search(cursor, user, [
-                ('id', 'in', record_ids),
-                ('state', '<>', 'done'),
-                ('state', '<>', 'cancel')], context=context)
-            res['picking_ids'] = picking_ids
-        return res
-    
-    def make_packing(self, cursor, user, ids, context):
-        """ 
-         Make Picking.
-         @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. 
-        """ 
-        record_ids = context and context.get('active_ids',False) or False
-        wkf_service = netsvc.LocalService('workflow')
-        picking_obj = self.pool.get('stock.picking')
-        data = self.read(cursor, user, ids[0])
-        pick_ids = data['picking_ids']
-        picking_obj.force_assign(cursor, user, pick_ids)
-        picking_obj.action_move(cursor, user, pick_ids)
-        for picking_id in ids:
-            wkf_service.trg_validate(user, 'stock.picking', picking_id,
-                    'button_done', cursor)
-        return {}
-
-stock_picking_make()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
deleted file mode 100644
index 4ecebed1031..00000000000
--- a/addons/stock/wizard/stock_picking_make_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-	    <record id="view_stock_make_picking_wizard" model="ir.ui.view">
-            <field name="name">Make Picking</field>
-            <field name="model">stock.picking.make</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Make Picking">
-				    <field name="picking_ids" nolabel="1" colspan="4"
-				        width="600" height="300"/>
-                	<separator string="" colspan="4" />
-                	<button icon='gtk-cancel' special="cancel"
-                		string="_Cancel" />
-                	<button name="make_packing" string="Ok"
-                		type="object" icon="gtk-apply" />
-                </form>
-            </field>
-        </record>
-        
-        <record id="act_stock_make_picking_wizard" model="ir.actions.act_window">
-            <field name="name">Make Picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.picking.make</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-	</data>
-</openerp>

From 65c67b59ed8439f235c5ac8023a4867d094eb3d9 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Thu, 14 Oct 2010 11:34:55 +0530
Subject: [PATCH 156/294] [ADD]: Add Administration Dashboard.

bzr revid: rch@rch-desktop-20101014060455-obdgpwdzjnn7xebo
---
 addons/board/__openerp__.py                |   2 +-
 addons/board/board_administration_view.xml | 100 +++++++++++++++++++++
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 addons/board/board_administration_view.xml

diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 8282e9a5d07..1c44dfe7955 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """Base module for all dashboards.""",
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
+    'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
new file mode 100644
index 00000000000..66da3c5261a
--- /dev/null
+++ b/addons/board/board_administration_view.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <!-- Latest Activities -->
+        <record model="ir.ui.view" id="view_latest_activities_tree">
+            <field name="name">latest.activities.tree</field>
+            <field name="model">res.log</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Latest Activities">
+                    <field name="name"/>
+                    <field name="create_date"/>
+                    <field name="user_id" />
+                    <field name="res_model"/>
+                    <field name="res_id"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_latest_activities_tree">
+            <field name="name">Latest Activities</field>
+            <field name="res_model">res.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_latest_activities_tree"></field>
+        </record>
+
+        <record id="board_administration_form" model="ir.ui.view">
+            <field name="name">board.administration.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Administration Dashboard">
+                    <hpaned position="100">
+						<child1>
+                            <action  name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/>
+                        </child1>
+                        <child2>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+        <record id="open_board_administration_form" model="ir.actions.act_window">
+             <field name="name">Administration Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_administration_form"/>
+        </record>
+       <menuitem id="menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
+            groups="base.group_extended"/>
+		<menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="menu_reporting"/>
+        <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
+
+        <!-- User Connection -->
+        <record model="ir.ui.view" id="view_user_connection_tree">
+            <field name="name">user.connection.tree</field>
+            <field name="model">res.users</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Latest Connections">
+                    <field name="name"/>
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_user_connection_tree">
+            <field name="name">Latest Connections</field>
+            <field name="res_model">res.users</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_user_connection_tree"></field>
+        </record>
+
+        <record id="board_user_connection_form" model="ir.ui.view">
+            <field name="name">board.user.connection.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="board_administration_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/hpaned/child1/action[@string='Latest Activities']" position="after">
+                            <action  width="510" name="%(action_user_connection_tree)d" string="Latest Connections" />
+            	</xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+
+
+
+
+
+
+
+
+
+
+
+

From 42f572a889ff449f1de786036a6e88f9c634dac3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 14 Oct 2010 11:59:42 +0530
Subject: [PATCH 157/294] [Fix] stock: remove the name from init

bzr revid: sbh@tinyerp.com-20101014062942-8xbckw3h857oxjt2
---
 addons/stock/wizard/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 485059b83bf..5e35e0e7297 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -32,7 +32,6 @@ import stock_inventory_line_split
 import stock_invoice_onshipping
 import stock_location_product
 import stock_change_standard_price
-import stock_picking_make
 import stock_return_picking
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From d6b3f279cb9e7a7192c85ad1c6e4a682fdccd925 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 10:00:09 +0300
Subject: [PATCH 158/294] CalDAV: alias for node filenames, keep one sent by
 client.

Since some clients keep referring to the created .ics nodes with the
filename they sent us, allow them to find that node.

bzr revid: p_christ@hol.gr-20101014070009-2vcro7p9krnwxm9s
---
 addons/caldav/caldav_node.py               | 32 +++++++++++++++++++---
 addons/caldav/calendar.py                  | 24 ++++++++++++++++
 addons/caldav/security/ir.model.access.csv |  1 +
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index d91db94fc90..b735d853025 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -286,22 +286,31 @@ class node_calendar(nodes.node_class):
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
         where = []
+        bc_obj = dirobj.pool.get('basic.calendar')
+
         if name:
             if name.endswith('.ics'):
                 name = name[:-4]
             try:
-                where.append(('id','=',int(name)))
+                if name.isdigit():
+                    where.append(('id','=',int(name)))
+                else:
+                    bca_obj = dirobj.pool.get('basic.calendar.alias')
+                    bc_alias = bca_obj.search(cr, uid, 
+                        [('cal_line_id.calendar_id', '=', self.calendar_id),
+                         ('name', '=', name)] )
+                    if not bc_alias:
+                        return []
+                    bc_val = bca_obj.read(cr, uid, bc_alias, ['res_id',])
+                    where.append(('id', '=', bc_val[0]['res_id']))
             except ValueError:
                 # if somebody requests any other name than the ones we
                 # generate (non-numeric), it just won't exist
-                # FIXME: however, this confuses Evolution (at least), which
-                # thinks the .ics node hadn't been saved.
                 return []
 
         if not domain:
             domain = []
 
-        bc_obj = dirobj.pool.get('basic.calendar')
         # we /could/ be supplying an invalid calendar id to bc_obj, it has to check
         res = bc_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx)
         return res
@@ -325,6 +334,21 @@ class node_calendar(nodes.node_class):
             assert isinstance(res[0], (int, long))
             fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
                     domain=[('id','=',res[0])], context=ctx)
+            if self.context.get('DAV-client','') in ('iPhone', 'iCalendar',):
+                # For those buggy clients, register the alias
+                bca_obj = fil_obj.pool.get('basic.calendar.alias')
+                ourcal = fil_obj.browse(cr, uid, self.calendar_id)
+                line_id = None
+                for line in ourcal.line_ids:
+                    if line.name == ourcal.type:
+                        line_id = line.id
+                        break
+                assert line_id, "Calendar #%d must have at least one %s line" % \
+                                    (ourcal.id, ourcal.type)
+                if path.endswith('.ics'):
+                    path = path[:-4]
+                bca_obj.create(cr, uid, { 'cal_line_id': line_id, 
+                                    'res_id': res[0], 'name': path}, context=ctx)
             return fnodes[0]
         # If we reach this line, it means that we couldn't import any useful
         # (and matching type vs. our node kind) data from the iCal content.
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 9ca6b924e4d..ccc4bf39fac 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -776,6 +776,30 @@ line "%s" more than once' % (vals.get('name'))))
 
 basic_calendar_line()
 
+class basic_calendar_alias(osv.osv):
+    """ Mapping of client filenames to ORM ids of calendar records
+    
+        Since some clients insist on putting arbitrary filenames on the .ics data
+        they send us, and they won't respect the redirection "Location:" header, 
+        we have to store those filenames and allow clients to call our calendar
+        records with them.
+        Note that adding a column to all tables that would possibly hold calendar-
+        mapped data won't work. The user is always allowed to specify more 
+        calendars, on any arbitrary ORM object, without need to alter those tables'
+        data or structure
+    """
+    _name = 'basic.calendar.alias'
+    _columns = {
+        'name': fields.char('Filename', size=512, required=True, select=1),
+        'cal_line_id': fields.many2one('basic.calendar.lines', 'Calendar', required=True,
+                        select=1, help='The calendar/line this mapping applies to'),
+        'res_id': fields.integer('Res. ID', required=True, select=1),
+        }
+        
+    _sql_constraints = [ ('name_cal_uniq', 'UNIQUE(cal_line_id, name)',
+                _('The same filename cannot apply to two records!')), ]
+
+basic_calendar_alias()
 
 class basic_calendar_attribute(osv.osv):
     _name = 'basic.calendar.attributes'
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index bb16603b904..ce3f3c90e32 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -3,3 +3,4 @@
 "access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
 "access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
 "access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
+"access_basic_calendar_alias","basic.calendar.alias","model_basic_calendar_alias","base.group_user",1,1,1,1

From e16ee153686a4615b01e246b9608e0f7a4611eca Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 14 Oct 2010 12:39:16 +0530
Subject: [PATCH 159/294] [IMP] stock Remove Unreceived Products wizard

bzr revid: sbh@tinyerp.com-20101014070916-t7losn65apdoahlo
---
 addons/stock/stock.py       | 54 -------------------------------------
 addons/stock/stock_view.xml | 27 -------------------
 2 files changed, 81 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1c5ee23a0dc..f46f0c2ab08 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2507,58 +2507,4 @@ class stock_warehouse(osv.osv):
 
 stock_warehouse()
 
-
-# Move wizard :
-#    get confirm or assign stock move lines of partner and put in current picking.
-class stock_picking_move_wizard(osv.osv_memory):
-    _name = 'stock.picking.move.wizard'
-
-    def _get_picking(self, cr, uid, ctx=None):
-        if ctx is None:
-            ctx = {}
-        if ctx.get('active_id', False):
-            return ctx['active_id']
-        return False
-
-    def _get_picking_address(self, cr, uid, context=None):
-        picking_obj = self.pool.get('stock.picking')
-        if context is None:
-            context = {}
-        if context.get('active_id', False):
-            picking = picking_obj.browse(cr, uid, [context['active_id']])[0]
-            return picking.address_id and picking.address_id.id or False
-        return False
-
-    _columns = {
-        'name': fields.char('Name', size=64, invisible=True),
-        'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Entry lines', required=True),
-        'address_id': fields.many2one('res.partner.address', 'Dest. Address', invisible=True),
-        'picking_id': fields.many2one('stock.picking', 'Picking list', select=True, invisible=True),
-    }
-    _defaults = {
-        'picking_id': _get_picking,
-        'address_id': _get_picking_address,
-    }
-
-    def action_move(self, cr, uid, ids, context=None):
-        move_obj = self.pool.get('stock.move')
-        picking_obj = self.pool.get('stock.picking')
-        account_move_obj = self.pool.get('account.move')
-        for act in self.read(cr, uid, ids):
-            move_lines = move_obj.browse(cr, uid, act['move_ids'])
-            for line in move_lines:
-                if line.picking_id:
-                    picking_obj.write(cr, uid, [line.picking_id.id], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
-                    picking_obj.write(cr, uid, [act['picking_id']], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
-                    old_picking = picking_obj.read(cr, uid, [line.picking_id.id])[0]
-                    if not len(old_picking['move_lines']):
-                        picking_obj.write(cr, uid, [old_picking['id']], {'state': 'done'})
-                else:
-                    raise osv.except_osv(_('UserError'),
-                        _('You can not create new moves.'))
-        return {'type': 'ir.actions.act_window_close'}
-
-stock_picking_move_wizard()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 08a00b200b2..9f6d71b99b0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -570,33 +570,6 @@
         </record>
         <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager,base.group_system"/>
 
-        <record id="stock_picking_move_wizard_form" model="ir.ui.view">
-            <field name="name">stock.picking.move.wizard.form</field>
-            <field name="model">stock.picking.move.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Entry Lines">
-                    <group height="200" width="500">
-                    <field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
-                    <field name="picking_id" invisible="True"/>
-                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"  height="100" width="500"/><newline/>
-                    <group colspan="4">
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                        <button name="action_move" string="Add" type="object" icon="gtk-add"/>
-                    </group>
-                    </group>
-                </form>
-               </field>
-        </record>
-
-      <act_window name="Unreceived Products"
-            res_model="stock.picking.move.wizard"
-            src_model="stock.picking"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="act_stock_picking_move_wizard"/>
-
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
             <field name="model">stock.picking</field>

From 007623bba3090b0a3d2c0dfbd4fdbfb5b2f79254 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 14 Oct 2010 13:01:55 +0530
Subject: [PATCH 160/294] [IMP]:account:Improves the tax report and its wizard

bzr revid: azaz.201186@gmail.com-20101014073155-rotp4wrjegmonxn3
---
 addons/account/report/account_tax_report.py  | 17 +++++
 addons/account/report/account_tax_report.rml | 10 +++
 addons/account/wizard/account_vat.py         | 67 ++++++++++----------
 addons/account/wizard/account_vat_view.xml   |  6 +-
 4 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index d3fb791bfaa..8275c3d84c1 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -37,9 +37,26 @@ class tax_report(rml_parse.rml_parse):
             'get_company': self._get_company,
             'get_currency': self._get_currency,
             'get_lines': self._get_lines,
+			'get_years': self.get_years,            
         })
 
 
+    def get_years(self,form):
+        res={}
+        fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'])
+
+        if fiscal_year_name:
+            res['fname'] = fiscal_year_name[0][1]
+            res['periods'] = ''
+        if form['periods']:
+            periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name'])
+            for period in periods_l:
+		        if res['periods']=='':
+			        res['periods'] = period['name']
+		        else:
+			        res['periods'] += ", "+ period['name']
+            return res
+            
     def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 2434437e803..9f970e76751 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -105,6 +105,16 @@
   </stylesheet>
   <story>
 	<para style="P2">Tax Statement</para>
+  <para style="P2"><font color="white"> </font></para>
+	<blockTable colWidths="538" style="Tableau1">
+      <tr>
+        <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td>
+      </tr>
+      <tr>
+        <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] ]]</para></td>
+      </tr>
+    </blockTable>
+  <para style="P2"><font color="white"> </font></para>    	
 	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</para></td>
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 80f4f8360a1..9e0585619b1 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -22,42 +22,45 @@
 from osv import osv, fields
 
 class account_vat_declaration(osv.osv_memory):
-    _name = 'account.vat.declaration'
-    _description = 'Account Vat Declaration'
+	_name = 'account.vat.declaration'
+	_description = 'Account Vat Declaration'
+	_inherit = "account.common.account.report"
+	_columns = {
+		'based_on': fields.selection([('invoices','Invoices'),
+		                             ('payments','Payments'),],
+		                              'Based On', required=True),
+		'company_id': fields.many2one('res.company', 'Company', required=True),
+		'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
+		'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year'),        
+		}
+		
+	def _get_company(self, cr, uid, context={}):
+		user_obj = self.pool.get('res.users')
+		company_obj = self.pool.get('res.company')
+		user = user_obj.browse(cr, uid, uid, context=context)
+		if user.company_id:
+		    return user.company_id.id
+		else:
+		    return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
 
-    _columns = {
-        'based_on': fields.selection([('invoices','Invoices'),
-                                     ('payments','Payments'),],
-                                      'Based On', required=True),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
-        }
 
-    def _get_company(self, cr, uid, context={}):
-        user_obj = self.pool.get('res.users')
-        company_obj = self.pool.get('res.company')
-        user = user_obj.browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        else:
-            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+	_defaults = {
+			'based_on': 'invoices',
+			'company_id': _get_company
 
-    _defaults = {
-            'based_on': 'invoices',
-            'company_id': _get_company
-        }
+		}
 
-    def create_vat(self, cr, uid, ids, context={}):
-        if context is None:
-            context = {}
-        datas = {'ids': context.get('active_ids', [])}
-        datas['model'] = 'account.tax.code'
-        datas['form'] = self.read(cr, uid, ids)[0]
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'account.vat.declaration',
-            'datas': datas,
-            }
+	def create_vat(self, cr, uid, ids, context={}):
+		if context is None:
+			context = {}
+		datas = {'ids': context.get('active_ids', [])}
+		datas['model'] = 'account.tax.code'
+		datas['form'] = self.read(cr, uid, ids)[0]
+		return {
+			'type': 'ir.actions.report.xml',
+			'report_name': 'account.vat.declaration',
+			'datas': datas,
+			}
 
 account_vat_declaration()
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 16bb39e22cd..41c0faa2c79 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -10,10 +10,12 @@
             <form string="Select Period">
                 <field name="company_id" groups="base.group_multi_company" widget='selection'/>
                 <newline/>
-                <field name="based_on" invisible="1"/>
+                <field name="based_on"/>
                 <newline/>
                 <separator string="Select Period(s)" colspan="4"/>
-                <field name="periods" nolabel="1" colspan="2"/>
+                	<field name="periods" nolabel="1" colspan="4"/>
+                <separator string="Select FiscalYear(s)" colspan="4"/>                	                
+                    <field name="fiscalyear" nolabel="1" colspan="4"/>
                 <group col="2" colspan="4">
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
                     <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>

From 2feb2ab8b403ff9de152ad6391506ef45ff82f52 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 13:09:49 +0530
Subject: [PATCH 161/294] improve

bzr revid: apa@tinyerp.com-20101014073949-sgorc1u4cdtc1xyf
---
 addons/mrp/report/price.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 52bcf3bcd4a..d41ee26bba9 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -120,7 +120,7 @@ class report_custom(report_rml):
                     <col t='yes'>%s</col>
                 </row>
             </lines>
-        """ % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')')
+        """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
         prod_header = """
                 <row>
                     <col>%s</col>
@@ -129,7 +129,7 @@ class report_custom(report_rml):
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                 </row>
-        """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
+        """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
 
         purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
 
@@ -149,7 +149,7 @@ class report_custom(report_rml):
                     <col para='yes'>-</col>
                     </row></lines>"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
+                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col f='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -176,7 +176,7 @@ class report_custom(report_rml):
 
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                 xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: </col>
+                    <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -193,14 +193,14 @@ class report_custom(report_rml):
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                     xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""": </col>
+                    <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +""": </col>
                     <col/>
                     <col/>
                     <col/>
                     <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
                     </row></lines>'"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
+                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>

From 3c8e1f835738f47397feaaf9cc892e4486fc2271 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 13:56:05 +0530
Subject: [PATCH 162/294] improve

bzr revid: apa@tinyerp.com-20101014082605-1q3srrqacxpaoxys
---
 addons/account/report/account_partner_ledger.py        | 2 +-
 addons/account/report/account_partner_ledger.rml       | 2 +-
 addons/account/report/account_partner_ledger_other.rml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 0038eb1278f..782b6b70364 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -139,7 +139,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         else:
             RECONCILE_TAG = "AND l.reconcile_id IS NULL"
         self.cr.execute(
-            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
+            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency,l.currency_id, c.symbol AS currency_code " \
             "FROM account_move_line l " \
             "LEFT JOIN account_journal j " \
                 "ON (l.journal_id = j.id) " \
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index ae273ba5647..139d9bb16cd 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -487,7 +487,7 @@
             <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
           </td>
         </tr>
       </blockTable>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 7d7dd035c3f..644077eec84 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -627,7 +627,7 @@
             <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
           </td>
         </tr>
       </blockTable>

From 413589655267ca77c701b7671b7ea03a33709064 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 13:57:21 +0530
Subject: [PATCH 163/294] [FIX] project_issue: correct dashboard problem

bzr revid: hmo@tinyerp.com-20101014082721-n7ingddyob4x09ff
---
 addons/project_issue/board_project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index ff8bf0801f1..2351869e003 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -126,7 +126,7 @@
             	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
 						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
+            	<xpath expr="/form/hpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
 						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
             	</xpath>
             </field>

From 7813760dbd7cf521cdf55dc956473043ed2e1baf Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 14:19:37 +0530
Subject: [PATCH 164/294] [IMP]:sale:Sale Order

bzr revid: apa@tinyerp.com-20101014084937-vbjj4u4734jb9m6l
---
 addons/sale/report/sale_order.rml | 50 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index b5f037625e6..866d2a20433 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Sale Order.pdf">
+  <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
@@ -132,22 +132,22 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
-          <para style="terp_default_9">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.title.name or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.street ]] </para>
-          <para style="terp_default_9">[[ (o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2)) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.zip) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name) or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -155,17 +155,17 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.zip) or '' ]] [[ (o.partner_order_id and o.partner_order_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id and o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -206,10 +206,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+          <para style="terp_default_Centre_8">[[ (o.user_id and o.user_id.name) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
+          <para style="terp_default_Centre_8">[[ (o.payment_term and o.payment_term.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -353,7 +353,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+          <para style="terp_default_9">[[ format((o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
         </td>
       </tr>
     </blockTable>

From 465f91053ed59622c68fbb96bbc057f4ab3ca2d5 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Thu, 14 Oct 2010 14:30:09 +0530
Subject: [PATCH 165/294] [IMP]: HR Dashboard.

bzr revid: rch@rch-desktop-20101014090009-x8m0g12mwacuiz45
---
 addons/hr_holidays/board_hr_holidays_view.xml | 38 +++++++++++++------
 .../report/available_holidays_view.xml        | 11 ++----
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 00412073532..aa654f1aa4c 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
         <menuitem
             action="hr.open_board_hr"
@@ -9,6 +9,20 @@
             id="base.menu_hr_project"
             parent="base.menu_hr_dasboard"
             sequence="4"/>
+
+      <record model="ir.ui.view" id="view_holiday_allocation_leave_tree">
+            <field name="name">hr.holidays.allocation.leave.tree</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Leaves" >
+                    <field name="name"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="holiday_status_id"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_view_holiday_status_board" model="ir.actions.act_window">
             <field name="name">My Leaves</field>
             <field name="type">ir.actions.act_window</field>
@@ -16,21 +30,21 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','in',('confirm', 'validate')),('user_id','=',uid)]</field>
-            <field name="view_id" ref="hr_holidays.open_allocation_holidays"/>
+            <field name="view_id" ref="view_holiday_allocation_leave_tree"/>
         </record>
-        
+
         <record id="board_hr_holidays_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1" position="inside"> 
+                <xpath expr="/form/hpaned/child1" position="inside">
                     <action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
                 </xpath>
             </field>
         </record>
-        
+
             <!-- Need to merge in above view -->
 
         <record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
@@ -40,18 +54,18 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+            <field name="context">{'group_by_no_leaf':1}</field>
             <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
         </record>
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>            
-            <field name="inherit_id" ref="hr.board_hr_form"/>           
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2" position="inside">            
-                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
-                </xpath>  
+                <xpath expr="/form/hpaned/child2" position="inside">
+                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves by Type" />
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b4cb2a99b7a..8eea65b94a1 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -32,13 +32,10 @@
             <field name="model">available.holidays.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Available Holidays" type="bar">
-                    <field name="employee_id"/>
-                    <field name="max_leave" operator="+"/>
-                    <field name="taken_leaves" operator="+"/>
-                    <field name="remaining_leave" operator="+"/>
-               		<field name="month" group = "True" operator="+" invisible="1"/>
-                    <field group="True" name="holiday_status_id"/>
+                <graph string="Available Holidays" type="bar">
+                    <field name="holiday_status_id"/>
+                    <field name="taken_leaves" string="Leave Days" operator="+"/>
+                    <field name="remaining_leave" string="Remaining Days" operator="+"/>
                 </graph>
             </field>
         </record>

From d323f8b10702350831260a0e520a6c723d170c8f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 14:46:13 +0530
Subject: [PATCH 166/294] [REM/IMP]:sale_laout:Removed unused report and
 improved Sale Layout report

bzr revid: apa@tinyerp.com-20101014091613-ie0zjk88j24nbtox
---
 addons/sale_layout/report/order.rml           | 378 ------------------
 .../sale_layout/report/report_sale_layout.rml |  49 ++-
 2 files changed, 24 insertions(+), 403 deletions(-)
 delete mode 100755 addons/sale_layout/report/order.rml

diff --git a/addons/sale_layout/report/order.rml b/addons/sale_layout/report/order.rml
deleted file mode 100755
index cde59d18e02..00000000000
--- a/addons/sale_layout/report/order.rml
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="AddressTable">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <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="OrderTable">
-      <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="HeadingTable">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Order_Desc_Table">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Total_Table">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
-    </blockTableStyle>
-    <blockTableStyle id="Partner_Note_Table">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <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="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"/>
-    <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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" 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_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="6.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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" 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="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_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_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <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_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Preformatted Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-    <blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]][[ o.partner_shipping_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or ''  ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]]  [[ o.partner_shipping_id.zip or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]][[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_Bold_9">Invoice address :</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.city or ''  ]]  [[ o.partner_invoice_id.zip or ''  ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.country_id and ('%s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.partner_id.title or ''  ]][[  o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.title or '' ]][[ o.partner_order_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.city or '' ]]  [[ o.partner_order_id.zip or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]][[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para')  ]]</para>
-          <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
-    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Your Reference </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Date Ordered </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Our Salesman </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Payment Terms</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="132.0,134.0,135.0,135.0" style="OrderTable">
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="208.0,99.0,64.0,59.0,43.0,65.0" repeatRows="1" style="HeadingTable">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(o.order_line,'line') ]]</para>
-      <blockTable colWidths="207.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Order_Desc_Table">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ line.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty  or '0.00']]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.price_unit or '0.00' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.discount and str(line.discount) or '0.00' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.price_subtotal or '0.00' ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P7">[[ format(line.notes or removeParentNode('tr')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="384.0,67.0,64.0,22.0" style="Total_Table">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P6">Net Total :</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ o.amount_untaxed or '0.00' ]]</para>
-        </td>
-        <td>
-          <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P5">Taxes :</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ o.amount_tax or '0.00' ]]</para>
-        </td>
-        <td>
-          <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P4">Total :</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ o.amount_total or  '0.00' ]] </para>
-        </td>
-        <td>
-          <para style="P3">[[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="533.0" style="Partner_Note_Table">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 9413ca09901..990c4c5c7b1 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -190,23 +190,23 @@
     <blockTable colWidths="254.0,62.0,211.0" style="Tableau2">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
-          <para style="terp_default_9">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+         <para style="terp_default_Bold_9">Shipping address :</para>
+          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '']]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.zip) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name) or '' ]]</para>
         </td>
         <td>
           <para style="P17">
@@ -214,19 +214,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para') ]] </para>
-          <para style="terp_default_9">[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.zip) or '' ]] [[ (o.partner_order_id and o.partner_order_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id and o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
-          <para style="P26">
+          <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
@@ -265,7 +264,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+          <para style="terp_default_Centre_8">[[ (o.user_id and o.user_id.name) or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
@@ -425,7 +424,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+          <para style="terp_default_9">[[ format((o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
         </td>
       </tr>
     </blockTable>

From d3cafb031fe255a52737ae6e4b998852074463e1 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 14 Oct 2010 14:51:23 +0530
Subject: [PATCH 167/294] [IMP]:account:Improves the tax report

bzr revid: azaz.201186@gmail.com-20101014092123-i19yma2q5n7iiv39
---
 addons/account/report/account_tax_report.py  | 2 +-
 addons/account/report/account_tax_report.rml | 2 +-
 addons/account/wizard/account_vat.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index 8275c3d84c1..02ade140d34 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -55,7 +55,7 @@ class tax_report(rml_parse.rml_parse):
 			        res['periods'] = period['name']
 		        else:
 			        res['periods'] += ", "+ period['name']
-            return res
+        return res
             
     def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 9f970e76751..47df92cc3bc 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -111,7 +111,7 @@
         <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td>
       </tr>
       <tr>
-        <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] ]]</para></td>
+        <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>
       </tr>
     </blockTable>
   <para style="P2"><font color="white"> </font></para>    	
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 9e0585619b1..abe489eef42 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -31,7 +31,7 @@ class account_vat_declaration(osv.osv_memory):
 		                              'Based On', required=True),
 		'company_id': fields.many2one('res.company', 'Company', required=True),
 		'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
-		'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year'),        
+		'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),        
 		}
 		
 	def _get_company(self, cr, uid, context={}):

From bee7aabb044619af2af858a03fcce88ae24a873b Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Thu, 14 Oct 2010 15:27:26 +0530
Subject: [PATCH 168/294] [FIX] hr_evaluation Changing the dead line of request
 based on Evaluation

bzr revid: jam@tinyerp.com-20101014095726-ng4zipv3cqo074k4
---
 addons/hr_evaluation/hr_evaluation.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 960849bdfd4..3bb159eb0fe 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -267,7 +267,21 @@ class hr_evaluation(osv.osv):
             context = {}
         self.write(cr, uid, ids,{'state':'cancel'}, context=context)
         return True
-
+        
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        if 'date' in vals:
+            new_vals = {}
+            obj_hr_eval_iterview = self.pool.get('hr.evaluation.interview')
+            current_record = self.browse(cr, uid, ids, context=context)[0]
+            survey_requests =  current_record.survey_request_ids
+            new_vals.update({'date_deadline':vals.get('date')})
+            if survey_requests:
+                for survey_req in survey_requests:
+                    obj_hr_eval_iterview.write(cr, uid, survey_req.id, new_vals,context=context)
+        return super(hr_evaluation, self).write(cr, uid, ids, vals, context=context)
+    
 hr_evaluation()
 
 class survey_request(osv.osv):

From ce4b580b5c0ae0b4956229b53e97c3318cb0708b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 14 Oct 2010 15:33:23 +0530
Subject: [PATCH 169/294] [Fix] purchase: Fix the log message

bzr revid: sbh@tinyerp.com-20101014100323-1mdy8apjiohpgu2k
---
 addons/purchase/purchase.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1522c4543f3..a0c6b66d29a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -416,8 +416,9 @@ class purchase_order(osv.osv):
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
-        message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled")
-        self.log(cr, uid, id, message)
+        for (id,name) in self.name_get(cr, uid, ids):        
+            message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled")
+            self.log(cr, uid, id, message)
         return True
 
     def action_picking_create(self,cr, uid, ids, *args):

From 69fed67914efd49552cd88699208d5e7b6c977a6 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Thu, 14 Oct 2010 15:39:01 +0530
Subject: [PATCH 170/294] [IMP]: Purchase & Accounting Dashboard.

bzr revid: rch@rch-desktop-20101014100901-6t9y1gutndb1vi5s
---
 addons/account/board_account_view.xml   | 4 ++--
 addons/purchase/board_purchase_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 89767eb1507..ade29ef6f83 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -44,7 +44,7 @@
                 <form string="Account Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Validate" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
@@ -68,6 +68,6 @@
 
         <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 6bbbe0e73e7..ffcd14213f2 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -17,7 +17,7 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Waiting Approval</field>
+            <field name="name">Purchase Order Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -125,7 +125,7 @@
                             <action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"  width="510"/>
                         -->
                         	<action colspan="4" height="220" name="%(purchase_draft)d" string="Request for Quotations"  width="510"/>
-                        	<action colspan="4" height="220" name="%(purchase_waiting)d" string="Waiting Approval"  width="510"/>
+                        	<action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"  width="510"/>
                         </child1>
                         <child2>
                         	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />

From 449c3ed3969949f6d51f3d4da534696b212acf0a Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 15:44:59 +0530
Subject: [PATCH 171/294] [IMP]:account,account_layout:Invoices Reports

bzr revid: apa@tinyerp.com-20101014101459-p1gkgrpzqt0wurmg
---
 .../account/report/account_print_invoice.rml  | 41 ++++++++++---------
 .../report/report_account_invoice_layout.rml  | 36 ++++++++--------
 .../report/special_message_invoice.rml        | 38 ++++++++---------
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 9e0782c1805..87f3bb770ba 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -140,18 +140,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -187,14 +187,14 @@
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="219.0,87.0,56.0,56.0,51.0,62.0" style="Table7">
+    <blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -218,7 +218,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="218.0,88.0,56.0,56.0,51.0,62.0" style="Table8">
+      <blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ l.name ]]</para>
@@ -315,10 +315,10 @@
     <para style="Text body">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
+    <blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Tax</para>
+          <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Base </para>
@@ -335,7 +335,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="167.0,60.0,55.0,248.0" style="Table2">
+      <blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
@@ -354,11 +354,14 @@
         </tr>
       </blockTable>
     </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ (o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
+    <para style="terp_default_9">[[ (o.payment_term and o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -368,7 +371,7 @@
           <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
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 cd23fc1f4ac..df7c25f3de8 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -185,18 +185,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para')]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-          <para style="terp_default_9">
+          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -238,7 +238,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -416,10 +416,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="105.0,52.0,62.0,320.0" style="Table7">
+    <blockTable colWidths="206.0,50.0,52.0,230.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Tax</para>
+          <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Base</para>
@@ -436,16 +436,16 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="105.0,51.0,63.0,320.0" style="Table8">
+      <blockTable colWidths="206.0,49.0,52.0,230.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index dafde3d34a6..2925b3526b8 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -189,18 +189,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para')]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ (o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-          <para style="terp_default_9">
+          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -242,7 +242,7 @@
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -420,10 +420,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="119.0,50.0,59.0,310.0" style="Table7">
+    <blockTable colWidths="209.0,54.0,46.0,229.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Tax</para>
+          <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Base</para>
@@ -439,17 +439,17 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="120.0,49.0,60.0,310.0" style="Table8">
+      <para style="terp_default_1">[[ repeatIn(o.tax_line,'t') ]]</para>
+      <blockTable colWidths="209.0,55.0,46.0,229.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">

From f6aaf3097edfdb33cbc48f698732ee8112ae215a Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 15:51:07 +0530
Subject: [PATCH 172/294] [IMP]:delivery:Delivery Order Reports

bzr revid: apa@tinyerp.com-20101014102107-6m2emow6ct9iyqp1
---
 addons/delivery/report/shipping.rml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index a4ed29bc643..8ba9342af9e 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Delivery Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Delivery Order.pdf">
+  <template pageSize="(595.0,842.0)" title="Delivery Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="30.0" y1="27.0" width="508" height="815"/>
     </pageTemplate>
@@ -189,11 +189,8 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[repeatIn(o.move_lines,'line')]]</para>
+      <para style="terp_default_1">[[repeatIn(o.move_lines,'line')]]</para>
       <blockTable colWidths="370.0,85.0,83.0" style="Table4">
         <tr>
           <td>
@@ -211,8 +208,5 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 2b29d4784d38f184b19b449ede5b01a1f6edb1d4 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 15:54:49 +0530
Subject: [PATCH 173/294] [IMP] project_issue: issue is pending after convert
 to task

bzr revid: hmo@tinyerp.com-20101014102449-0dt30yprikhvc62g
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ac8580f9c52..0e9807c865b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -281,7 +281,7 @@ class project_issue(crm.crm_case, osv.osv):
 
             vals = {
                 'task_id': new_task_id,
-                'state':'open'
+                'state':'pending'
             }
             case_obj.write(cr, uid, [bug.id], vals)
 

From 10ecb719bd9f013765cbb69d1c36b9e093edadf2 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 15:56:54 +0530
Subject: [PATCH 174/294] [IMP] project_long_term: improve gantt view

bzr revid: hmo@tinyerp.com-20101014102654-e3wkawf339sc9ido
---
 addons/document/document.py                   |  2 -
 addons/document/document_view.xml             | 60 ++++++++++---------
 addons/project_long_term/project_long_term.py |  8 ++-
 .../project_long_term_view.xml                | 12 ++--
 4 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 6c2a6b6aff5..92a00f3222c 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -88,7 +88,6 @@ class document_file(osv.osv):
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'index_content': fields.text('Indexed Content'),
         'partner_id':fields.many2one('res.partner', 'Partner', select=1),
-        'company_id': fields.many2one('res.company', 'Company'),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
 
@@ -102,7 +101,6 @@ class document_file(osv.osv):
         return dirobj._get_root_directory(cr, uid, context)
 
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
         'user_id': lambda self, cr, uid, ctx:uid,
         'file_size': lambda self, cr, uid, ctx:0,
         'parent_id': __get_def_directory
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b978cd222db..eeb2a879cb6 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -277,38 +277,42 @@
             </form>
         </field>
     </record>
-
-    <record id="view_attach_filter" model="ir.ui.view">
-            <field name="name">IR Attachment</field>
+       
+    <record id="view_attach_filter_inherit0" model="ir.ui.view">
+            <field name="name">IR Attachment0</field>
             <field name="model">ir.attachment</field>
             <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-             <search string="Document">
-             <filter icon="terp-go-month" string="Month"
-                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                />
-                 <separator orientation="vertical"/>
-                 <field name="name"/>
-                 <field name="parent_id" />
-                 <field name="user_id">
-                    <filter icon="terp-personal"
-                        domain="[('user_id','=',uid)]"
-                        help="Filter on my documents" />
-                 </field>
-                <field name="partner_id"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Partner" icon="terp-personal" domain="[]"
+                <field name="create_uid" position="replace">
+                    <field name="user_id">
+                            <filter icon="terp-personal"
+                                domain="[('user_id','=',uid)]"
+                                help="Filter on my documents" />
+                        </field>
+                    <field name="parent_id" />
+                </field>
+            </field>
+    </record>
+
+        
+
+    <record id="view_attach_filter_inherit2" model="ir.ui.view">
+            <field name="name">IR Attachment2</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <filter string="Owner" position="replace">
+                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
-                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                </group>
-              </search>
-             </field>
-         </record>
+                    
+                 </filter>
+            </field>
+    </record>
+
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
@@ -319,6 +323,7 @@
                 <field name="name"/>
                 <field name="parent_id" />
                 <field name="user_id"/>
+                <field name="company_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
                 <field name="partner_id" groups="base.group_extended" />
@@ -333,7 +338,6 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
-        <field name="search_view_id" ref="view_attach_filter"/>
         <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index e6f65ba1fa9..d6d43f83c5d 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -297,6 +297,7 @@ class project_phase(osv.osv):
         if context is None:
             context = {}
         resource_pool = self.pool.get('resource.resource')
+        resource_allocation_pool = self.pool.get('project.resource.allocation')
         uom_pool = self.pool.get('product.uom')
         if context is None:
            context = {}
@@ -344,7 +345,12 @@ class project_phase(osv.osv):
                                           'date_start': start_date.strftime('%Y-%m-%d'),
                                           'date_end': end_date.strftime('%Y-%m-%d')
                                         }, context=ctx)
-
+            # write dates into Resources Allocation
+            for resource in phase.resource_ids:
+                resource_allocation_pool.write(cr, uid, [resource.id], {
+                                        'date_start': start_date.strftime('%Y-%m-%d'),
+                                        'date_end': end_date.strftime('%Y-%m-%d')
+                                    }, context=ctx)
             # Recursive call till all the next phases scheduled
             for phase in phase.next_phase_ids:
                if phase.state in ['draft', 'open', 'pending']:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e83085c3afa..f124fc27c8c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -14,8 +14,8 @@
             <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
-               <level object="res.users" link="user_id" domain="[]">
-                   <field name="useability" string="Availability"/>
+               <level object="project.resource.allocation" link="id" domain="[]">
+                    <field name="resource_id"/>
                 </level>
               </gantt>
             </field>
@@ -27,7 +27,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
+                <calendar color="resource_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
                     <field name="phase_id"/>
                     <field name="project_id"/>
                 </calendar>
@@ -244,7 +244,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
-                    <level object="project.project" link="project_id" domain="[]">
+                    <level object="project.phase" link="id" domain="[]">
                         <field name="name"/>
                     </level>
                 </gantt>
@@ -288,7 +288,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+            <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
@@ -298,7 +298,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+ 			<field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 

From b8ba14a6d09284afeff3b9c02ffb78a24fc8b8d1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:02:34 +0530
Subject: [PATCH 175/294] [IMP] project_long_term: menu rearrange

bzr revid: hmo@tinyerp.com-20101014103234-jhitg1bav1vcvbqh
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f124fc27c8c..2d893a57a34 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -373,14 +373,14 @@
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="3"/>
 
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 

From 5b6c8231f018fb00e393e346c4a035fbc37ddc7d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 16:06:10 +0530
Subject: [PATCH 176/294] [IMP]:purchase:Order Reports

bzr revid: apa@tinyerp.com-20101014103610-2ft2n5pgafewims0
---
 addons/purchase/report/order.rml             | 26 ++++++++++----------
 addons/purchase/report/request_quotation.rml | 16 ++++++------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 2c565130030..60ee35b92bb 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Purchase Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Purchase Order.pdf">
+  <template pageSize="(595.0,842.0)" title="Purchase Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
     </pageTemplate>
@@ -149,7 +149,7 @@
               <td>
                 <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="terp_default_9">[[ addr.partner_id.title.name or '' ]] [[ addr.partner_id.name ]]</para>
+                <para style="terp_default_9">[[ (addr.partner_id and addr.partner_id.title and addr.partner_id.title.name) or '' ]] [[ (addr.partner_id and addr.partner_id.name) or '' ]]</para>
                 <para style="terp_default_9">[[ addr.street ]]</para>
                 <para style="terp_default_9">[[ addr.street2 or removeParentNode('para') ]]</para>
                 <para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
@@ -168,18 +168,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or removeParentNode('para')]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.street ) or '']]</para>
+          <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.zip) or '' ]] [[ (o.partner_address_id and o.partner_address_id.city) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.state_id and o.partner_address_id.state_id.name) or removeParentNode('para')]]</para>
+          <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.country_id and o.partner_address_id.country_id.name) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
-          <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
-          <para style="terp_default_9">TVA : [[ o.partner_id.vat or '' ]]</para>
+          <para style="terp_default_9">Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -219,7 +219,7 @@
           <para style="terp_default_Centre_8">[[formatLang(o.date_order,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.validator and o.validator.name or '' ]]</para>
+          <para style="terp_default_Centre_8">[[ (o.validator and o.validator.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 95de453dca0..edc82087e5a 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Request for Quotation" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Request for Quotation.pdf">
+  <template pageSize="(595.0,842.0)" title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
@@ -88,7 +88,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']]</para>
           <para style="terp_default_9">[[ (order.partner_address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
@@ -97,9 +97,9 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or '' ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or '' ]]</para>
-          <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or '' ]]</para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -124,8 +124,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_9">[[repeatIn(order.order_line,'order_line')]]</para>
-      <blockTable colWidths="371.0,100.0,39.0,20.0" style="Table_Product_Line">
+      <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
+      <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>

From 4a72d3a745c2eb88a7bc654b2037fe4e7fac3c23 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:07:07 +0530
Subject: [PATCH 177/294] [IMP] base: add company_id in ir.attachment and
 improve search view

bzr revid: hmo@tinyerp.com-20101014103707-rz7114umi29g4w9s
---
 bin/addons/base/ir/ir.xml           | 36 +++++++++++++++++++++--------
 bin/addons/base/ir/ir_attachment.py |  4 +++-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 1f815ed1604..d0ac223b515 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -854,8 +854,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Attachments">
-                    <field name="name" />
-                    <field name="type"/>
+                    <group colspan="4" col="6">
+                        <field name="name" />
+                        <field name="type"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
                     <notebook colspan="4">
                     <page string="Attachment">
                     <group col="4" colspan="4">
@@ -896,6 +899,8 @@
                 <tree string="Attachments">
                     <field name="name"/>
                     <field name="datas_fname"/>
+                    <field name="type" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="create_uid"/>
                     <field name="create_date"/>
                 </tree>
@@ -908,20 +913,31 @@
             <field name="arch" type="xml">
                 <search string="Attachments">
                     <group colspan="4" col="10">
-                      <filter icon="terp-stage"
-                        string="URL"
-                        domain="[('type','=','url')]"/>
-                      <filter icon="terp-stock_align_left_24"
-                        string="Binary"
-                        domain="[('type','=','binary')]"/>
-                    <separator orientation="vertical"/>
+                        <filter icon="terp-stage"
+                            string="URL"
+                            domain="[('type','=','url')]"/>
+                        <filter icon="terp-stock_align_left_24"
+                            string="Binary"
+                            domain="[('type','=','binary')]"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="Month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="type"/>
                         <field name="datas_fname"/>
+                        <field name="create_uid">
+                            <filter icon="terp-personal"
+                                domain="[('create_uid','=',uid)]"
+                                help="Filter on my documents" />
+                        </field>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Creator" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index 173632c4411..fb621ea58fc 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -117,11 +117,13 @@ class ir_attachment(osv.osv):
                 'Type', help="Binary File or external URL", required=True),
 
         'create_date': fields.datetime('Date Created', readonly=True),
-        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
+        'create_uid':  fields.many2one('res.users', 'Owner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
     
     _defaults = {
         'type': 'binary',
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
     }
 
     def _auto_init(self, cr, context=None):

From e5fdaa3fe4fcbcfb4a64afeda84115358cba512c Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 14 Oct 2010 16:08:38 +0530
Subject: [PATCH 178/294] [IMP]:point_of_sale:Improves the pos_details report

bzr revid: azaz.201186@gmail.com-20101014103838-ivok82tf8mqnays7
---
 addons/point_of_sale/report/pos_details.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 388c30a42ce..36f509a770e 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -332,7 +332,7 @@
     <blockTable colWidths="257.0,254.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Sales total</para>
+          <para style="terp_default_Bold_9">Sales total(Revenue)</para>
         </td>
         <td>
           <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>

From 1be14671a4306a20ef1db0927db92db8326abffe Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 14 Oct 2010 16:13:56 +0530
Subject: [PATCH 179/294] [IMP] hr_recruitment : new field added as
 no_of_recuirtment and functionality changed one expected employee and
 no_of_employee

bzr revid: vir@tinyerp.com-20101014104356-hgqehpxa0bwv9dzi
---
 addons/hr/hr.py                               | 21 ++++++++++++-------
 addons/hr/hr_view.xml                         |  4 +++-
 addons/hr_recruitment/hr_recruitment.py       | 21 ++++---------------
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index c05836c393a..3e789709195 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -80,18 +80,13 @@ hr_employee_marital_status()
 
 class hr_job(osv.osv):
 
-    def _no_of_employee(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for emp in self.browse(cr, uid, ids):
-            res[emp.id] = len(emp.employee_ids or [])
-        return res
-
     _name = "hr.job"
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
         'expected_employees': fields.integer('Expected Employees', help='Required number of Employees'),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'),
+        'no_of_employee': fields.integer('No of Employees', help='Number of employee there are already in the department', readonly=True),
+        'no_of_recruitment': fields.integer('No of Recruitment'),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
         'requirements': fields.text('Requirements'),
@@ -102,9 +97,19 @@ class hr_job(osv.osv):
     _defaults = {
         'expected_employees': 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
-        'state': 'open'
+        'state': 'open',
+        'no_of_recruitment': 1,
     }
 
+    def on_change_expected_employee(self, cr, uid, ids, expected_employee, context=None):
+        if context is None:
+            context = {}
+        result={}
+        if expected_employee:
+            xx  = self.browse(cr, uid, ids, context)[0]
+            result['no_of_recruitment'] = expected_employee - xx['no_of_employee']
+        return {'value': result}
+
     def job_old(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'old'})
         return True
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 2b1cd596024..eb0601002f1 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -324,8 +324,9 @@
                     <field name="name" />
                     <field name="department_id" />
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="expected_employees"/>
+                    <field name="expected_employees" on_change="on_change_expected_employee(expected_employees)"/>
                     <field name="no_of_employee"/>
+                    <field name="no_of_recruitment"/>
                     </group>
                     <newline/>
                     <notebook colspan="4">
@@ -360,6 +361,7 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="expected_employees"/>
                     <field name="no_of_employee"/>
+                    <field name="no_of_recruitment"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3dbcd946e87..11b3dc06650 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -429,17 +429,13 @@ class hr_applicant(crm.crm_case, osv.osv):
             message = _('Applicant ') + " '" + name + "' "+ _("is Hired.")
             self.log(cr, uid, id, message)
 
-        stage_id = self.pool.get('hr.recruitment.stage').search(cr, uid, [('name','=','Contract Signed')])
-        self.write(cr, uid, ids,{'stage_id':stage_id[0]})
-
         applicant = self.browse(cr, uid, ids)[0]
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            expected_emp = job_data['expected_employees'] - 1
-            if expected_emp == 0:
-                job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+            no_of_emp = job_data['no_of_employee'] + 1
+            no_of_recruit = job_data['no_of_recruitment'] - 1
+            job_obj.write(cr,uid, [applicant.job_id.id],{'no_of_employee':no_of_emp,'no_of_recruitment':no_of_recruit})
         return res
 
     def case_reset(self, cr, uid, ids, *args):
@@ -450,18 +446,9 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
-        applicant = self.browse(cr, uid, ids)[0]
-        if applicant.job_id :
-            job_obj = self.pool.get('hr.job')
-            emp_obj = self.pool.get('hr.employee')
-            job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            expected_emp = job_data['expected_employees'] + 1
-            emp_id = emp_obj.search(cr,uid, [('job_id','=',applicant.job_id.id),('name','=',applicant.name)])
-            emp_obj.unlink(cr, uid, emp_id)
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+
         res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': False, 'date_closed':False})
-        
         return res
 
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 033fd68052c..cf2097b2454 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -297,7 +297,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="no_of_employee" position="after">
+            <field name="department_id" position="after">
                 <field name="survey_id"/>
             </field>
         </field>

From 4d79e1553ec6766994a5659df8d01bc7c8922dc7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:14:13 +0530
Subject: [PATCH 180/294] [IMP] project_scrum: improve calendar view of sprint

bzr revid: hmo@tinyerp.com-20101014104413-10gnihbtkdjh26lg
---
 addons/project_scrum/project_scrum_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 9b913f76294..0356dcb9ff0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -197,7 +197,7 @@
             <field name="model">project.scrum.sprint</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar string="Scrum Sprint" date_start="date_start" date_stop="date_stop">
+                <calendar string="Scrum Sprint" date_start="date_start">
                     <field name="name"/>
                     <field name="project_id"/>
                 </calendar>

From 732ca8b5cf9b0108d13de83a5d9267d77f62f275 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 14:03:23 +0300
Subject: [PATCH 181/294] Doc webdav: fix typo in case of exception.

If user rights are not setup for the user that connects to WebDAV, this
exception will occur and the typo would not help debug the problem.
(still, the user won't see the items at either case)

bzr revid: p_christ@hol.gr-20101014110323-zxj5oha0u96e2l1t
---
 addons/document_webdav/dav_fs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 5b5b1341679..f6156475231 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -339,7 +339,7 @@ class openerp_dav_handler(dav_interface):
                         result.append( self.urijoin(dbname,d.path) )
         except DAV_Error:
             raise
-        except Exception:
+        except Exception, e:
             self.parent.log_error("cannot get_childs: "+ str(e))
             raise
         finally:

From 82aa9ea653f849d6bb767d5f597fa71554f513cd Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 14:03:29 +0300
Subject: [PATCH 182/294] CalDAV: add documentation for iPhone(TM) setup

(TM) The iPhone is a trademark of Cisco corporation. It is used by
Apple Inc. Whatever...

bzr revid: p_christ@hol.gr-20101014110329-0qh1lgtm4vd7a9m9
---
 addons/caldav/doc/iPhone.rst | 97 ++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 addons/caldav/doc/iPhone.rst

diff --git a/addons/caldav/doc/iPhone.rst b/addons/caldav/doc/iPhone.rst
new file mode 100644
index 00000000000..4a3af7724d2
--- /dev/null
+++ b/addons/caldav/doc/iPhone.rst
@@ -0,0 +1,97 @@
+==========================
+CalDAV with iPhone How-To
+==========================
+
+As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly
+tested and supported as a Calendaring client for the OpenERP CalDAV module.
+
+However, keep in mind that OpenERP is not a straightforward calendaring
+server, but an ERP application (with more data + structure) which exposes
+that data to calendar clients. That said, the full features that would be
+accessible through the Gtk or Web OpenERP clients cannot be crammed into
+the Calendar clients (such as the iPhone).
+
+OpenERP server Setup
+--------------------
+Some modules need to be installed at the OpenERP server. These are:
+    - caldav: Required, has the reference setup and the necessary
+            underlying code. Will also cause document, document_webdav
+            to be installed.
+    - crm_caldav: Optional, will export the CRM Meetings as a calendar.
+    - project_caldav: Optional, will export project tasks as calendar.
+    - http_well_known: Optional, experimental. Will ease bootstrapping,
+            but only when a DNS srv record is also used.
+
+These will also install a reference setup of the folders, ready to go.
+The administrator of OpenERP can add more calendars and structure, if
+needed.
+
+DNS server setup
+------------------
+To be documented.
+
+SSL setup
+----------
+It is highly advisable that you also setup SSL to work for the OpenERP
+server. HTTPS is a server-wide feature in OpenERP, which means a 
+certificate will be set at the openerp-server.conf and will be the same
+for XML-RPC, HTTP, WebDAV and CalDAV.
+The iPhone also supports secure connections with SSL, although it does
+not expect a self-signed certificate (or one that is not verified by
+one of the "big" certificate authorities [1] ).
+
+Phone setup
+-------------
+The iPhone is fairly easy to setup.
+IF you need SSL (and your certificate is not a verified one, as usual),
+then you first will need to let the iPhone trust that. Follow these
+steps:
+  s1. Open Safari and enter the https location of the OpenERP server:
+      https://my.server.ip:8071/
+      (assuming you have the server at "my.server.ip" and the HTTPS port
+      is the default 8071)
+  s2. Safari will try to connect and issue a warning about the certificate
+      used. Inspect the certificate and click "Accept" so that iPhone
+      now trusts it.
+
+Now, to setup the calendars, you need to:
+1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.
+2. Go to "Add account..."
+3. Click on "Other"
+4. From the "Calendars" group, select "Add CalDAV Account"
+5. Enter the server's name or IP address at the "Server" entry, the
+      OpenERP username and password at the next ones.
+      As a description, you can either leave the server's name or
+      something like "OpenERP calendars".
+6. You _will_ get the "Unable to verify account" error message. That is
+      because our server is not at the port iPhone expects[2]. But no
+      need to worry, click OK.
+7. At the next page, enter the "Advanced Settings" to specify the right
+      ports and paths 
+8. If you have SSL, turn the switch on. Note that port will be changed
+      to 8443.
+9. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
+10. Set the "Account URL" to the right path of the OpenERP webdav:
+      https://my.server.ip:8071/webdav/dbname/calendars
+      Where "https://my.server.ip:8071" is the protocol, server name 
+      and port as discussed above, "dbname" is the name of the database.
+      [Note that the default 
+      "https://my.server.ip:8071/principals/users/username" might also
+      be edited to 
+      "https://my.server.ip:8071/webdav/dbname/principals/users/username" ]
+11. Click on Done. The phone will hopefully connect to the OpenERP server
+      and verify it can use the account.
+12. Go to the main menu of the iPhone and enter the Calendar application.
+      Your OpenERP calendars will be visible inside the selection of the
+      "Calendars" button.
+    Note that when creating a new calendar entry, you will have to specify
+    which calendar it should be saved at.
+
+
+
+
+[1] I remember one guy that made *lots* of money selling his CA business
+off, and since then uses this money to create a software monopoly.
+[2] This may not happen if the SRV records at DNS and the well-known URIs
+are setup right. But we appreciate that a default OpenERP installation will
+not have the DNS server of the company's domain configured.

From 33fadebcccea84fb2594d21bc7eb3aa516d1f936 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 16:36:37 +0530
Subject: [PATCH 183/294] [IMP]:stock,mrp:locations and production order Report

bzr revid: apa@tinyerp.com-20101014110637-mo8jjis916syxqdp
---
 addons/mrp/report/order.rml              | 52 +++++++++++++-----------
 addons/stock/report/lot_overview.rml     | 42 ++++++++-----------
 addons/stock/report/lot_overview_all.rml | 46 ++++++++-------------
 3 files changed, 61 insertions(+), 79 deletions(-)

diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 03bd0377cc5..e07966ff5c9 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Production Order.pdf">
   <template pageSize="(595.0,842.0)" title="Production Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
@@ -17,9 +17,12 @@
       <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="LINEAFTER" 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="LINEAFTER" 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"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -28,9 +31,12 @@
       <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="LINEAFTER" 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="LINEAFTER" 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"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -175,7 +181,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="200.0,199.0,128.0" style="Table2">
+    <blockTable colWidths="193.0,206.0,129.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Source Document</para>
@@ -188,16 +194,16 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="200.0,199.0,129.0" style="Table2">
+    <blockTable colWidths="193.0,205.0,129.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.origin ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
+          <para style="terp_default_Centre_8">[[ (o.product_id and o.product_id.code) or '' ]] [[ (o.product_id and o.product_id.name) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ o.product_uom.name ]]</para>
+          <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ (o.product_id and o.product_uom and o.product_uom.name) or '']]</para>
         </td>
       </tr>
     </blockTable>
@@ -245,7 +251,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table6">
+    <blockTable colWidths="74.0,212.0,112.0,66.0,64.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Sequence</para>
@@ -266,7 +272,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
-      <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table4">
+      <blockTable colWidths="74.0,212.0,112.0,66.0,64.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
@@ -275,7 +281,7 @@
             <para style="terp_default_Centre_8">[[ line2.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ line2.workcenter_id.name ]]</para>
+            <para style="terp_default_Centre_8">[[ (line2.workcenter_id and line2.workcenter_id.name) or '' ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_8">[[ formatLang(line2.cycle) ]]</para>
@@ -315,45 +321,45 @@
     <section>
       <para style="terp_default_Bold_9">Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]</para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
+        <para style="terp_default_2">[[ repeatIn(o.move_lines,'line') ]]</para>
         <blockTable colWidths="250.0,65.0,108.0,104.0" style="Table9">
           <tr>
             <td>
-              <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
+              <para style="terp_default_9">[[ (line.product_id and line.product_id.code) or '' ]] [[ (line.product_id and line.product_id.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] [[ line.product_uom.name]] </para>
+              <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] [[ (line.product_uom and line.product_uom.name) or '']] </para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line.location_id.name ]]</para>
+              <para style="terp_default_Centre_9">[[ (line.location_id and line.location_id.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line.location_dest_id.name ]]</para>
+              <para style="terp_default_Centre_9">[[ (line.location_dest_id and line.location_dest_id.name) or '' ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <section>
+      <para style="terp_default_Bold_9">
+        <font color="white"> </font>
+      </para>
       <para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>
+        <para style="terp_default_2">[[ repeatIn(o.move_lines2,'line2') ]]</para>
         <blockTable colWidths="251.0,66.0,106.0,104.0" style="Table10">
           <tr>
             <td>
-              <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
+              <para style="terp_default_9">[[ (line2.product_id and line2.product_id.code) or '' ]] [[ (line2.product_id and line2.product_id.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] [[ line2.product_uom.name]] </para>
+              <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] [[ (line2.product_uom and line2.product_uom.name) or '']] </para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
+              <para style="terp_default_Centre_9">[[ (line2.location_id and line2.location_id.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line2.location_dest_id.name ]]</para>
+              <para style="terp_default_Centre_9">[[ (line2.location_dest_id and line2.location_dest_id.name) or '' ]]</para>
             </td>
           </tr>
         </blockTable>
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index 14f2b25eb4e..4283bd2e960 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Location Overview.pdf">
+  <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="33.0" y1="57.0" width="526" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -93,7 +93,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="233.0,60.0,59.0,59.0,72.0" style="Table6">
+    <blockTable colWidths="248.0,91.0,62.0,59.0,67.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Location / Product</para>
@@ -113,10 +113,10 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+      <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
-        <blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
+        <para style="terp_default_2">[[ repeatIn(process(o.id),'ob') ]]</para>
+        <blockTable colWidths="339.0,62.0,59.0,66.0" style="Table7">
           <tr>
             <td>
               <para style="terp_default_Bold_9">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
@@ -136,21 +136,11 @@
                 <font color="white"> </font>
               </para>
             </td>
-            <td>
-              <para style="terp_default_Bold_9">
-                <font color="white"> </font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Bold_9">
-                <font color="white"> </font>
-              </para>
-            </td>
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
-          <blockTable colWidths="38.0,196.0,60.0,59.0,58.0,72.0" style="Table8">
+          <para style="terp_default_2">[[ repeatIn(ob['product'],'p') ]]</para>
+          <blockTable colWidths="32.0,216.0,91.0,62.0,60.0,65.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">
@@ -167,15 +157,15 @@
                 <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price'], digits=get_digits(dp='Account')) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
               </td>
             </tr>
           </blockTable>
         </section>
-        <blockTable colWidths="38.0,366.0,78.0" style="Table10">
+        <blockTable colWidths="32.0,421.0,74.0" style="Table10">
           <tr>
             <td>
               <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
@@ -184,13 +174,13 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="71.0,334.0,77.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="78.0,365.0,84.0" repeatRows="1" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Grand Total:</para>
@@ -201,7 +191,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -209,4 +199,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 7d2360068a8..5104671fa11 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Location Content" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Location Content.pdf">
+  <template pageSize="(595.0,842.0)" title="Location Content" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="34.0" y1="27.0" width="523" height="782"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -23,7 +23,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -93,7 +92,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="233.0,60.0,59.0,59.0,72.0" style="Table6">
+    <blockTable colWidths="253.0,65.0,63.0,63.0,78.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Location / Product</para>
@@ -113,10 +112,10 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+      <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
-        <blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
+        <para style="terp_default_2">[[ repeatIn(process(o.id),'ob') ]]</para>
+        <blockTable colWidths="319.0,63.0,63.0,78.0" style="Table7">
           <tr>
             <td>
               <para style="terp_default_Bold_9">[[ (not ob['product']) and removeParentNode('blockTable') ]][[ ob['location_name'] ]]</para>
@@ -136,21 +135,11 @@
                 <font color="white"> </font>
               </para>
             </td>
-            <td>
-              <para style="terp_default_Bold_9">
-                <font color="white"> </font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Bold_9">
-                <font color="white"> </font>
-              </para>
-            </td>
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
-          <blockTable colWidths="38.0,196.0,60.0,59.0,58.0,72.0" style="Table8">
+          <para style="terp_default_2">[[ repeatIn(ob['product'],'p') ]]</para>
+          <blockTable colWidths="29.0,225.0,65.0,63.0,63.0,78.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">
@@ -167,15 +156,15 @@
                 <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price'], digits=get_digits(dp='Account')) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
               </td>
             </tr>
           </blockTable>
         </section>
-        <blockTable colWidths="38.0,366.0,78.0" style="Table10">
+        <blockTable colWidths="29.0,409.0,84.0" style="Table10">
           <tr>
             <td>
               <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
@@ -184,13 +173,13 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="71.0,334.0,77.0" repeatRows="1" style="Table2">
+    <blockTable colWidths="77.0,362.0,84.0" repeatRows="1" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Grand Total:</para>
@@ -201,12 +190,9 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 79408f5b3ad21f0b77a2fb68f89a930b9da521ec Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Thu, 14 Oct 2010 16:42:16 +0530
Subject: [PATCH 185/294] [IMP]: Manufacturing Dashboard.

bzr revid: rch@rch-desktop-20101014111216-f5ipdutrowzz9fqz
---
 addons/mrp/board_manufacturing_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index c5474670d9b..c36ac668b45 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -13,14 +13,13 @@
                 <form string="Manufacturing board">
                     <hpaned position="100">
                         <child1>
-                            <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
-                            <action colspan="4" name="%(stock.action_picking_tree)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
+                            <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next Production Orders" width="510"/>
                             <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception"/>
                         </child1>
                         <child2>
-                            <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
+                            <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future load"/>
 
-                            <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
+                            <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
                         </child2>
                     </hpaned>
                 </form>

From dca39945f2c31b00e2818e872bedb504ad68981e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:45:01 +0530
Subject: [PATCH 186/294] [IMP] document: add index context in search filter in
 document list view

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

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index eeb2a879cb6..840c8a4c9e1 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -291,6 +291,7 @@
                                 help="Filter on my documents" />
                         </field>
                     <field name="parent_id" />
+                    <field name="index_content"/>
                 </field>
             </field>
     </record>
@@ -308,7 +309,6 @@
                     <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                    
                  </filter>
             </field>
     </record>

From b77f01923b23fb9afb369e2b2f283864e4d60fc5 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 16:53:21 +0530
Subject: [PATCH 187/294] [IMP]:hr_attandance:Attendance Errors

bzr revid: apa@tinyerp.com-20101014112321-9pf0f1u1r72vmju7
---
 .../report/attendance_errors.rml              | 112 +++++++-----------
 1 file changed, 45 insertions(+), 67 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index 685f228a710..9ad71c84476 100644
--- a/addons/hr_attendance/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Attendance Errors" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Attendance Errors.pdf">
+  <template pageSize="(595.0,842.0)" title="Attendance Errors" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="26.0" width="536" height="784"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,7 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_employee_detail_header">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -19,21 +19,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="tbl_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <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="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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_employee_detail_content">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -42,24 +28,23 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_employee_total">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <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="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -71,9 +56,9 @@
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" 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_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <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="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -83,16 +68,13 @@
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" 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_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(get_employees(data['form']['emp_ids']),'employee') ]]</para>
     <para style="terp_header_Centre">Attendance Errors</para>
-    <para style="P1">[[ employee.name ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="78.0,118.0,151.0,98.0,75.0" style="Table_employee_detail_header">
+    <para style="terp_tblheader_Details">[[ employee.name ]]</para>
+    <blockTable colWidths="107.0,107.0,107.0,107.0,107.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Operation</para>
@@ -111,36 +93,32 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="519.0" style="tbl_detail">
+    <section>
+      <para style="terp_default_8">[[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]]</para>
+      <blockTable colWidths="107.0,107.0,107.0,107.0,107.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ att['action'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(att['date'],date_time=True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(att['create_date'],date_time=True) ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ att['delay'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ att['delay2'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="322.0,108.0,107.0" style="Table3">
       <tr>
         <td>
-          <para style="terp_default_8">[[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]]</para>
-          <blockTable colWidths="62.0,123.0,154.0,100.0,75.0" style="Table_employee_detail_content">
-            <tr>
-              <td>
-                <para style="terp_default_9">[[ att['action']  ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_9">[[  formatLang(att['date'],date_time=True)  ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_9">[[ formatLang(att['create_date'],date_time=True) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_9">[[ att['delay']  ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_9">[[ att['delay2']  ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="357.0,99.0,63.0" style="Table_employee_total">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total period:<font face="Times">[[ repeatIn(total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']),'total')]] </font></para>
+          <para style="terp_default_Bold_9">Total period:[[ repeatIn(total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']),'total') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9_Bold">[[ total['total'] ]]</para>

From 816dc0de90a3e970620d855ce35d9071ea23b358 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Thu, 14 Oct 2010 16:59:28 +0530
Subject: [PATCH 188/294] [FIX] hr_evaluations -> Evaluation Reminders Wizard
 Send Mail

bzr revid: jam@tinyerp.com-20101014112928-502jadzmxvf24nrq
---
 addons/hr_evaluation/wizard/hr_evaluation_mail.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 576c782bfd8..3464c4beaee 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -29,14 +29,14 @@ class hr_evaluation_reminder(osv.osv_memory):
     }
 
     def send_mail(self, cr, uid, ids, context=None):
-        hr_evaluation_obj = self.pool.get('hr_evaluation.evaluation')
+        hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
         if context is None:
             context = {}
         evaluation_data = self.read(cr, uid, ids, context=context)[0]
-        for waiting_id in hr_evaluation_obj.browse(cr, uid, evaluation_data['evaluation_id'], context=context).survey_request_ids:
-            if waiting_id.state == "waiting_answer" and waiting_id.user_to_review_id.work_email :
-                msg = " Hello %s, \n\n Kindly post your response for %s survey. \n\n Thanks,"  %(waiting_id.user_to_review_id.name, waiting_id.survey_id.title)
-                tools.email_send(tools.config['email_from'], [waiting_id.user_to_review_id.work_email],\
+        current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
+        if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
+            msg = " Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,"  %(current_interview.user_to_review_id.name, current_interview.survey_id.title)
+            tools.email_send(tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
                                           'Reminder to fill up Survey', msg)
         return {'type': 'ir.actions.act_window_close'}
 

From a96153ebb6c8e9f53db9c7ae127dc054cadfa238 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Thu, 14 Oct 2010 17:09:30 +0530
Subject: [PATCH 189/294] [IMP]: Project Dashboard.

bzr revid: rch@rch-desktop-20101014113930-atj3i3uox11zax9s
---
 addons/project/board_project_view.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 71b5d87aa1f..dc985d4e515 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -21,6 +21,11 @@
                     <field name="planned_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
+                    <field name="state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                 </tree>
             </field>
         </record>
@@ -39,6 +44,18 @@
                     <field name="total_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="type_id"/>
+                    <button name="next_type" invisible="context.get('set_visible',False)"
+                        states="draft,open,pending"
+                        string="Change Stage"
+                        type="object"
+                        icon="gtk-go-forward"
+                        groups="base.group_extended"
+                        help="Change Type"/>
+                    <field name="state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                 </tree>
             </field>
         </record>

From d690bec1cbf864718cc335268e8bf0e88d9273c1 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 14:41:59 +0300
Subject: [PATCH 190/294] Doc Webdav: close cursor when dav_get_eprop raises
 Exceptions.

bzr revid: p_christ@hol.gr-20101014114159-ek4fp05fvjygobr2
---
 addons/document_webdav/dav_fs.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index f6156475231..4665610524e 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -215,12 +215,13 @@ class openerp_dav_handler(dav_interface):
         if not dbname:
             if cr: cr.close()
             raise DAV_NotFound
-        node = self.uri2object(cr, uid, pool, uri2)
-        if not node:
+        try:
+            node = self.uri2object(cr, uid, pool, uri2)
+            if not node:
+                raise DAV_NotFound
+            res = node.get_dav_eprop(cr, ns, propname)
+        finally:
             cr.close()
-            raise DAV_NotFound
-        res = node.get_dav_eprop(cr, ns, propname)
-        cr.close()
         return res
 
     def get_db(self, uri, rest_ret=False, allow_last=False):

From 6e7fab049dc532560a7d54d1ba3a73c4ae68f8f3 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 14:42:06 +0300
Subject: [PATCH 191/294] Document: set the uid as a part of the node_context
 context.

This means that a 'uid' variable will be available to all dynamic context
or domain expressions calculated on nodes.

bzr revid: p_christ@hol.gr-20101014114206-3mpsxcsei1mlafqb
---
 addons/document/nodes.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 67105e6bd05..68220885dff 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -74,6 +74,9 @@ class node_context(object):
         self.dbname = cr.dbname
         self.uid = uid
         self.context = context
+        if context is None:
+            context = {}
+        context['uid'] = uid
         self._dirobj = pooler.get_pool(cr.dbname).get('document.directory')
         self.node_file_class = node_file
         self.extra_ctx = {} # Extra keys for context, that do _not_ trigger inequality

From 1e0daa78447147bc5b6b78f3f1bdfc311781b87f Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 14:42:16 +0300
Subject: [PATCH 192/294] CalDAV wizards: Set the uid in the context, just like
 the nodes would do.

bzr revid: p_christ@hol.gr-20101014114216-lswnmers6kyywyom
---
 addons/caldav/wizard/calendar_event_export.py    | 5 ++++-
 addons/caldav/wizard/calendar_event_import.py    | 5 +++++
 addons/caldav/wizard/calendar_event_subscribe.py | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index ea90686b347..0a55f8b4fbe 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -37,8 +37,11 @@ class calendar_event_export(osv.osv_memory):
         """
         Get Default value for Name field.
         """
-        if not context:
+        if context is None:
             context = {}
+        else:
+            context= context.copy()
+        context['uid'] = uid
         model = context.get('model', 'basic.calendar')
         model_obj = self.pool.get(model)
         res = super(calendar_event_export, self).default_get( cr, uid, fields, context=context)
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
index 875e48d7d47..11f9f9b4afb 100644
--- a/addons/caldav/wizard/calendar_event_import.py
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -42,6 +42,11 @@ class calendar_event_import(osv.osv_memory):
         @param ids: List of calendar event import’s IDs
         @return: dictionary of calendar evet import  window with Import successful msg.
         """
+        if context is None:
+            context = {}
+        else:
+            context = context.copy()
+        context['uid'] = uid
 
         for data in self.read(cr, uid, ids):
             model = data.get('model', 'basic.calendar')
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
index de673b5d7c0..f8dc7614507 100644
--- a/addons/caldav/wizard/calendar_event_subscribe.py
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -44,6 +44,12 @@ class calendar_event_subscribe(osv.osv_memory):
         @return: dictionary of calendar evet subscribe  window with Import successful msg.
         """
         global cnt
+        if context is None:
+            context = {}
+        else:
+            context = context.copy()
+        context['uid'] = uid
+
         for data in self.read(cr, uid, ids):
             try:
                 f =  urllib.urlopen(data['url_path'])

From 4a99c0d63b12d4a8ba385c456c5c55179adbddb0 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 17:18:56 +0530
Subject: [PATCH 193/294] [IMP]:account_followup:Account Followup

bzr revid: apa@tinyerp.com-20101014114856-31736pcqf6xb11sw
---
 .../report/account_followup_print.rml         | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 32bd8103a1c..a87b6e5b46e 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Follow UP" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Account Followup.pdf">
+  <template pageSize="(595.0,842.0)" title="Account Followup" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
+      <frame id="first" x1="31.0" y1="28.0" width="532" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -48,15 +48,18 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,1" stop="5,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.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"/>
@@ -92,16 +95,16 @@
   <story>
     <para style="terp_default_8">[[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] </para>
     <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
-    <blockTable colWidths="286.0,224.0" style="Tableau2">
+    <blockTable colWidths="298.0,234.0" style="Tableau2">
       <tr>
         <td>
           <para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.name ]]</para>
-          <para style="terp_default_9">[[ a['street'] ]]</para>
+          <para style="terp_default_9">[[ o.name or '' ]]</para>
+          <para style="terp_default_9">[[ a['street'] or '']]</para>
           <para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ a['zip'] ]] [[ a['city'] ]]</para>
+          <para style="terp_default_9">[[ a['zip'] or '' ]] [[ a['city'] or '' ]]</para>
           <para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
           <para style="terp_default_9">
@@ -124,7 +127,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="68.0,78.0,45.0,70.0,51.0,58.0,62.0,61.0,27.0" style="Table1">
+    <blockTable colWidths="66.0,77.0,46.0,74.0,52.0,62.0,59.0,67.0,28.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details_Centre">Invoice Date</para>
@@ -157,7 +160,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
-      <blockTable colWidths="68.0,79.0,44.0,69.0,49.0,62.0,61.0,60.0,26.0" style="Table5">
+      <blockTable colWidths="66.0,78.0,46.0,69.0,57.0,62.0,58.0,68.0,28.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line['date'],date = True) ]]</para>
@@ -189,7 +192,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="191.0,108.0,73.0,61.0,60.0,26.0" style="Table2">
+    <blockTable colWidths="190.0,113.0,77.0,57.0,68.0,28.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -200,10 +203,10 @@
           <para style="terp_tblheader_Details">Sub-Total: </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]]</para>
+          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]</para>
+          <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]] </para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]] [[ company.currency_id.symbol ]]</para>
@@ -214,6 +217,8 @@
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="193.0,109.0,88.0,142.0" style="Table3">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -224,20 +229,10 @@
           <para style="terp_tblheader_Details">Balance: </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.symbol]] </para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.symbol]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="Standard">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="Standard">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>

From 90efafbb37ed9dabfc89a5a487510bffbfc9c213 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 17:45:12 +0530
Subject: [PATCH 194/294] [IMP] project_long_term: improvement gantt view

bzr revid: hmo@tinyerp.com-20101014121512-7gjrlk5mvkdad8nl
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 2d893a57a34..9a4e89011e9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,9 +13,9 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
-               <level object="project.resource.allocation" link="id" domain="[]">
-                    <field name="resource_id"/>
+              <gantt color="resource_id" date_start="date_start" date_stop="date_end" mode="year">
+               <level object="project.project" link="project_id" domain="[]">
+                    <field name="phase_id"/>
                 </level>
               </gantt>
             </field>
@@ -243,8 +243,8 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
-                    <level object="project.phase" link="id" domain="[]">
+                <gantt color="name" date_stop="date_end" date_start="date_start" mode="year">
+                    <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
                 </gantt>

From 990b57275f212afbe204d568eb20cd168e5d286c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 18:01:20 +0530
Subject: [PATCH 195/294] [IMP]:Purchase for Requisitions

bzr revid: apa@tinyerp.com-20101014123120-onh8rq71mleogyl1
---
 .../report/purchase_requisition.rml           | 172 +++++++++---------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index 95f1dd47d31..bb1eff8b0fe 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Purchase for Requisitions.pdf">
+  <template pageSize="(595.0,842.0)" title="Purchase for Requisitions" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -10,29 +10,9 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>      
-      <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"/>
- 	<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,2" stop="-1,-1"/>   
-    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>      
       <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"/>
@@ -46,12 +26,10 @@
       <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"/>
- 	<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,2" stop="-1,-1"/> 
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>      
       <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"/>
@@ -65,15 +43,39 @@
       <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"/>
- 	<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,2" stop="-1,-1"/> 
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0" textColor="#008000"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.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"/>
@@ -108,19 +110,18 @@
     <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-	<paraStyle name="terp_header_left" fontName="Helvetica-Bold" fontSize="10.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>    
     <images/>
   </stylesheet>
   <story>
-      <para style="terp_header_Centre">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_8">[[ repeatIn(objects,'requisition') ]]</para>
-    <para style="P3">Purchase for Requisitions [[ requisition.name ]]</para>
-        <para style="terp_header_Centre">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table1">
+    <para style="terp_header">Purchase for Requisitions [[ requisition.name ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table2">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Requisition Reference</para>
@@ -135,92 +136,91 @@
           <para style="terp_tblheader_General_Centre">Origin</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ requisition.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ requisition.date_start ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(requisition.date_start,date_time='True') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ requisition.exclusive=='multiple' and 'Multiple Requisitions' or requisition.exclusive=='exclusive' and 'Purchase Requisitions (exclusive)'  ]]</para>
+          <para style="terp_default_Centre_8">[[ requisition.exclusive=='multiple' and 'Multiple Requisitions' or requisition.exclusive=='exclusive' and 'Purchase Requisitions (exclusive)' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ requisition.origin ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_Centre_8">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-	    <para style="terp_default_Centre_8">
-      <font color="white"> </font>
-    </para>  
+    <para style="terp_tblheader_Details">Product Detail [[ requisition.line_ids==[] and removeParentNode('para') ]]</para>
+    <blockTable colWidths="375.0,71.0,84.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description [[ requisition.line_ids==[] and removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Product UoM</para>
+        </td>
+      </tr>
+    </blockTable>
     <section>
-      <para style="terp_header_left">Product Detail</para>    
-      <blockTable colWidths="177.0,177.0,177.0" style="Table2">[[ requisition.line_ids or removeParentNode('section') ]]
+      <para style="terp_default_8">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
+      <blockTable colWidths="375.0,71.0,84.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_tblheader_Details_Centre">Description</para>
+            <para style="terp_default_9">[ [[ (line_ids.product_id and line_ids.product_id.code) or '' ]] ] [[ (line_ids.product_id and line_ids.product_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Centre">Qty</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids.product_qty) ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Centre">Product UoM</para>
-          </td>
-        </tr>
-        <tr><para style="terp_default_8">[[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
-          <td>
-            <para style="terp_default_Centre_8">[[ line_ids.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ line_ids.product_qty ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ line_ids.product_uom_id.category_id.name ]]</para>
+            <para style="terp_default_Centre_9">[[ (line_ids.product_uom_id and line_ids.product_uom_id.category_id and line_ids.product_uom_id.category_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_Centre_8">
+    <para style="terp_default_8">
       <font color="white"> </font>
-    </para>    
-    <para style="terp_default_Centre_8">
-      <font color="white"> </font>
-    </para>      
-    <section>
-     <para style="terp_header_left">Quotation Detail</para>
-    <blockTable colWidths="133.0,163.0,235.0" style="Table3">[[ requisition.purchase_ids or removeParentNode('section') ]]
+    </para>
+    <para style="terp_tblheader_Details">Quotation Detail [[ requisition.purchase_ids ==[] and removeParentNode('para') ]]</para>
+    <blockTable colWidths="337.0,96.0,97.0" style="Table6">
       <tr>
         <td>
-          <para style="terp_tblheader_Details_Centre">Order Reference</para>
+          <para style="terp_tblheader_Details">Supplier [[ requisition.purchase_ids ==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Date Ordered</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Supplier</para>
-        </td>
-      </tr>
-      <tr><para style="P2">[[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
-        <td>
-          <para style="terp_default_Centre_8">[[ purchase_ids.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ purchase_ids.date_order ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ purchase_ids.partner_address_id.partner_id.name ]]</para>
+          <para style="terp_tblheader_Details_Centre">Order Reference</para>
         </td>
       </tr>
     </blockTable>
+    <section>
+      <para style="terp_default_8">[[ requisition.purchase_ids ==[] and removeParentNode('section') ]] [[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
+      <blockTable colWidths="338.0,96.0,96.0" style="Table7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.partner_id and purchase_ids.partner_address_id.partner_id.name) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(purchase_ids.date_order,date='True') ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ purchase_ids.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
     </section>
-    <para style="P3">
-      <font color="white"> </font>
-    </para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
\ No newline at end of file

From 24e34984642c75bacc8a5662a41a8da5f51b4994 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 18:10:32 +0530
Subject: [PATCH 196/294] [IMP] resource: improve calendar view of resource
 leave

bzr revid: hmo@tinyerp.com-20101014124032-6xagruqhmrbuu93n
---
 addons/resource/resource_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index de602a177af..a0db745efb4 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -140,7 +140,7 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar color="resource_id" date_start="date_from" string="Resource">
+                <calendar color="resource_id" date_start="date_from" date_stop="date_to" string="Resource">
                     <field name="name"/>
                 </calendar>
             </field>

From 8f309cad930f569406f2ac5884634e170d00339c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 18:14:22 +0530
Subject: [PATCH 197/294] improved

bzr revid: apa@tinyerp.com-20101014124422-92njez8f2fsqb01m
---
 addons/account/report/account_general_journal.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index fdf044c048e..f41302408c5 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -287,7 +287,7 @@
         <td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>

From 049fd624c33f12ad38f08dc991c41c34ac93d998 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 18:18:23 +0530
Subject: [PATCH 198/294] [IMP] project_scrum: remove project_id from search
 filter in scrum meeting

bzr revid: hmo@tinyerp.com-20101014124823-xdw1jqnsv5yz051t
---
 addons/project_scrum/project_scrum_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0356dcb9ff0..cd4eb8e61b4 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -366,7 +366,6 @@
             <field name="arch" type="xml">
                 <calendar string="Scrum Meeting" date_start="date" color="user_id">
                     <field name="sprint_id"/>
-                    <field name="project_id"/>
                 </calendar>
             </field>
         </record>
@@ -430,7 +429,6 @@
                         <field name="sprint_id">
                             <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
                         </field>
-                        <field name="project_id"/>
                         <field name="date"/>
                     </group>
                     <newline/>

From b275fc4601263e58def6d8ff29088e18a6a6b09d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 14 Oct 2010 15:51:18 +0300
Subject: [PATCH 199/294] Doc Webdav: reply with relative URIs when the request
 was relative.

If the DAV client requests properties for a relative URI (without the
protocol:ip:port part), it means it can also understand responses with
relative notation, so don't bother calculating the prefix (non-trivial).

This fixes the REPORT responses to Mozilla Sunbird.

bzr revid: p_christ@hol.gr-20101014125118-3x5ivmrbaqwb1nsx
---
 addons/document_webdav/webdav.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 484a1054475..bb2b8caf470 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -152,7 +152,12 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
         fileloc = fileloc.encode('utf-8')
     href=doc.createElement("D:href")
     davpath = self._dataclass.parent.get_davpath()
-    hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+    if uparts[0] and uparts[1]:
+        hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+    else:
+        # When the request has been relative, we don't have enough data to
+        # reply with absolute url here.
+        hurl = '%s%s' % (davpath, urllib.quote(fileloc))
     huri=doc.createTextNode(hurl)
     href.appendChild(huri)
     re.appendChild(href)
@@ -226,7 +231,12 @@ def mk_propname_response(self,uri,propnames,doc):
         fileloc = fileloc.encode('utf-8')
     href=doc.createElement("D:href")
     davpath = self._dataclass.parent.get_davpath()
-    hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+    if uparts[0] and uparts[1]:
+        hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+    else:
+        # When the request has been relative, we don't have enough data to
+        # reply with absolute url here.
+        hurl = '%s%s' % (davpath, urllib.quote(fileloc))
     huri=doc.createTextNode(hurl)
     href.appendChild(huri)
     re.appendChild(href)

From 66d99a2b42e309162e43ebb67189463141da8b8e Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 14 Oct 2010 18:27:19 +0530
Subject: [PATCH 200/294] [IMP]:point_of_sale:Improves the pos_details report

bzr revid: azaz.201186@gmail.com-20101014125719-jsh654bm8dvtf97a
---
 addons/point_of_sale/report/pos_details.py  | 19 ++++++++++++++++---
 addons/point_of_sale/report/pos_details.rml |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 69a691a14f9..a4b5b8f4c1e 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -76,7 +76,7 @@ class pos_details(report_sxw.rml_parse):
         res2=[]
         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 ,res_users as ru,res_company as rc " \
-                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in('invoiced')  " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('invoiced')  " \
                          "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
                          "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
                          ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
@@ -88,7 +88,7 @@ class pos_details(report_sxw.rml_parse):
         res3=[]
         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, res_users as ru,res_company as rc " \
-                         "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','done')  " \
+                         "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','done')  " \
                          "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
                          "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
                          ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
@@ -96,6 +96,19 @@ class pos_details(report_sxw.rml_parse):
         self.total_paid=res3[0]
         return res3[0] or False
 
+    def _get_sum_dis_2(self,form,user):
+        res4=[]
+        self.cr.execute ("select sum(pol.price_ded * pol.qty)" \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('paid')  " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        res4=self.cr.fetchone()
+        self.total_invoiced=res4[0]
+        return res4[0] or False
+
+
     def _get_sum_discount(self, objects):
         #code for the sum of discount value
         return reduce(lambda acc, object:
@@ -187,7 +200,7 @@ class pos_details(report_sxw.rml_parse):
             'time': time,
             'strip_name': self._strip_name,
             'getpayments': self._get_payments,
-            'getsumdisc': self._get_sum_discount,
+            'getsumdisc': self._get_sum_dis_2,
             'gettotalofthaday': self._total_of_the_day,
             'gettaxamount': self._get_tax_amount,
             'getperiod': self._get_period,
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 36f509a770e..ae9d7252984 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -247,7 +247,7 @@
             <para style="terp_default_Centre_9">[[ formatLang(line_ids['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
+            <para style="terp_default_Centre_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -359,7 +359,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(objects)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>

From 4bc20cd5288b791fa406f76dc382a94fd60fab0c Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 14 Oct 2010 18:43:54 +0530
Subject: [PATCH 201/294] [IMP]:point_of_sale:Improves the pos_details report

bzr revid: azaz.201186@gmail.com-20101014131354-iduvsmlcwlnob7ay
---
 addons/point_of_sale/report/pos_details.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index a4b5b8f4c1e..a45e1736e62 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -75,13 +75,14 @@ class pos_details(report_sxw.rml_parse):
     def _get_sum_invoice_2(self,form,user):
         res2=[]
         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 ,res_users as ru,res_company as rc " \
-                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('invoiced')  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc,account_invoice as ai " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and ai.id=po.invoice_id " \
                          "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
                          "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
                          ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
         res2=self.cr.fetchone()
         self.total_invoiced=res2[0]
+        print "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",res2[0]
         return res2[0] or False
 
     def _paid_total_2(self,form,user):

From f286327b788de43920f7981a5e8ba3330608c9bd Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 14 Oct 2010 18:45:43 +0530
Subject: [PATCH 202/294] [IMP]:point_of_sale:Improves the pos_details report

bzr revid: azaz.201186@gmail.com-20101014131543-ywsadzzquypgdv0y
---
 addons/point_of_sale/report/pos_details.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index a45e1736e62..0e77dd39188 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -82,7 +82,6 @@ class pos_details(report_sxw.rml_parse):
                          ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
         res2=self.cr.fetchone()
         self.total_invoiced=res2[0]
-        print "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",res2[0]
         return res2[0] or False
 
     def _paid_total_2(self,form,user):

From 70ea8226cf7391fec91943aea8d176189ad0ebb4 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 14 Oct 2010 19:08:02 +0530
Subject: [PATCH 203/294] imp

bzr revid: apa@tinyerp.com-20101014133802-ka7y1dvtqucf9399
---
 .../purchase_requisition/report/purchase_requisition.rml  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index bb1eff8b0fe..e7734ce54a0 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -75,7 +75,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.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"/>
@@ -171,7 +170,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
+      <para style="terp_default_2">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
       <blockTable colWidths="375.0,71.0,84.0" style="Table5">
         <tr>
           <td>
@@ -204,7 +203,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ requisition.purchase_ids ==[] and removeParentNode('section') ]] [[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
+      <para style="terp_default_2">[[ requisition.purchase_ids ==[] and removeParentNode('section') ]] [[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
       <blockTable colWidths="338.0,96.0,96.0" style="Table7">
         <tr>
           <td>
@@ -218,9 +217,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
     </section>
   </story>
 </document>
\ No newline at end of file

From afb78caf8d830c4c49cf531568659870efa9d72c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 19:11:24 +0530
Subject: [PATCH 204/294] [IMP] project_long_term: gantt view and search view
 of phase

bzr revid: hmo@tinyerp.com-20101014134124-s90f56e5dn3cx28g
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9a4e89011e9..713322f5f0e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -230,9 +230,9 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="responsible_id" date_start="date_start" date_stop="date_end" day_length="12" string="Phases">
+                <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
                     <field name="name"/>
-                    <field name="project_id"/>
+                    <field name="responsible_id"/>
                 </calendar>
             </field>
         </record>
@@ -243,7 +243,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="name" date_stop="date_end" date_start="date_start" mode="year">
+                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="year">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>

From 6f5eb0b5b48f8e2670df5f6491bd64767179eecb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 15:58:54 +0200
Subject: [PATCH 205/294] [IMP] web_services: better error reporting for report
 generation issues

bzr revid: odo@openerp.com-20101014135854-ecidlal4qj42ul89
---
 bin/service/web_services.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 8b33b41a0b3..df42d8736ce 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -722,7 +722,10 @@ class report_spool(netsvc.ExportService):
                 logger = netsvc.Logger()
                 logger.notifyChannel('web-services', netsvc.LOG_ERROR,
                         'Exception: %s\n%s' % (str(exception), tb_s))
-                self._reports[id]['exception'] = ExceptionWithTraceback(tools.exception_to_unicode(exception), tb)
+                if hasattr(exception, 'name') and hasattr(exception, 'value'):
+                    self._reports[id]['exception'] = ExceptionWithTraceback(tools.ustr(exception.name), tools.ustr(exception.value))
+                else:
+                    self._reports[id]['exception'] = ExceptionWithTraceback(tools.exception_to_unicode(exception), tb)
                 self._reports[id]['state'] = True
             cr.commit()
             cr.close()
@@ -733,8 +736,9 @@ class report_spool(netsvc.ExportService):
 
     def _check_report(self, report_id):
         result = self._reports[report_id]
-        if result['exception']:
-            raise result['exception']
+        exc = result['exception']
+        if exc:
+            self.abortResponse(exc, exc.message, 'warning', exc.traceback)
         res = {'state': result['state']}
         if res['state']:
             if tools.config['reportgz']:
@@ -754,7 +758,6 @@ class report_spool(netsvc.ExportService):
         return res
 
     def exp_report_get(self, db, uid, report_id):
-
         if report_id in self._reports:
             if self._reports[report_id]['uid'] == uid:
                 return self._check_report(report_id)

From 487c36486ca1f5a47369933920e0ceeaff82ac29 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Oct 2010 14:07:10 +0200
Subject: [PATCH 206/294] fix_typo

bzr revid: fp@tinyerp.com-20101015120710-tnhvi5cmvhyctib2
---
 bin/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 3bef2042774..dcb1bf709fa 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -104,7 +104,7 @@ class res_partner(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
-        'title': fields.many2one('res.partner.title','Title'),
+        'title': fields.many2one('res.partner.title','Legal Status'),
         'parent_id': fields.many2one('res.partner','Parent Partner', select=2),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Reference', size=64),

From a971419f30066c8b8b83c1f9d6bba6055077571c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 15 Oct 2010 18:30:25 +0530
Subject: [PATCH 207/294] [ADD/MOD]hr_timesheet_sheet: Add Timesheet Sheet
 Analysis report

bzr revid: dbr@tinyerp.com-20101015130025-yrmt74x8soq226h0
---
 addons/hr_timesheet_sheet/__openerp__.py      |   1 +
 addons/hr_timesheet_sheet/report/__init__.py  |   2 +
 .../report/timesheet_report.py                | 122 +++++++++++++++++
 .../report/timesheet_report_view.xml          | 126 ++++++++++++++++++
 4 files changed, 251 insertions(+)
 create mode 100644 addons/hr_timesheet_sheet/report/timesheet_report.py
 create mode 100644 addons/hr_timesheet_sheet/report/timesheet_report_view.xml

diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index d00ee91a304..383521b399d 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -55,6 +55,7 @@ The validation can be configured in the company:
         'process/hr_timesheet_sheet_process.xml',
         'board_hr_timesheet_view.xml',
         'report/hr_timesheet_report_view.xml',
+        'report/timesheet_report_view.xml',
         'wizard/hr_timesheet_current_view.xml',
         'hr_timesheet_sheet_data.xml'
     ],
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
index 8dac73f07ec..b06b0608356 100644
--- a/addons/hr_timesheet_sheet/report/__init__.py
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -19,5 +19,7 @@
 #
 ##############################################################################
 
+import timesheet_report
 import hr_timesheet_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
new file mode 100644
index 00000000000..a8c0440a053
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -0,0 +1,122 @@
+# -*- 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 tools
+from osv import fields,osv
+
+class timesheet_report(osv.osv):
+    _name = "timesheet.report"
+    _description = "Timesheet"
+    _auto = False
+    _columns = {
+        'year': fields.char('Year',size=64,required=False, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'name': fields.char('Description', size=64,readonly=True),
+        'product_id' : fields.many2one('product.product', 'Product'),
+        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
+        'nbr': fields.integer('#Nbr',readonly=True),
+        'total_diff': fields.float('#Total Diff',readonly=True),
+        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
+        'total_attendance': fields.float('#Total Attendance',readonly=True),
+        'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'department_id':fields.many2one('hr.department','Department',readonly=True),
+        'date_from': fields.date('Date from',readonly=True,),
+        'date_to': fields.date('Date to',readonly=True),
+        'date_current': fields.date('Current date', required=True),
+        'state' : fields.selection([
+            ('new', 'New'),
+            ('draft','Draft'),
+            ('confirm','Confirmed'),
+            ('done','Done')], 'State', readonly=True),
+        'quantity': fields.float('#Quantity',readonly=True),
+        'cost': fields.float('#Cost',readonly=True),
+        }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'timesheet_report')
+        cr.execute("""
+            create or replace view timesheet_report as (
+                    select
+                        min(aal.id) as id,
+                        htss.date_current,
+                        htss.name,
+                        htss.date_from,
+                        htss.date_to,
+                        to_char(htss.date_current,'YYYY') as year,
+                        to_char(htss.date_current,'MM') as month,
+                        to_char(htss.date_current, 'YYYY-MM-DD') as day,
+                        count(*) as nbr,
+                        aal.unit_amount as quantity,
+                        aal.amount as cost,
+                        aal.account_id,
+                        aal.product_id,
+                        (SELECT   sum(day.total_difference)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
+                        (SELECT sum(day.total_timesheet)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
+                        (SELECT sum(day.total_attendance)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
+                        aal.to_invoice,
+                        aal.general_account_id,
+                        htss.user_id,
+                        htss.company_id,
+                        htss.department_id,
+                        htss.state
+                    from account_analytic_line as aal
+                    left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
+                    left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
+                    group by
+                        to_char(htss.date_current,'YYYY'),
+                        to_char(htss.date_current,'MM'),
+                        to_char(htss.date_current, 'YYYY-MM-DD'),
+                        aal.account_id,
+                        htss.date_from,
+                        htss.date_to,
+                        aal.unit_amount,
+                        aal.amount,
+                        htss.date_current,
+                        aal.to_invoice,
+                        aal.product_id,
+                        aal.general_account_id,
+                        htss.name,
+                        htss.company_id,
+                        htss.state,
+                        htss.id,
+                        htss.department_id,
+                        htss.user_id
+            )
+        """)
+timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
new file mode 100644
index 00000000000..08abc6db63b
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_timesheet_report_graph" model="ir.ui.view">
+            <field name="name">timesheet.report.graph</field>
+            <field name="model">timesheet.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet" type="bar">
+                    <field name="user_id" />
+                    <field name="quantity" operator = "+"/>
+                    <field name="state" group = "True"/>
+                </graph>
+            </field>
+        </record>
+        <record id="view_timesheet_report_tree" model="ir.ui.view">
+            <field name="name">timesheet.report.tree</field>
+            <field name="model">timesheet.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
+                    <field name="date_current" invisible="1"/>
+                    <field name="name" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="date_from" invisible="1"/>
+                    <field name="date_to" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="department_id" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="to_invoice" invisible="1"/>
+                    <field name="product_id" invisible="1"/>
+                    <field name="account_id" invisible="1"/>
+                    <field name="general_account_id" invisible="1"/>
+                    <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="quantity" sum="#Quantity"/>
+                    <field name="cost" sum="#Cost"/>
+                    <field name="total_diff" sum="#Total Diff"/>
+                    <field name="total_timesheet" sum="#Total Timesheet"/>
+                    <field name="total_attendance" sum="#Total Attendance"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_timesheet_report_search" model="ir.ui.view">
+            <field name="name">timesheet.report.search</field>
+            <field name="model">timesheet.report</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Timesheet">
+                    <group col="10" colspan="12">
+                        <filter icon="terp-go-year" string=" Year "
+                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                                help="Timesheet in current year"/>
+                        <filter icon="terp-go-month" string=" Month "
+                                name="month"
+                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                                help="Timesheet in current month"/>
+                        <filter icon="terp-go-month"
+                            string=" Month-1 "
+                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Timesheet of last month"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new"
+                                string="Draft"
+                                domain="[('state','=','draft')]"/>
+                        <filter icon="terp-camera_test"
+                                string="Confirmed"
+                                domain="[('state','=','confirm')]"/>
+                        <filter icon="terp-dialog-close"
+                                    string="Done"
+                                    domain="[('state','=','done')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="account_id"/>
+                      <field name="user_id" />
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="general_account_id"/>
+                        <field name="to_invoice" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="product_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="department_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="date_to"/>
+                        <field name="date_from"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_timesheet_report_stat_all" model="ir.actions.act_window">
+            <field name="name">Timesheet Sheet Analysis</field>
+            <field name="res_model">timesheet.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="search_view_id" ref="view_timesheet_report_search"/>
+        </record>
+        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
+                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
+    </data>
+</openerp>

From d5b1d3e87dc38c87b58792900b241b721e556db9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 15 Oct 2010 18:47:00 +0530
Subject: [PATCH 208/294] [IMP/MOD]hr_timesheet_invoice : Usability Improvement

bzr revid: dbr@tinyerp.com-20101015131700-jsvmj8fw9gfui7qr
---
 .../test/test_hr_timesheet_invoice.yml                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index cda4574845a..9a22de4d828 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -28,8 +28,6 @@
   I create invoice on analytic Line using "Invoice analytic Line" wizard.
 -
   !record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
-    accounts:
-      - account.analytic_sednacom
     date: 1
     name: 1
     price: 1
@@ -46,10 +44,12 @@
   I check that Invoice is created for this timesheet.
 -
   !python {model: account.analytic.line}: |
+	account_id = self.pool.get('account.analytic.line')
+ 	accounts = account_id.browse(cr, uid, [ref("account_analytic_line_developyamlforhrmodule0")])[0]
     exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0]
     analytic_account_obj = self.pool.get('account.analytic.account')
     data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
-    account_ids = data['accounts']
+    account_ids = accounts['account_id']
     for account in analytic_account_obj.browse(cr, uid, account_ids, context):
             partner = account.partner_id.id
 
@@ -81,4 +81,4 @@
 -
   I can also make some theoretical revenue reports.
 -
-  I can also see timesheet profit using Timesheet profit report.
\ No newline at end of file
+  I can also see timesheet profit using Timesheet profit report.

From 1bee855ce6797242509335142fe7775d3c67b17a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 15 Oct 2010 10:10:43 +0530
Subject: [PATCH 209/294] [MOD] marketing_campaign set default true in
 configuration wizard

bzr revid: vir@tinyerp.com-20101015044043-sjijtzt1wihwoy46
---
 addons/marketing/marketing_wizard.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index 4b95bbb86da..a97d0ca16bc 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -32,6 +32,10 @@ class marketing_installer(osv.osv_memory):
         'crm_profiling':fields.boolean('Profiling Tools',
             help="Helps you to perform segmentation of partners and design segmentation questionnaires")
     }
+    _defaults = {
+        'marketing_campaign': lambda *a: 1,
+    }
+
 marketing_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 0c7cd16aeac5cdc0f58be36ea7972bc9139aefa9 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Fri, 15 Oct 2010 11:18:58 +0530
Subject: [PATCH 210/294] [IMP]: Warehouse Dashboard.

bzr revid: rch@rch-desktop-20101015054858-oar5rzrxjscambof
---
 addons/stock/board_warehouse_view.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 84a24f3d0b2..33ec62132fb 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -5,41 +5,43 @@
             <field name="name">Warehouse</field>
         </record>
 
-    
+
 		<record id="action_incoming_product_board" model="ir.actions.act_window">
             <field name="name">Incoming Product</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>            
+			<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
 			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
-                
+
 		<record id="action_outgoing_product_board" model="ir.actions.act_window">
             <field name="name">Outgoing Product</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>			
+			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
 			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
-        
+
 		<record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
+			<field name="domain">[('type','=','in')]</field>
+			<field name="view_id" ref="stock.view_stock_graph_board"></field>
 			<field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
+			<field name="domain">[('type','=','out')]</field>
+			<field name="view_id" ref="stock.view_stock_graph_board"></field>
 			<field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
-         </record>         
+         </record>
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
             <field name="model">board.board</field>
@@ -53,7 +55,7 @@
                         </child1>
 
                         <child2>
-							<action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>						                              
+							<action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
 							<action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
                         </child2>
                     </hpaned>

From e3f957c8caa8fe4356e6a654ec632ca98ca96596 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 11:21:35 +0530
Subject: [PATCH 211/294] improve

bzr revid: apa@tinyerp.com-20101015055135-h7df9r8048p7mx95
---
 .../report/account_followup_print.rml                | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index a87b6e5b46e..fb0f93b4a38 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="Account Followup.pdf">
-  <template pageSize="(595.0,842.0)" title="Account Followup" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Account Followup" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="31.0" y1="28.0" width="532" height="786"/>
     </pageTemplate>
@@ -59,7 +59,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.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"/>
@@ -127,7 +126,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="66.0,77.0,46.0,74.0,52.0,62.0,59.0,67.0,28.0" style="Table1">
+    <blockTable colWidths="66.0,77.0,46.0,74.0,52.0,62.0,59.0,67.0,29.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details_Centre">Invoice Date</para>
@@ -192,7 +191,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="190.0,113.0,77.0,57.0,68.0,28.0" style="Table2">
+    <blockTable colWidths="190.0,101.0,87.0,58.0,68.0,28.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -218,7 +217,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="193.0,109.0,88.0,142.0" style="Table3">
+    <blockTable colWidths="193.0,92.0,100.0,147.0" style="Table3">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -238,8 +237,5 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
\ No newline at end of file

From bef860db74f516356dbb4f701e076b35f930f8bd Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 15 Oct 2010 11:31:58 +0530
Subject: [PATCH 212/294] [Fix] hr : problem of ids in job position form view

bzr revid: vir@tinyerp.com-20101015060158-yhibx8xn80m30gl5
---
 addons/hr/hr.py       | 9 ++++-----
 addons/hr/hr_view.xml | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 3e789709195..ffae26d2949 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -85,8 +85,8 @@ class hr_job(osv.osv):
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
         'expected_employees': fields.integer('Expected Employees', help='Required number of Employees'),
-        'no_of_employee': fields.integer('No of Employees', help='Number of employee there are already in the department', readonly=True),
-        'no_of_recruitment': fields.integer('No of Recruitment'),
+        'no_of_employee': fields.integer('No of Employees', help='Number of employee there are already in the department'),
+        'no_of_recruitment': fields.integer('No of Recruitment', readonly=True),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
         'requirements': fields.text('Requirements'),
@@ -101,13 +101,12 @@ class hr_job(osv.osv):
         'no_of_recruitment': 1,
     }
 
-    def on_change_expected_employee(self, cr, uid, ids, expected_employee, context=None):
+    def on_change_expected_employee(self, cr, uid, ids, expected_employee, no_of_employee, context=None):
         if context is None:
             context = {}
         result={}
         if expected_employee:
-            xx  = self.browse(cr, uid, ids, context)[0]
-            result['no_of_recruitment'] = expected_employee - xx['no_of_employee']
+            result['no_of_recruitment'] = expected_employee - no_of_employee
         return {'value': result}
 
     def job_old(self, cr, uid, ids, *args):
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index eb0601002f1..d47579a5d43 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -324,8 +324,8 @@
                     <field name="name" />
                     <field name="department_id" />
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="expected_employees" on_change="on_change_expected_employee(expected_employees)"/>
-                    <field name="no_of_employee"/>
+                    <field name="expected_employees" on_change="on_change_expected_employee(expected_employees,no_of_employee)"/>
+                    <field name="no_of_employee" on_change="on_change_expected_employee(expected_employees,no_of_employee)"/>
                     <field name="no_of_recruitment"/>
                     </group>
                     <newline/>

From f3a79ee57e6a8b4e9232e292b3a9a0e39b2660b7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 11:39:12 +0530
Subject: [PATCH 213/294] [FIX] project_long_term: typo

bzr revid: hmo@tinyerp.com-20101015060912-unh4q05oacavdgsc
---
 addons/project_long_term/project_long_term_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4de53c0f38d..4730706f758 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -37,7 +37,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="password">jth</field>
         </record>
         <record id="res_users_tester" model="res.users">
-            <field name="name">Alien</field>
+            <field name="name">Aline</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">apr</field>
             <field name="password">apr</field>

From ee1b9ec1a53f3059903c535b10d56724418313d3 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 15 Oct 2010 11:48:37 +0530
Subject: [PATCH 214/294] [MOD] POS : SaleOrder-> MakeInvoice wizard view
 change

bzr revid: dbr@tinyerp.com-20101015061837-mbg67121crs3gpw1
---
 addons/point_of_sale/wizard/pos_payment.xml | 74 ++++++++++-----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 58b4dc447cd..f0536ae0ac8 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-   
+
         <!--  Select an Open Sale Order -->
-        
+
 		<record id="view_pos_payment" model="ir.ui.view">
             <field name="name">Add payment :</field>
             <field name="model">pos.make.payment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Add payment :">
-				<group colspan="8" col="8" width="660" height="230">
-                    <group colspan="4" col="4" width="150">
-                        <label align="0.0" string="The register must be opened to be able to execute a payment." colspan="2"/>
-                        <separator string="" orientation="vertical" rowspan="6"/>
-                    </group>
-                    <group colspan="4" col="4">
-                        <field name="journal"/>
-                        <field name="amount"/>
-                        <field name="payment_date"/>
-                        <!--field name="payment_name" /-->
-                        <field name="invoice_wanted"/>
-                        <field name="num_sale"/>
-                        <field name="is_acc"/>
-                        <group attrs="{'invisible':[('is_acc','=',False)]}" colspan="4" col="2">
-                            <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]" on_change="onchange_product_id(product_id, amount)"/>
-                        </group>
-                        <newline/>
-                        <group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="4">
-                            <field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
-                            <field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
-                        </group>
-                    </group>
-                    <separator colspan="8"/>
-                    <group col="4" colspan="4"/>
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2"/>
-                        <group col="2" colspan="2">
-                            <button icon="gtk-stop" special="cancel" string="Cancel"/>
-                            <button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
-                        </group>
-                     </group>
-                 </group>
-				</form>
+				<group colspan="6" col="6" >
+					<group colspan="3" >
+						<separator string="The register must be opened to be able to execute a payment."  />
+					</group>
+					<newline/>
+					<group colspan="6">
+						<field name="journal"/>
+						<field name="payment_date"/>
+						<field name="num_sale" />
+						<field name="amount" />
+						<!--field name="payment_name" /-->
+						<field name="invoice_wanted" />
+						<field name="is_acc" />
+					</group>
+					<group attrs="{'invisible':[('is_acc','=',False)]}" colspan="3" >
+						<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]" on_change="onchange_product_id(product_id, amount)"/>
+					</group>
+					<newline/>
+					<group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="3">
+						<field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+						<field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+					</group>
+					<separator colspan="6"/>
+					<group colspan="3"/>
+					<group colspan="3">
+						<group colspan="2"/>
+						<group  colspan="2">
+							<button icon="gtk-stop" special="cancel" string="Cancel"/>
+							<button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
+						</group>
+					</group>
+				</group>
+			</form>
             </field>
         </record>
         <record id="action_pos_payment" model="ir.actions.act_window">
@@ -54,5 +54,5 @@
             <field name="target">new</field>
         </record>
 	</data>
-</openerp>	
-        
+</openerp>
+

From f6e8bcff4762316953ee2ab80777141e8f503cd1 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Fri, 15 Oct 2010 12:32:30 +0530
Subject: [PATCH 215/294] [ADD/IMP] New Field to Survey and Improved Survey /
 User can see only those Survey for which user in invited

bzr revid: jam@tinyerp.com-20101015070230-y7yujyil6mkii3vk
---
 addons/survey/survey.py                        |  1 +
 addons/survey/survey_view.xml                  |  3 +++
 addons/survey/wizard/survey_selection.py       | 11 +++++++++++
 addons/survey/wizard/survey_send_invitation.py | 14 ++++++++++++++
 4 files changed, 29 insertions(+)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 57a78e9ac5d..5343ef3c229 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
         'send_response': fields.boolean('E-mail Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
+        'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
         'state': lambda * a: "draft",
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 44bcb4475b5..713f3dbf7a4 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -206,6 +206,9 @@
                             <separator colspan="4" string="Survey Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
+                        <page string="Invited User">
+                            <field name="invited_user_ids" nolabel="1" readonly="1"/>
+                        </page>
                         <page string="History">
                             <field name="date_open" select="1"/>
                             <field name="date_close"/>
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 69cc8e10796..0f7ca8628f0 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -62,9 +62,20 @@ class survey_name_wiz(osv.osv_memory):
             for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
                 result.append((sur.id, sur.title))
             return result
+        survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
         group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
         user_obj = self.pool.get('res.users')
         user_rec = user_obj.read(cr, uid, uid)
+        if survey_user_group_id:
+            if survey_user_group_id == user_rec['groups_id']:
+                for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
+                    if sur.state == 'open':
+                        u_list = []
+                        for use in sur.invited_user_ids:
+                            u_list.append(use.id)
+                        if uid in u_list:
+                            result.append((sur.id, sur.title))
+                return result     
         for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
             if sur.state == 'open':
                 res = False
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index b9740fba6ba..92ba965d880 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -113,7 +113,13 @@ class survey_send_invitation(osv.osv_memory):
         error = ""
         res_user = ""
         user_exists = False
+        new_user = []
         attachments = []
+        current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
+        exist_user = current_sur.invited_user_ids
+        if exist_user:
+            for use in exist_user:
+                new_user.append(use.id)
         for id in survey_ref.browse(cr, uid, survey_ids):
             report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
             file = open(tools.config['addons_path'] + '/survey/report/' + id.title +".pdf")
@@ -134,6 +140,8 @@ class survey_send_invitation(osv.osv_memory):
                     continue
                 user = user_ref.search(cr, uid, [('login', "=", addr.email)])
                 if user:
+                    if user[0] not in new_user:
+                        new_user.append(user[0])
                     user = user_ref.browse(cr, uid, user[0])
                     user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]})
                     mail = record['mail']%{'login':addr.email, 'passwd':user.password, \
@@ -172,11 +180,17 @@ class survey_send_invitation(osv.osv_memory):
                                     'survey_id': [[6, 0, survey_ids]]
                                    }
                         user = user_ref.create(cr, uid, res_data)
+                        if user not in new_user:
+                            new_user.append(user)
                         created+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
                                                                           addr.email, passwd)
                     else:
                         error+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
                                                                         addr.email, passwd)
+
+        new_vals = {}
+        new_vals.update({'invited_user_ids':[[6,0,new_user]]})
+        survey_ref.write(cr, uid, context.get('active_id'),new_vals)
         note= ""
         if created:
             note += 'Created users:\n%s\n\n' % (created)

From 9b45a294b340c1c7a45c7918c39baa4fc66a039d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 12:32:37 +0530
Subject: [PATCH 216/294] improved Yearly Salary Details

bzr revid: apa@tinyerp.com-20101015070237-rxj2eisuz6mz0afe
---
 .../hr_payroll/report/report_year_report.rml  | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index da988e94f7e..d121ce0dd98 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Yearly Salary Details.pdf">
+  <template pageSize="(1120.0,770.0)" title="Yearly Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
     </pageTemplate>
@@ -201,40 +201,64 @@
               <para style="terp_default_9">[[ e[0] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[2]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[4]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="9.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+              </para>
             </td>
             <td>
               <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
@@ -296,4 +320,4 @@
       </para>
     </section>
   </story>
-</document>
+</document>
\ No newline at end of file

From b39b68b7a5f2e530af0231d5ef6a5e38b3656b88 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Fri, 15 Oct 2010 12:51:37 +0530
Subject: [PATCH 217/294] [IMP] Evaluation Progress Bar Working on Each Survey
 Interview Answer

bzr revid: jam@tinyerp.com-20101015072137-pguuqy64fgfxsc0f
---
 addons/hr_evaluation/hr_evaluation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3bb159eb0fe..6b7d9cba59c 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -334,7 +334,7 @@ class hr_evaluation_interview(osv.osv):
         for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
-            tot_done_req = 0
+            tot_done_req = 1
             if not id.evaluation_id.id:
                 raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Evaluation."))
             records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids

From b69421fc6ddb38cc89a02f2f2bc6d3c3d513a3b9 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Fri, 15 Oct 2010 13:00:09 +0530
Subject: [PATCH 218/294] [IMP] sale,purchase, stock,crm : merge sales orders,
 merge purchase orders, merge inventory, merge opportunity wizard only display
 in list view. action of these wizards are not available in right side of form
 view

bzr revid: amp@tinyerp.com-20101015073009-th71oyqbr3pqss69
---
 addons/crm/crm_lead.py      | 19 +++++++++++++++++++
 addons/purchase/purchase.py | 21 ++++++++++++++++++++-
 addons/sale/sale.py         | 20 +++++++++++++++++++-
 addons/stock/stock.py       | 18 ++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 23b1af57b28..8445c8f522d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -41,6 +41,25 @@ class crm_lead(crm_case, osv.osv):
     _description = "Lead"
     _order = "date_action, priority, id desc"
     _inherit = ['mailgate.thread','res.partner.address']
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+                            context=None, toolbar=False, submenu=False):
+            """
+             Changes the view dynamically
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary
+             @return: New arch of view.
+            """
+            if not context:
+                context={}
+            res = super(crm_lead, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+            if view_type == 'form':
+               if res['toolbar']['action'] and res['toolbar']['action'][0]['res_model']=='crm.merge.opportunity':
+                   res['toolbar']['action']=[]
+            return res
+
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1522c4543f3..af046f23760 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -37,6 +37,25 @@ from osv.orm import browse_record, browse_null
 # Model definition
 #
 class purchase_order(osv.osv):
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+                            context=None, toolbar=False, submenu=False):
+            """
+             Changes the view dynamically
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary
+             @return: New arch of view.
+            """
+            if not context:
+                context={}
+            res = super(purchase_order, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+            if view_type == 'form':
+               if res['toolbar']['action'] and res['toolbar']['action'][0]['res_model']=='purchase.order.group':
+                   res['toolbar']['action']=[]
+            return res
+             
     def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
         res = {}
         for order in self.browse(cr, uid, ids):
@@ -44,7 +63,7 @@ class purchase_order(osv.osv):
             for oline in order.order_line:
                 res[order.id] += oline.price_unit * oline.product_qty
         return res
-
+         
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         cur_obj=self.pool.get('res.currency')
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8a26ef6ebba..88ee8b5af17 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -54,7 +54,25 @@ def _incoterm_get(self, cr, uid, context=None):
 class sale_order(osv.osv):
     _name = "sale.order"
     _description = "Sale Order"
-
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+                            context=None, toolbar=False, submenu=False):
+            """
+             Changes the view dynamically
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary
+             @return: New arch of view.
+            """
+            if not context:
+                context={}
+            res = super(sale_order, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+            if view_type == 'form':
+               if res['toolbar']['action'] and res['toolbar']['action'][0]['res_model']=='sale.make.invoice':
+                   res['toolbar']['action']=[]
+            return res
+    
     def copy(self, cr, uid, id, default=None, context=None):
         if context is None:
             context = {}
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1c5ee23a0dc..fd4eb1ca036 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2371,6 +2371,24 @@ class stock_inventory(osv.osv):
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c)
     }
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+                            context=None, toolbar=False, submenu=False):
+            """
+             Changes the view dynamically
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary
+             @return: New arch of view.
+            """
+            if not context:
+                context={}
+            res = super(stock_inventory, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+            if view_type == 'form':
+               if res['toolbar']['action'] and res['toolbar']['action'][0]['res_model']=='stock.fill.inventory':
+                   res['toolbar']['action']=[]
+            return res
 
     def _inventory_line_hook(self, cr, uid, inventory_line, move_vals):
         """ Creates a stock move from an inventory line

From 7015214c0a6817b352f20958cac33696140d4677 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 13:12:02 +0530
Subject: [PATCH 219/294] improved Employees Salary Details

bzr revid: apa@tinyerp.com-20101015074202-re6dbe0egpht2w2t
---
 .../report/report_employees_detail.rml        | 178 ++++++++++++------
 1 file changed, 121 insertions(+), 57 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 6d8e6b18fc8..a74ca7ee6f8 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Employees Salary Details.pdf">
+  <template pageSize="(1120.0,770.0)" title="Employees Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
     </pageTemplate>
@@ -202,8 +202,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <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" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -264,7 +262,7 @@
     <blockTable colWidths="1063.0" style="Table12">
       <tr>
         <td>
-          <para style="P2">Employees Salary Details </para>
+          <para style="terp_header_Centre">Employees Salary Details </para>
           <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
         </td>
       </tr>
@@ -342,8 +340,8 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
-      <blockTable colWidths="137.0,64.0,62.0,64.0,68.0,69.0,76.0,71.0,80.0,75.0,79.0,78.0,70.0,70.0" style="Table4">
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
+      <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
@@ -396,52 +394,76 @@
         <blockTable colWidths="1063.0" style="Table7">
           <tr>
             <td>
-              <para style="P1">Allowances with Basic:</para>
+              <para style="terp_tblheader_Details">Allowances with Basic: </para>
             </td>
           </tr>
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="138.0,62.0,62.0,64.0,68.0,70.0,75.0,70.0,80.0,75.0,79.0,77.0,71.0,70.0" style="Table6">
+          <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[1]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[2]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[3]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[4]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[5]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[6]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[8]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[9]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[10]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[11]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[12]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
                 <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
@@ -452,52 +474,76 @@
         <blockTable colWidths="1063.0" style="Table10">
           <tr>
             <td>
-              <para style="P1">Deductions:</para>
+              <para style="terp_tblheader_Details">Deductions: </para>
             </td>
           </tr>
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="137.0,63.0,62.0,63.0,70.0,69.0,76.0,71.0,79.0,76.0,79.0,77.0,73.0,70.0" style="Table8">
+          <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[1]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[2]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[3]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[4]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[5]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[6]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[8]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[9]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[10]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[11]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[12]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
                 <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
@@ -508,52 +554,76 @@
         <blockTable colWidths="1063.0" style="Table11">
           <tr>
             <td>
-              <para style="P1">Others:</para>
+              <para style="terp_tblheader_Details">Others: </para>
             </td>
           </tr>
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
-          <blockTable colWidths="137.0,62.0,64.0,62.0,69.0,70.0,77.0,70.0,78.0,77.0,79.0,77.0,73.0,69.0" style="Table9">
+          <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table9">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e3[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[1]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[1]!='' and formatLang(e3[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[2]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[2]!='' and formatLang(e3[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[3]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[3]!='' and formatLang(e3[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[4]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[4]!='' and formatLang(e3[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[5]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[5]!='' and formatLang(e3[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[6]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[6]!='' and formatLang(e3[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[7]!='' and formatLang(e3[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[8]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[8]!='' and formatLang(e3[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[9]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[9]!='' and formatLang(e3[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[10]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[10]!='' and formatLang(e3[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[11]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[11]!='' and formatLang(e3[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[12]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica" size="9.0">[[ (e3[12]!='' and formatLang(e3[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                </para>
               </td>
               <td>
                 <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]]</para>
@@ -562,7 +632,7 @@
           </blockTable>
         </section>
       </section>
-      <blockTable colWidths="137.0,62.0,64.0,62.0,60.0,78.0,78.0,70.0,78.0,77.0,78.0,77.0,74.0,68.0" style="Table1">
+      <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
@@ -608,12 +678,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From a2cef356256b156e95dc481eed66371405725d8b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 10:32:44 +0200
Subject: [PATCH 220/294] [IMP] stock: picking invoice wizard should be
 available on multiple pickings - pending fix in wizard for handling many
 pickings

bzr revid: odo@openerp.com-20101015083244-e64xzbfaevkvf9ne
---
 .../wizard/stock_invoice_onshipping_view.xml  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 6284121553c..2a660905c8c 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_stock_invoice_onshipping" model="ir.ui.view">
+        <record id="view_stock_invoice_onshipping" model="ir.ui.view">
             <field name="name">Stock Invoice Onshipping</field>
             <field name="model">stock.invoice.onshipping</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create invoices">
-					<separator colspan="4" string="Create invoices" />
-    				<field name="journal_id"/>
-    				<newline/>
-					<field name="group"/>
-					<newline/>
-					<field name="type"/>
-					<newline/>
-					<field name="invoice_date" />
-			   	    <separator string="" colspan="4" />
-					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-			       	<button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <separator colspan="4" string="Create invoices" />
+                    <field name="journal_id"/>
+                    <newline/>
+                    <field name="group"/>
+                    <newline/>
+                    <field name="type"/>
+                    <newline/>
+                    <field name="invoice_date" />
+                       <separator string="" colspan="4" />
+                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                       <button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
-		</record>
+        </record>
 
-        <record id="action_stock_invoice_onshipping" model="ir.actions.act_window">
-             <field name="name">Create Invoice</field>
-             <field name="res_model">stock.invoice.onshipping</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="view_stock_invoice_onshipping"/>
-             <field name="target">new</field>
-       </record>
-     
+
+        <act_window name="Create invoice"
+            res_model="stock.invoice.onshipping"
+            src_model="stock.picking"
+            key2="client_action_multi"
+            multi="True"
+            view_mode="form"
+            view_type="form"
+            target="new"
+            id="action_stock_invoice_onshipping"/>
     </data>
 </openerp>

From 940eaa4a68a69a565da9f8f87a8a948b94b32621 Mon Sep 17 00:00:00 2001
From: "JMA(OpenERP)" <>
Date: Fri, 15 Oct 2010 14:37:02 +0530
Subject: [PATCH 221/294] [FIX] Account: Correction on on_change() of product
 on invoice line

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

bzr revid: jvo@tinyerp.com-20101015090702-6wdnx35gt0a9ipcd
---
 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 4cdaeab9a49..25b2ffffa91 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1361,7 +1361,7 @@ class account_invoice_line(osv.osv):
                 else:
                     app_acc_in = in_acc_cate
                     app_acc_exp = ex_acc_cate
-            if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
+            if app_acc_in and app_acc_in.company_id.id != company_id and app_acc_exp and app_acc_exp.company_id.id != company_id:
                 in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
                 exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
                 if not in_res_id and not exp_res_id:

From e670805700510878a116b59f4fabbc694dc79d15 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 15 Oct 2010 14:43:41 +0530
Subject: [PATCH 222/294] [IMP] stock:picking invoice wizard check the state of
 picking and rasie the error  and check for multiple picking

bzr revid: sbh@tinyerp.com-20101015091341-aqzeq5xhgacus2oi
---
 .../stock/wizard/stock_invoice_onshipping.py  | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 7e0693b9045..e2741b75406 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -35,7 +35,22 @@ class stock_invoice_onshipping(osv.osv_memory):
                     ('in_refund', 'Supplier Refund')] , 'Type', required=True),
         'invoice_date': fields.date('Invoiced date'),
     }
-
+    
+    def view_init(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
+        res= super(stock_invoice_onshipping, self).view_init(cr, uid, fields_list, context=context)            
+        pick_obj=self.pool.get('stock.picking')
+        count=0        
+        for pick in pick_obj.browse(cr, uid,context.get('active_ids', False)):
+            if pick.invoice_state != '2binvoiced':
+                count=count+1
+        if count==1:
+             raise osv.except_osv(_('Warning !'),'This picking list does not require invoicing.')
+        elif len(context.get('active_ids'))==count:
+            raise osv.except_osv(_('Warning !'),'None of these picking lists require invoicing.')
+        return res
+    
     def _get_type(self, cr, uid, context=None):
         """ To get invoice type.
         @param self: The object pointer.
@@ -49,24 +64,21 @@ class stock_invoice_onshipping(osv.osv_memory):
             context = {}
         picking_obj = self.pool.get('stock.picking')
         src_usage = dest_usage = None
-        pick = picking_obj.browse(cr, uid, context['active_id'], context=context)
-        if pick.invoice_state == 'invoiced':
-            raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
-        if pick.invoice_state == 'none':
-            raise osv.except_osv(_('UserError'), _('This picking does not require any invoicing.'))
-        if pick.move_lines:
-            src_usage = pick.move_lines[0].location_id.usage
-            dest_usage = pick.move_lines[0].location_dest_id.usage
-        if pick.type == 'out' and dest_usage == 'supplier':
-            type = 'in_refund'
-        elif pick.type == 'out' and dest_usage == 'customer':
-            type = 'out_invoice'
-        elif pick.type == 'in' and src_usage == 'supplier':
-            type = 'in_invoice'
-        elif pick.type == 'in' and src_usage == 'customer':
-            type = 'out_refund'
-        else:
-            type = 'out_invoice'
+        for pick in picking_obj.browse(cr, uid, context['active_ids'], context=context):
+            if pick.invoice_state=='2binvoiced':
+                if pick.move_lines:
+                    src_usage = pick.move_lines[0].location_id.usage
+                    dest_usage = pick.move_lines[0].location_dest_id.usage
+                if pick.type == 'out' and dest_usage == 'supplier':
+                    type = 'in_refund'
+                elif pick.type == 'out' and dest_usage == 'customer':
+                    type = 'out_invoice'
+                elif pick.type == 'in' and src_usage == 'supplier':
+                    type = 'in_invoice'
+                elif pick.type == 'in' and src_usage == 'customer':
+                    type = 'out_refund'
+                else:
+                    type = 'out_invoice'
         return type
 
     _defaults = {
@@ -86,7 +98,6 @@ class stock_invoice_onshipping(osv.osv_memory):
         picking_obj = self.pool.get('stock.picking')
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-
         for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
             if context.get('new_picking', False):
                 onshipdata_obj[id] = onshipdata_obj.new_picking
@@ -117,6 +128,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             result = act_obj.read(cr, uid, id['res_id'], context=context)
             result['res_id'] = invoice_ids
             result['context'] = context
+            print result
             return result
 
 stock_invoice_onshipping()

From 788ed06b80f00953a0623559a03af537e0a34bcf Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 15 Oct 2010 12:27:58 +0300
Subject: [PATCH 223/294] doc webdav: match the quotes around ETags

In commit e7eede397c8a84, quotes were re-introduced around ETags. At the
http "If-Match" header, we have to follow that.

bzr revid: p_christ@hol.gr-20101015092758-3wajkzjo0bm5z60g
---
 addons/document_webdav/webdav_server.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 299789bec11..df2c4a871f6 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -164,8 +164,6 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
             etag = None
 
             for match in self.headers['If-Match'].split(','):
-                if match.startswith('"') and match.endswith('"'):
-                    match = match[1:-1]
                 if match == '*':
                     if dc.exists(uri):
                         test = True

From 5dcc42aa37fe6d883d05c56aca6ccd872771e57d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 15 Oct 2010 12:27:59 +0300
Subject: [PATCH 224/294] Doc webdav: fix Report for rel+abs URIs

At Evolution, the request is absolute, so make sure it matches our
relative representation of the URL.

bzr revid: p_christ@hol.gr-20101015092759-ahhiygd1u9dcny8s
---
 addons/document_webdav/dav_fs.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 4665610524e..3e8e1c2b3e5 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -323,11 +323,15 @@ class openerp_dav_handler(dav_interface):
                                 for tx in hr.childNodes:
                                     if tx.nodeType == hr.TEXT_NODE:
                                         turi += tx.data
-                                        
+                                if not turi.startswith('/'):
+                                    # it may be an absolute URL, decode to the
+                                    # relative part, because ul is relative, anyway
+                                    uparts=urlparse.urlparse(turi)
+                                    turi=uparts[2]
                                 if turi.startswith(ul):
                                     result.append( turi[len(self.parent.davpath):])
                                 else:
-                                    self.parent.log_error("ignore href %s because it is not under request path", turi)
+                                    self.parent.log_error("ignore href %s because it is not under request path %s", turi, ul)
                             return result
                             # We don't want to continue with the children found below
                             # Note the exceptions and that 'finally' will close the

From 4ff5ed7c7e8f18d98d1b3c22bf91b110763423ac Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 14:59:55 +0530
Subject: [PATCH 225/294] [IMP] project_scrum: improve burndown chart

bzr revid: hmo@tinyerp.com-20101015092955-0ewjltoo3agtjfh1
---
 addons/project_scrum/report/_burndown.py      | 66 ++++++++++++-------
 .../project_scrum/report/sprint_burndown.py   | 36 ++++------
 addons/project_scrum/report/task_burndown.py  | 54 ++-------------
 3 files changed, 57 insertions(+), 99 deletions(-)

diff --git a/addons/project_scrum/report/_burndown.py b/addons/project_scrum/report/_burndown.py
index 6f0db24bcb6..b2cedd85881 100644
--- a/addons/project_scrum/report/_burndown.py
+++ b/addons/project_scrum/report/_burndown.py
@@ -19,44 +19,60 @@
 #
 ##############################################################################
 
-
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import time
+import pooler
+from report.render import render
+class external_pdf(render):
+    def __init__(self, pdf):
+        render.__init__(self)
+        self.pdf = pdf
+        self.output_type='pdf'
+    def _render(self):
+        return self.pdf
 
-def compute_burndown(cr, uid, tasks_id, date_start, date_stop):
+def compute_burndown(cr, uid, tasks_ids, date_start, date_stop):
     latest = False
-    if len(tasks_id):
-        cr.execute('select id,create_date,state,planned_hours from project_task where id IN %s order by create_date',(tuple(tasks_id),))
-        tasks = cr.fetchall()
-
-        cr.execute('select w.date,w.hours from project_task_work w left join project_task t on (t.id=w.task_id) where t.id IN %s and t.state in (%s,%s) order by date',(tuple(tasks_id),'open','progress',))
-        tasks2 = cr.fetchall()
-
-        cr.execute('select date_end,planned_hours from project_task where id IN %s and state in (%s,%s) order by date_end' ,(tuple(tasks_id),'cancelled','done',))
-        tasks2 += cr.fetchall()
-        tasks2.sort()
+    pool = pooler.get_pool(cr.dbname)
+    project_task_pool = pool.get('project.task')
+    task_work_pool = pool.get('project.task.work')
+    if len(tasks_ids):
+        tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids)], order='create_date')
+        tasks = project_task_pool.read(cr, uid, tasks_ids, ['create_date','planned_hours','state'])
+        tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids),('state', 'in', ['open','progress'])], order='create_date')
+        work_ids = task_work_pool.search(cr, uid, [('task_id','in',tasks_ids)], order='date')
+        close_tasks = task_work_pool.read(cr, uid, work_ids, ['date','hours','state'])        
+        tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids),('state', 'in', ['cancelled','done'])], order='date_end')
+        close_tasks += project_task_pool.read(cr, uid, tasks_ids, ['date_end','planned_hours'])
+        
     else:
         tasks = []
-        tasks2 = []
+        close_tasks = []
 
     current_date = date_start
     total = 0
     done = 0
     result = []
-    while current_date<=date_stop:
-        while len(tasks) and tasks[0][1] and tasks[0][1][:10]<=current_date:
+    while datetime.strptime(current_date, '%Y-%m-%d') <= datetime.strptime(date_stop, '%Y-%m-%d'):
+        while len(tasks) and tasks[0]['create_date'] and datetime.strptime(tasks[0]['create_date'][:10], '%Y-%m-%d')<=datetime.strptime(current_date, '%Y-%m-%d'):
             latest = tasks.pop(0)
-            total += latest[3]
+            total += float(latest.get('planned_hours',0.0))
         i = 0
-        while i<len(tasks2):
-            if tasks2[i][0] and tasks2[i][0][:10]<=current_date:
-                t = tasks2.pop(i)
-                done += t[1]
-            else:
-                i+=1
+        while i < len(close_tasks):
+            if close_tasks[i]:
+                date_end = close_tasks[i].get('date',False)
+                hours = float(close_tasks[i].get('hours',0.0))
+                if not date_end:
+                    date_end = close_tasks[i].get('date_end',False)
+                    hours = float(close_tasks[i].get('planned_hours',0.0))
+                if datetime.strptime(date_end[:10], '%Y-%m-%d')<=datetime.strptime(current_date, '%Y-%m-%d'):
+                    t = close_tasks.pop(i)
+                    done += hours
+            i+=1
         result.append( (int(time.mktime(time.strptime(current_date,'%Y-%m-%d'))), total-done) )
-        current_date = (DateTime.strptime(current_date, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
-        if not len(tasks) and not len(tasks2):
+        current_date = (datetime.strptime(current_date, '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d')
+        if not len(tasks) and not len(close_tasks):
             break
     result.append( (int(time.mktime(time.strptime(date_stop,'%Y-%m-%d'))), 0) )
     return result
diff --git a/addons/project_scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
index 2bbe69be485..c7388b0e790 100644
--- a/addons/project_scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -25,22 +25,13 @@ import pooler
 from report.render import render
 from report.interface import report_int
 
-from mx import DateTime
+from datetime import datetime
 import time
 
 from pychart import *
 import pychart.legend
 
 import _burndown
-
-class external_pdf(render):
-    def __init__(self, pdf):
-        render.__init__(self)
-        self.pdf = pdf
-        self.output_type='pdf'
-    def _render(self):
-        return self.pdf
-
 class report_tasks(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if context is None:
@@ -49,24 +40,19 @@ class report_tasks(report_int):
 
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("OpenERP")
-
-        cr.execute('select id,date_start,date_stop from project_scrum_sprint where id=%s', (datas['id'],))
-        for (id,date_start,date_stop) in cr.fetchall():
-            cr.execute('select id from project_task where product_backlog_id in(select id from project_scrum_product_backlog where sprint_id=%s)', (id,))
-
-            ids = map(lambda x: x[0], cr.fetchall())
-            datas = _burndown.compute_burndown(cr, uid, ids, date_start, date_stop)
-
+        pool = pooler.get_pool(cr.dbname)
+        sprint_pool = pool.get('project.scrum.sprint')
+        task_pool = pool.get('project.task')
+        int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
+        for sprint in sprint_pool.browse(cr, uid, ids, context=context):
+            task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context)
+            datas = _burndown.compute_burndown(cr, uid, task_ids, sprint.date_start, sprint.date_stop)
             max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
-
-            date_to_int = lambda x: int(x.ticks())
-            int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d %m %Y')
-
             def _interval_get(*args):
                 result = []
                 for i in range(20):
-                    d = DateTime.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
-                    res = DateTime.DateTime(d.year, d.month, d.day).ticks()
+                    d = time.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
+                    res = time.mktime(d)
                     if (not result) or result[-1]<>res:
                         result.append(res)
                 return result
@@ -92,7 +78,7 @@ class report_tasks(report_int):
             ar.draw(canv)
         canv.close()
 
-        self.obj = external_pdf(io.getvalue())
+        self.obj = _burndown.external_pdf(io.getvalue())
         self.obj.render()
         return (self.obj.pdf, 'pdf')
 report_tasks('report.scrum.sprint.burndown')
diff --git a/addons/project_scrum/report/task_burndown.py b/addons/project_scrum/report/task_burndown.py
index 50a02792ced..14807126503 100644
--- a/addons/project_scrum/report/task_burndown.py
+++ b/addons/project_scrum/report/task_burndown.py
@@ -20,53 +20,14 @@
 ##############################################################################
 
 import StringIO
-
 from report.render import render
 from report.interface import report_int
-
-from mx import DateTime
+from datetime import datetime
 import time
-
 from pychart import *
 import pychart.legend
-
 import _burndown
 
-class external_pdf(render):
-    def __init__(self, pdf):
-        render.__init__(self)
-        self.pdf = pdf
-        self.output_type='pdf'
-    def _render(self):
-        return self.pdf
-
-def burndown_chart(cr, uid, tasks_id, date_start, date_stop):
-    latest = False
-
-    cr.execute('select id,date_start,state,planned_hours from project_task where id IN %s order by date_start'(tuple(tasks_id),))
-    tasks = cr.fetchall()
-    cr.execute('select id,date_end,state,planned_hours*progress/100 from project_task where id IN %s  and state in (%s,%s) order by date_end', (tuple(tasks_id),'progress','done',))
-    tasks2 = cr.fetchall()
-    current_date = date_start
-    total = 0
-    done = 0
-    result = []
-    while current_date<=date_stop:
-        while len(tasks) and tasks[0][1] and tasks[0][1][:10]<=current_date:
-            total += tasks.pop(0)[3]
-        while len(tasks2) and tasks2[0][1] and tasks2[0][1][:10]<=current_date:
-            t2 = tasks2.pop(0)
-            if t2[2]<>'cancel':
-                done += t2[3]
-            else:
-                total -= t2[3]
-        result.append( (int(time.mktime(time.strptime(current_date,'%Y-%m-%d'))), total-done) )
-        current_date = (DateTime.strptime(current_date, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
-        if not len(tasks) and not len(tasks2):
-            break
-    result.append( (int(time.mktime(time.strptime(date_stop,'%Y-%m-%d'))), 0) )
-    return result
-
 class report_tasks(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if context is None:
@@ -87,24 +48,19 @@ class report_tasks(report_int):
             if res[1] and datas['date_stop']<res[1]:
                 datas['date_stop'] = res[1][:10]
 
-        date_to_int = lambda x: int(x.ticks())
-        int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d/%m/%Y')
-
         datas = _burndown.compute_burndown(cr, uid, ids, datas['date_start'], datas['date_stop'])
-
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("OpenERP")
 
         max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
 
-        date_to_int = lambda x: int(x.ticks())
-        int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d %m %Y')
+        int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
 
         def _interval_get(*args):
             result = set()
             for i in range(20):
-                d = DateTime.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
-                res = DateTime.DateTime(d.year, d.month, d.day).ticks()
+                d = time.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
+                res = time.mktime(d)
                 result.add(res)
 
             return list(result)
@@ -126,7 +82,7 @@ class report_tasks(report_int):
         ar.draw(canv)
         canv.close()
 
-        self.obj = external_pdf(io.getvalue())
+        self.obj = _burndown.external_pdf(io.getvalue())
         self.obj.render()
         return (self.obj.pdf,'pdf')
 report_tasks('report.project.tasks.burndown')

From 9a2527a5fef8082900a6c2bb859bd3f0ac62dabd Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 15:14:13 +0530
Subject: [PATCH 226/294] improved Lunch Order

bzr revid: apa@tinyerp.com-20101015094413-3eblkjmbx82100aw
---
 addons/lunch/report/order.py  |  32 ++++-
 addons/lunch/report/order.rml | 227 ++++++++++++----------------------
 2 files changed, 104 insertions(+), 155 deletions(-)

diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index 838ab108c23..29c9d381745 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -26,18 +26,38 @@ from osv import osv
 
 class order(report_sxw.rml_parse):
 
-    def sum_price(self, orders):
-        res = 0.0
-        for o in orders:
-            res += o.price
-        return res
+    def get_lines(self, user,objects):
+        lines=[]
+        for obj in objects:
+            if user.id==obj.user_id.id:
+                lines.append(obj)
+        return lines
+
+    def get_total(self, user,objects):
+        lines=[]
+        for obj in objects:
+            if user.id==obj.user_id.id:
+                lines.append(obj)
+        total=0.0
+        for line in lines:
+            total+=line.price
+        return total
+
+    def get_users(self, objects):
+        users=[]
+        for obj in objects:
+            if obj.user_id not in users:
+                users.append(obj.user_id)
+        return users
 
     def __init__(self, cr, uid, name, context):
         super(order, self).__init__(cr, uid, name, context)
 
         self.localcontext.update({
             'time': time,
-            'sum_price': self.sum_price,
+            'get_lines': self.get_lines,
+            'get_users': self.get_users,
+            'get_total': self.get_total,
         })
 
 report_sxw.report_sxw('report.lunch.order', 'lunch.order',
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 62003478c4c..7a6dca6c260 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Lunch Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Lunch Order.pdf">
+  <template pageSize="(595.0,842.0)" title="Lunch Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
     </pageTemplate>
@@ -10,89 +10,37 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -108,111 +56,92 @@
     <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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tbl_detail_header" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tbl_detail_header_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tbl_detail_header_center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_right_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
-    <para style="P15">[[repeatIn(objects,'o')]]</para>
+    <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para>
+    <blockTable colWidths="293.0,235.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.title and o.address_id.partner_id.title.name) or '' ]] [[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.zip) or '' ]] [[ (o.address_id and o.user_id.address_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para')]]</para>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.country_id and o.address_id.country_id.name) or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header">Lunch Order</para>
+    <blockTable colWidths="80.0,70.0,141.0,172.0,65.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tbl_detail_header">Name</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header_center">Date</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header">Order</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header">Description</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header_right">Unit Price</para>
+        </td>
+      </tr>
+    </blockTable>
     <section>
-      <para style="P15">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="262.0,6.0,260.0" style="Table5">
+      <para style="terp_default_8">[[ repeatIn(get_lines(o,objects),'lines') ]]</para>
+      <blockTable colWidths="80.0,70.0,141.0,172.0,64.0" style="Table3">
         <tr>
           <td>
-            <para style="P15">
-              <font color="white"> </font>
-            </para>
+            <para style="terp_default_9">[[ (lines.user_id and lines.user_id.name) or '']]</para>
           </td>
           <td>
-            <para style="P9">
-              <font color="white"> </font>
-            </para>
+            <para style="terp_default_9_center">[[ formatLang(lines.date,date='True') ]]</para>
           </td>
           <td>
-            <para style="P14">[[ o.user_id.address_id.partner_id.title.name or '' ]] [[ o.user_id.address_id.partner_id.name ]]</para>
-            <para style="P14">[[ o.user_id.address_id.street ]]</para>
-            <para style="P14">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
-            <para style="P14">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
-            <para style="P14">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
-            <para style="P14">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P1">
-        <font color="white"> </font>
-      </para>
-      <para style="P1">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="527.0" style="Table4">
-        <tr>
-          <td>
-            <para style="P11">Lunch Order</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P1">
-        <font color="white"> </font>
-      </para>
-      <para style="P1">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="132.0,153.0,141.0,101.0" style="Table3">
-        <tr>
-          <td>
-            <para style="P10">Name</para>
+            <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
           </td>
           <td>
-            <para style="P3">Order</para>
+            <para style="terp_default_9">[[ lines.descript]]</para>
           </td>
           <td>
-            <para style="P3">Description</para>
-          </td>
-          <td>
-            <para style="P4">Unit Price</para>
+            <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table1">
+    <blockTable colWidths="409.0,55.0,64.0" style="Table4">
       <tr>
         <td>
-          <para style="P5">[[ o.user_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P7">[[o.product.name ]]</para>
-        </td>
-        <td>
-          <para style="P12">[[ o.descript ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[formatLang(o.price) ]] [[company.currency_id.symbol]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table2">
-      <tr>
-        <td>
-          <para style="P8">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P8">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_tbl_detail_header">Total:</para>
         </td>
         <td>
-          <para style="P3">Total:</para>
-        </td>
-        <td>
-          <para style="P13">[[ formatLang(sum_price(objects)) ]] <font face="Helvetica">[[company.currency_id.symbol]]</font></para>
+          <para style="terp_default_9_right_bold">[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P2">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>

From 82406c23e52511944510d498c3464657809d014a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 15 Oct 2010 15:14:18 +0530
Subject: [PATCH 227/294] [IMP] stock:stock_invoice_onshipping improve the
 return type of wizard

bzr revid: sbh@tinyerp.com-20101015094418-ghbc8hbvtobdeh3m
---
 .../stock/wizard/stock_invoice_onshipping.py  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index e2741b75406..db36a4cacc9 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -45,9 +45,9 @@ class stock_invoice_onshipping(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid,context.get('active_ids', False)):
             if pick.invoice_state != '2binvoiced':
                 count=count+1
-        if count==1:
+        if len(context.get('active_ids'))==1 and count==1:
              raise osv.except_osv(_('Warning !'),'This picking list does not require invoicing.')
-        elif len(context.get('active_ids'))==count:
+        if  len(context.get('active_ids'))==count:
             raise osv.except_osv(_('Warning !'),'None of these picking lists require invoicing.')
         return res
     
@@ -125,11 +125,18 @@ class stock_invoice_onshipping(osv.osv_memory):
 
             result = mod_obj._get_id(cr, uid, 'account', xml_id)
             id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-            result = act_obj.read(cr, uid, id['res_id'], context=context)
-            result['res_id'] = invoice_ids
-            result['context'] = context
-            print result
-            return result
+            res_id = act_obj.read(cr, uid, id['res_id'], context=context)
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,invoice_ids))+"])]",
+            'name' : _('New picking invoices'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': res_id,
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'nodestroy': True                
+        }
 
 stock_invoice_onshipping()
 

From ff92d26b785376d922a04928216940ff42bc351d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 15 Oct 2010 12:56:45 +0300
Subject: [PATCH 228/294] base_calendar: fix some default args to functions.

bzr revid: p_christ@hol.gr-20101015095645-yr1tytvjcy724xlf
---
 addons/base_calendar/base_calendar.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a37630f8d96..af111162312 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -306,7 +306,7 @@ class calendar_attendee(osv.osv):
         res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
         return [(r['object'], r['name']) for r in res]
 
-    def _lang_get(self, cr, uid, context={}):
+    def _lang_get(self, cr, uid, context=None):
         """
         Get language for language selection field.
         @param cr: the current row, from the database cursor,
@@ -912,10 +912,10 @@ class calendar_event(osv.osv):
     _description = "Calendar Event"
     __attribute__ = {}
 
-    def _tz_get(self, cr, uid, context={}):
+    def _tz_get(self, cr, uid, context=None):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
-    def onchange_allday(self, cr, uid, ids, allday, context={}):
+    def onchange_allday(self, cr, uid, ids, allday, context=None):
         """Sets duration as 24 Hours if event is selcted for all day
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -1485,7 +1485,7 @@ true, it will allow you to hide the event alarm information without removing it.
                                             context=context)
         return res
 
-    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
+    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
         """
         Overrides orm browse method.
         @param self: the object pointer

From ecbd4323e8e8b34bbdd73f0524478914e76dd6ba Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 15 Oct 2010 12:56:52 +0300
Subject: [PATCH 229/294] base_calendar: convert libical timezones to plain
 format

Timezones sent to us by libical contain their prefix and thus wouldn't
match our preset list. Strip the prefix and try to match.

bzr revid: p_christ@hol.gr-20101015095652-mey4elruff8fv1y3
---
 addons/base_calendar/base_calendar.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index af111162312..577c053a1c9 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1475,6 +1475,8 @@ true, it will allow you to hide the event alarm information without removing it.
             if not real_event_id in new_ids:
                 new_ids.append(real_event_id)
 
+        if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
+            vals['vtimezone'] = vals['vtimezone'][40:]
         if new_ids:
             res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
         if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
@@ -1604,6 +1606,8 @@ true, it will allow you to hide the event alarm information without removing it.
         """
         if not context:
             context = {}
+        if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
+            vals['vtimezone'] = vals['vtimezone'][40:]
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)

From f1fb224927733bf48634b9a4e84d15fc03ea1afc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 15 Oct 2010 15:31:18 +0530
Subject: [PATCH 230/294] [IMP] stock:picking invoice wizard set the correct id

bzr revid: sbh@tinyerp.com-20101015100118-th2gg9sf2ltsrpdq
---
 addons/stock/wizard/stock_invoice_onshipping.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index db36a4cacc9..a1317217c47 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -132,10 +132,9 @@ class stock_invoice_onshipping(osv.osv_memory):
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
-            'view_id': res_id,
+            'views': id['res_id'],
             'context': context,
             'type': 'ir.actions.act_window',
-            'nodestroy': True                
         }
 
 stock_invoice_onshipping()

From db26225d6c2da9ab4a356dc0f9f2c5dbf443c26b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 15:37:13 +0530
Subject: [PATCH 231/294] improved Salary Payment Register

bzr revid: apa@tinyerp.com-20101015100713-tcmhv6in6yyiltq5
---
 addons/hr_payroll/report/payroll_register.rml | 82 ++++++++-----------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index e28353ecea9..7ad99b46502 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Salary Payment Register.pdf">
+  <template pageSize="(595.0,842.0)" title="Salary Payment Register" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="33.0" y1="30.0" width="529" height="782"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,10 +10,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -29,6 +25,14 @@
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <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="#e6e6e6" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -91,30 +95,16 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="72.0,295.0,47.0,68.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_general">Number</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[o.number]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_general">Date</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</para>
-        </td>
-      </tr>
-    </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_tblheader_general">Number : <font face="Helvetica">[[o.number]]</font></para>
+    <para style="terp_tblheader_general">Date : <font face="Helvetica">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</font></para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <section>
-      <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">
+      <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table6">
         <tr>
           <td>
             <para style="terp_tblheader_details_center">#</para>
@@ -142,13 +132,10 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P1">
-        <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">
+      <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_8">[[ get_no() ]]</para>
@@ -157,30 +144,27 @@
             <para style="terp_default_8">[[ l.employee_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ company.currency_id.symbol]] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ company.currency_id.symbol]] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ company.currency_id.symbol]] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ company.currency_id.symbol]] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ company.currency_id.symbol]] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ company.currency_id.symbol]] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
           </td>
         </tr>
       </blockTable>
-      <para style="P1">
-        <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">
+    <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -191,22 +175,22 @@
           <para style="terp_tblheader_details">Total Salary</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o))]][[ company.currency_id.symbol]] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o))]][[ (company.currency_id and company.currency_id.symbol) or '']] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_other(o))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_other(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_net(o))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_net(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
         </td>
       </tr>
     </blockTable>
@@ -216,7 +200,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table5">
+    <blockTable colWidths="265.0,265.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_9_bold">For [[company.name]],</para>
@@ -243,4 +227,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 3e4abfff4e258cb311b12c33ba423992bd916131 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 15 Oct 2010 15:38:26 +0530
Subject: [PATCH 232/294] [REF] stock:picking_invoice wizard remove unused code

bzr revid: sbh@tinyerp.com-20101015100826-sekn9b9iu7xpq8z5
---
 addons/stock/wizard/stock_invoice_onshipping.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index a1317217c47..cb6dd79a632 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -114,25 +114,13 @@ class stock_invoice_onshipping(osv.osv_memory):
             if not invoice_ids:
                 raise osv.except_osv(_('Error'), _('Invoice is not created'))
 
-            if type == 'out_invoice':
-                xml_id = 'action_invoice_tree1'
-            elif type == 'in_invoice':
-                xml_id = 'action_invoice_tree2'
-            elif type == 'out_refund':
-                xml_id = 'action_invoice_tree3'
-            else:
-                xml_id = 'action_invoice_tree4'
-
-            result = mod_obj._get_id(cr, uid, 'account', xml_id)
-            id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-            res_id = act_obj.read(cr, uid, id['res_id'], context=context)
         return {
             'domain': "[('id','in', ["+','.join(map(str,invoice_ids))+"])]",
             'name' : _('New picking invoices'),
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
-            'views': id['res_id'],
+            'views': False,
             'context': context,
             'type': 'ir.actions.act_window',
         }

From bfacbb41e015d9091744ce8e05bfef45a1948d8c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 15:42:14 +0530
Subject: [PATCH 233/294] improved Payment Advice

bzr revid: apa@tinyerp.com-20101015101214-pfwmas2i383884cy
---
 .../report/report_payroll_advice.rml          | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index 8fe18772c2f..18f56cc9883 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payroll Advice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Payment Advice.pdf">
+  <template pageSize="(595.0,842.0)" title="Payment Advice" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -41,6 +41,12 @@
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <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"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -212,9 +218,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
       <blockTable colWidths="60.0,167.0,84.0,82.0,110.0,35.0" style="Table5">
@@ -229,10 +232,10 @@
             <para style="terp_default_9">[[ line['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ line['acc_no'] ]]</para>
@@ -242,13 +245,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="60.0,167.0,84.0,82.0,145.0" style="Table6">
       <tr>
         <td>
@@ -257,13 +254,13 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Total([[ company.currency_id.code ]]):</para>
+          <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">
@@ -338,4 +335,4 @@
       <seqReset id="L1"/>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 38040f1bb9c9ddd93d404c619abd29ae33dda066 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 15 Oct 2010 15:59:43 +0530
Subject: [PATCH 234/294] [REM]Project-Time Tracking-> Remove the Customer
 invoice menu

bzr revid: ron@tinyerp.com-20101015102943-3ppmy8b8uq12piwp
---
 addons/hr_timesheet/hr_timesheet_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 4a720112b79..664587b75a3 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -102,7 +102,6 @@
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
     <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_partner_invc" parent="base.menu_project_management_time_tracking" action="account.action_invoice_tree1"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>

From 37583b3bf2d0863cec8b7f446122e8995aeccb64 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 16:13:08 +0530
Subject: [PATCH 235/294] [IMP] project: demo data

bzr revid: hmo@tinyerp.com-20101015104308-tk3epmz3lnx5o2bw
---
 addons/hr_timesheet/hr_timesheet_view.xml     |   1 -
 addons/project/project_demo.xml               | 210 ++++++++++++++++
 .../project_long_term_demo.xml                | 234 ++++--------------
 .../test/schedule_phase_tasks.yml             |  22 +-
 .../test/schedule_project_tasks.yml           |  22 +-
 addons/project_timesheet/__openerp__.py       |   2 +-
 .../project_timesheet_demo.xml                |  60 +++++
 7 files changed, 335 insertions(+), 216 deletions(-)
 create mode 100644 addons/project_timesheet/project_timesheet_demo.xml

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d2da8e6ea9e..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -101,7 +101,6 @@
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
     <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_partner_invc" parent="base.menu_project_management_time_tracking" action="account.action_invoice_tree1"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index e365d095a20..8d3752c0979 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -2,6 +2,216 @@
 <openerp>
     <data noupdate="1">
 
+         <!-- Users -->
+
+        <record id="res_users_analyst" model="res.users">
+            <field name="name">Phuong</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="login">phu</field>
+            <field name="password">phu</field>
+        </record>
+        <record id="res_users_project_manager" model="res.users">
+            <field name="name">Anthony</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="login">al</field>
+            <field name="password">al</field>
+        </record>
+        <record id="res_users_technical_leader" model="res.users">
+            <field name="name">Quentin</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">qdp</field>
+            <field name="password">qdp</field>
+        </record>
+        <record id="res_users_developer" model="res.users">
+            <field name="name">Francois</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">fpi</field>
+            <field name="password">fpi</field>
+        </record>
+        <record id="res_users_designer" model="res.users">
+            <field name="name">Julien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">jth</field>
+            <field name="password">jth</field>
+        </record>
+        <record id="res_users_tester" model="res.users">
+            <field name="name">Alien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">apr</field>
+            <field name="password">apr</field>
+        </record>
+        <record id="res_users_finacial_manager" model="res.users">
+            <field name="name">Fabian</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
+            <field name="login">fbs</field>
+            <field name="password">fbs</field>
+        </record>
+
+        <!-- Projects -->
+        <record id="project_integrate_openerp" model="project.project">
+            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
+            <field name="state">open</field>
+            <field name="type">normal</field>
+            <field name="description">Integrate a Sale and Warehouse Management.</field>
+            <field eval="[(6, 0, [
+                    ref('project.res_users_analyst'),
+                    ref('project.res_users_project_manager'),
+                    ref('project.res_users_technical_leader'),
+                    ref('project.res_users_developer'),
+                    ref('project.res_users_designer'),
+                    ref('project.res_users_tester'),
+                    ref('project.res_users_finacial_manager')])]" name="members"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="name">Integrate a Sale and Warehouse Management.</field>
+        </record>
+
+        <!-- Tasks -->
+
+        <record id="project_task_1" model="project.task">
+            <field eval="100.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Prepare Requirements Document</field>
+        </record>
+
+        <record id="project_task_2" model="project.task">
+            <field eval="80.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Make SRS</field>
+        </record>
+
+        <record id="project_task_3" model="project.task">
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Design Use Cases</field>
+        </record>
+
+        <record id="project_task_4" model="project.task">
+            <field eval="25.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Budget Planning</field>
+        </record>
+
+        <record id="project_task_5" model="project.task">
+            <field eval="25.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Quality Planning</field>
+        </record>
+
+        <record id="project_task_6" model="project.task">
+            <field eval="20.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Risk Management Planning</field>
+        </record>
+
+        <record id="project_task_7" model="project.task">
+            <field eval="30.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Create Project Schedules</field>
+        </record>
+
+        <record id="project_task_8" model="project.task">
+            <field eval="10.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Dataflow Design</field>
+        </record>
+
+        <record id="project_task_9" model="project.task">
+            <field eval="50.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">User Interface Design</field>
+        </record>
+
+        <record id="project_task_10" model="project.task">
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Develop Module in Sale Management</field>
+        </record>
+
+        <record id="project_task_11" model="project.task">
+            <field eval="90.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Develop module in Warehouse</field>
+        </record>
+
+        <record id="project_task_12" model="project.task">
+            <field eval="20.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Integrate Modules</field>
+        </record>
+
+        <record id="project_task_13" model="project.task">
+            <field eval="50.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Unit Testing</field>
+        </record>
+
+        <record id="project_task_14" model="project.task">
+            <field eval="30.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Regression Test</field>
+        </record>
+
+        <record id="project_task_15" model="project.task">
+            <field eval="15.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Documentation</field>
+        </record>
+
+        <record id="project_task_16" model="project.task">
+            <field eval="10" name="sequence"/>
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Performance Tuning</field>
+        </record>
+
+        <record id="project_task_17" model="project.task">
+            <field eval="5.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Deploy and Review on Customer System</field>
+        </record>
+
+        <record id="project_task_18" model="project.task">
+            <field eval="10.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Training and Presentation</field>
+        </record>
+
         <!--
 	Resource: project.project
 	-->
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4de53c0f38d..3bc236dee26 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -2,115 +2,56 @@
 <openerp>
     <data noupdate="1">
 <!--
-This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
+This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
-        <!-- Users -->
-
-        <record id="res_users_analyst" model="res.users">
-            <field name="name">Phuong</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">phu</field>
-            <field name="password">phu</field>
-        </record>
-        <record id="res_users_project_manager" model="res.users">
-            <field name="name">Anthony</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">al</field>
-            <field name="password">al</field>
-        </record>
-        <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Quentin</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">qdp</field>
-            <field name="password">qdp</field>
-        </record>
-        <record id="res_users_developer" model="res.users">
-            <field name="name">Francois</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">fpi</field>
-            <field name="password">fpi</field>
-        </record>
-        <record id="res_users_designer" model="res.users">
-            <field name="name">Julien</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">jth</field>
-            <field name="password">jth</field>
-        </record>
-        <record id="res_users_tester" model="res.users">
-            <field name="name">Alien</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">apr</field>
-            <field name="password">apr</field>
-        </record>
-        <record id="res_users_finacial_manager" model="res.users">
-            <field name="name">Fabian</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
-            <field name="login">fbs</field>
-            <field name="password">fbs</field>
-        </record>
+       
 
         <!-- Human Resources -->
         <record id="resource_analyst" model="resource.resource">
-            <field name="user_id" ref="res_users_analyst"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
             <field name="name">Analyst</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_project_manager" model="resource.resource">
-            <field name="user_id" ref="res_users_project_manager"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
             <field name="name">Project Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
          <record id="resource_technical_leader" model="resource.resource">
-            <field name="user_id" ref="res_users_technical_leader"/>
+            <field name="user_id" ref="project.res_users_technical_leader"/>
             <field name="name">Technical Leader</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_developer" model="resource.resource">
-            <field name="user_id" ref="res_users_developer"/>
+            <field name="user_id" ref="project.res_users_developer"/>
             <field name="name">Developer</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_designer" model="resource.resource">
-            <field name="user_id" ref="res_users_designer"/>
+            <field name="user_id" ref="project.res_users_designer"/>
             <field name="name">Designer</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_tester" model="resource.resource">
-            <field name="user_id" ref="res_users_tester"/>
+            <field name="user_id" ref="project.res_users_tester"/>
             <field name="name">Tester</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_finacial_manager" model="resource.resource">
-            <field name="user_id" ref="res_users_finacial_manager"/>
+            <field name="user_id" ref="project.res_users_finacial_manager"/>
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
 
 
-        <!-- Projects -->
-        <record id="project_integrate_openerp" model="project.project">
-            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
-            <field name="state">open</field>
-            <field name="type">normal</field>
-            <field name="description">Integrate an Sale and Warehouse Management.</field>
-            <field eval="[(6, 0, [
-                    ref('res_users_analyst'),
-                    ref('res_users_project_manager'),
-                    ref('res_users_technical_leader'),
-                    ref('res_users_developer'),
-                    ref('res_users_designer'),
-                    ref('res_users_tester'),
-                    ref('res_users_finacial_manager')])]" name="members"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="name">Integrate an Sale and Warehouse Management.</field>
-        </record>
+        
 
         <!-- Project Phases -->
         <record id="project_phase_1" model="project.phase">
@@ -119,8 +60,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="res_users_analyst"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_analyst"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_2" model="project.phase">
@@ -129,8 +70,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_3" model="project.phase">
@@ -139,8 +80,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_4" model="project.phase">
@@ -149,8 +90,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="responsible_id" ref="res_users_technical_leader"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_technical_leader"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_5" model="project.phase">
@@ -159,8 +100,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_6" model="project.phase">
@@ -169,8 +110,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">10</field>
-            <field name="responsible_id" ref="res_users_analyst"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_analyst"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <!--  Project Resource Allocation -->
@@ -221,173 +162,82 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
 
         <!-- Tasks -->
 
-        <record id="project_task_1" model="project.task">
-            <field eval="100.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Prepare Requirements Document</field>
+        <record id="project.project_task_1" model="project.task">
             <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_2" model="project.task">
-            <field eval="80.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Make SRS</field>
+        <record id="project.project_task_2" model="project.task">
             <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_3" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Design Use Cases</field>
+        <record id="project.project_task_3" model="project.task">
             <field name="phase_id" ref="project_phase_2"/>
         </record>
 
-        <record id="project_task_4" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Budget Planning</field>
+        <record id="project.project_task_4" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_5" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Quality Planning</field>
+        <record id="project.project_task_5" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_6" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Risk Management Planning</field>
+        <record id="project.project_task_6" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_7" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Create Project Schedules</field>
+        <record id="project.project_task_7" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_8" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Dataflow Design</field>
+        <record id="project.project_task_8" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_9" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">User Interface Design</field>
+        <record id="project.project_task_9" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_10" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Develop Module in Sale Management</field>
+        <record id="project.project_task_10" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_11" model="project.task">
-            <field eval="90.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Develop module in Warehouse</field>
+        <record id="project.project_task_11" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_12" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Integrate Modules</field>
+        <record id="project.project_task_12" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_13" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Unit Testing</field>
+        <record id="project.project_task_13" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_14" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Regression Test</field>
+        <record id="project.project_task_14" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_15" model="project.task">
-            <field eval="15.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Documentation</field>
+        <record id="project.project_task_15" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_16" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Performance Tuning</field>
+        <record id="project.project_task_16" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_17" model="project.task">
-            <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Deploy and Review on Customer System</field>
+        <record id="project.project_task_17" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
-        <record id="project_task_18" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Training and Presentation</field>
+        <record id="project.project_task_18" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
         <!-- run scheduling of phase -->
-        <function model="project.project" name="schedule_phases" eval="(ref('project_integrate_openerp'),)"/>
+        <function model="project.project" name="schedule_phases" eval="(ref('project.project_integrate_openerp'),)"/>
         <!-- run scheduling of tasks -->
-        <function model="project.project" name="schedule_tasks" eval="(ref('project_integrate_openerp'),)"/>
+        <function model="project.project" name="schedule_tasks" eval="(ref('project.project_integrate_openerp'),)"/>
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml
index 150d80af822..aa54fa1ac57 100644
--- a/addons/project_long_term/test/schedule_phase_tasks.yml
+++ b/addons/project_long_term/test/schedule_phase_tasks.yml
@@ -4,13 +4,13 @@
   !record {model: project.project, id: project_project_project0}:
     name: Develop an outlook-openerp synchronization plugin
     members:
-      - project_long_term.res_users_project_manager
-      - project_long_term.res_users_technical_leader
-      - project_long_term.res_users_developer
-      - project_long_term.res_users_designer
-      - project_long_term.res_users_tester
-      - project_long_term.res_users_analyst
-      - project_long_term.res_users_finacial_manager
+      - project.res_users_project_manager
+      - project.res_users_technical_leader
+      - project.res_users_developer
+      - project.res_users_designer
+      - project.res_users_tester
+      - project.res_users_analyst
+      - project.res_users_finacial_manager
 - 
   Create phase 'Develop GUI' in Outlook
 - 
@@ -40,7 +40,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
@@ -52,7 +52,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
@@ -63,7 +63,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Design required GUI/Menus'
 - 
@@ -74,7 +74,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_designer
+    user_id: project.res_users_designer
     
 - 
   Schedule phase tasks
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
index dfc4cf1fc5e..04a05437487 100644
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ b/addons/project_long_term/test/schedule_project_tasks.yml
@@ -4,13 +4,13 @@
   !record {model: project.project, id: project_project_project1}:
     name: Develop a thunderbird-openerp synchronization plugin
     members:
-      - project_long_term.res_users_project_manager
-      - project_long_term.res_users_technical_leader
-      - project_long_term.res_users_developer
-      - project_long_term.res_users_designer
-      - project_long_term.res_users_tester
-      - project_long_term.res_users_analyst
-      - project_long_term.res_users_finacial_manager
+      - project.res_users_project_manager
+      - project.res_users_technical_leader
+      - project.res_users_developer
+      - project.res_users_designer
+      - project.res_users_tester
+      - project.res_users_analyst
+      - project.res_users_finacial_manager
         
 - 
   Create phase 'Develop GUI' in thunderbird
@@ -41,7 +41,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
@@ -53,7 +53,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
@@ -64,7 +64,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Design required GUI/Menus'
 - 
@@ -75,7 +75,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_designer
+    user_id: project.res_users_designer
     
     
 - 
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index e1be86fe661..fbf3d389739 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -33,7 +33,7 @@
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
     'init_xml': [],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
-    'demo_xml': [],
+    'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
     ],
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
new file mode 100644
index 00000000000..8eec74bc9e5
--- /dev/null
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Example employee -->
+        <record id="hr.employee2" model="hr.employee">
+            <field name="user_id" ref="project.res_users_technical_leader"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee3" model="hr.employee">
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee4" model="hr.employee">
+            <field name="name">Phuong</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee5" model="hr.employee">
+            <field name="name">Francois</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee6" model="hr.employee">
+            <field name="name">Julien</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_designer"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee7" model="hr.employee">
+            <field name="name">Alien</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee8" model="hr.employee">
+            <field name="name">Fabian</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_finacial_manager"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+    </data>
+</openerp>

From c81407ccb028482c473b4e965b07bb3cdf563b06 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 15 Oct 2010 16:23:29 +0530
Subject: [PATCH 236/294] [IMP]Project-Task-> click Project form view -task-new
 task-- project set by default

bzr revid: ron@tinyerp.com-20101015105329-yi921ebnwmniuzyg
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 59bd8a6aff5..823d1f253c2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -325,7 +325,7 @@
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
-                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
 					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
@@ -500,7 +500,7 @@
         <act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window
-            context="{'search_default_project_id': [active_id]}"
+            domain="[('project_id', '=', active_id)]"
             id="act_project_project_2_project_task_all"
             name="Tasks"
             res_model="project.task"

From f8d8cc9ef2edcff3d3523099c4a55a8f55776188 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 16:48:43 +0530
Subject: [PATCH 237/294] improve

bzr revid: apa@tinyerp.com-20101015111843-80pzpyez1aimrosq
---
 addons/account/wizard/account_vat.py | 71 +++++++++++++---------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index abe489eef42..3b0504394b8 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -22,46 +22,43 @@
 from osv import osv, fields
 
 class account_vat_declaration(osv.osv_memory):
-	_name = 'account.vat.declaration'
-	_description = 'Account Vat Declaration'
-	_inherit = "account.common.account.report"
-	_columns = {
-		'based_on': fields.selection([('invoices','Invoices'),
-		                             ('payments','Payments'),],
-		                              'Based On', required=True),
-		'company_id': fields.many2one('res.company', 'Company', required=True),
-		'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
-		'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),        
-		}
-		
-	def _get_company(self, cr, uid, context={}):
-		user_obj = self.pool.get('res.users')
-		company_obj = self.pool.get('res.company')
-		user = user_obj.browse(cr, uid, uid, context=context)
-		if user.company_id:
-		    return user.company_id.id
-		else:
-		    return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
-
-
-	_defaults = {
-			'based_on': 'invoices',
-			'company_id': _get_company
-
+    _name = 'account.vat.declaration'
+    _description = 'Account Vat Declaration'
+    _inherit = "account.common.account.report"
+    _columns = {
+	    'based_on': fields.selection([('invoices','Invoices'),
+		                              ('payments','Payments'),],
+		                             'Based On', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
+        'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),
 		}
 
-	def create_vat(self, cr, uid, ids, context={}):
-		if context is None:
-			context = {}
-		datas = {'ids': context.get('active_ids', [])}
-		datas['model'] = 'account.tax.code'
-		datas['form'] = self.read(cr, uid, ids)[0]
-		return {
-			'type': 'ir.actions.report.xml',
-			'report_name': 'account.vat.declaration',
-			'datas': datas,
-			}
+    def _get_company(self, cr, uid, context={}):
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        user = user_obj.browse(cr, uid, uid, context=context)
+        if user.company_id:
+    	    return user.company_id.id
+        else:
+            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
 
+    _defaults = {
+        'based_on': 'invoices',
+        'company_id': _get_company
+		}
+
+    def create_vat(self, cr, uid, ids, context={}):
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+        datas['model'] = 'account.tax.code'
+        datas['form'] = self.read(cr, uid, ids)[0]
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.vat.declaration',
+            'datas': datas,
+        }
 account_vat_declaration()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 4499bfceee114e109661f1a688a459e750694c38 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Fri, 15 Oct 2010 16:56:17 +0530
Subject: [PATCH 238/294] [IMP]: Remove Tab

bzr revid: rch@rch-desktop-20101015112617-lyzxk3jgrs6nug5h
---
 addons/board/board_administration_view.xml |  6 +++---
 addons/stock/board_warehouse_view.xml      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 66da3c5261a..675143342c0 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -31,7 +31,7 @@
             <field name="arch" type="xml">
                 <form string="Administration Dashboard">
                     <hpaned position="100">
-						<child1>
+                        <child1>
                             <action  name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/>
                         </child1>
                         <child2>
@@ -49,8 +49,8 @@
         </record>
        <menuitem id="menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
             groups="base.group_extended"/>
-		<menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="menu_reporting"/>
-        <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
+       <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="menu_reporting"/>
+       <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
 
         <!-- User Connection -->
         <record model="ir.ui.view" id="view_user_connection_tree">
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 33ec62132fb..ac8acb2922f 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -12,8 +12,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
-			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+            <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
+            <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
 		<record id="action_outgoing_product_board" model="ir.actions.act_window">
@@ -22,7 +22,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
+            <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
 			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
@@ -55,8 +55,8 @@
                         </child1>
 
                         <child2>
-							<action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
-							<action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
+                            <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
+                            <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
                         </child2>
                     </hpaned>
                 </form>

From b741536d385ead521ef107e187908d5ec8cd4d4d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 17:07:01 +0530
Subject: [PATCH 239/294] improve

bzr revid: apa@tinyerp.com-20101015113701-9kcahee4mfbbnwmv
---
 addons/project/board_project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index dc985d4e515..93a446131eb 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -23,7 +23,7 @@
                     <field name="progress" widget="progressbar"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+				    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                 </tree>
@@ -53,7 +53,7 @@
                         help="Change Type"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+				    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                 </tree>

From e1dcf5aafd439c15e57ed1f959b8685f475371eb Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 15 Oct 2010 17:22:46 +0530
Subject: [PATCH 240/294] [IMP] Project-Task->add column id, planned, delay and
 state Rename to Type

bzr revid: ron@tinyerp.com-20101015115246-s89zl23scfesonlx
---
 addons/project/project.py       | 6 +++---
 addons/project/project_view.xml | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 26f67d706ba..ca6a30e0a6d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -189,13 +189,13 @@ class project(osv.osv):
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", 
+        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours'], 10),
                 'project.task.work': (_get_project_work, ['hours'], 10),
             }),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.", 
+        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours'], 10),
@@ -463,7 +463,7 @@ class task(osv.osv):
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
-        'type_id': fields.many2one('project.task.type', 'Stage',),
+        'type_id': fields.many2one('project.task.type', 'Type',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 823d1f253c2..549b030bb48 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -305,13 +305,15 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','open'))" string="Tasks">
+                    <field name="id"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
-                    <field name="planned_hours" widget="float_time" invisible="1"/>
+                    <field name="planned_hours"/>
+                    <field name="delay_hours"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"

From 8ea9e3384f311a9a5b04987baecd81c2ad77cef4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Oct 2010 13:57:12 +0200
Subject: [PATCH 241/294] fix

bzr revid: fp@tinyerp.com-20101015115712-swlsc5pia5dx960q
---
 addons/account/account_bank_statement.py | 4 ++--
 addons/account/invoice.py                | 3 +++
 addons/crm/crm_meeting_menu.xml          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0b240663943..de6356b4575 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -378,7 +378,7 @@ class account_bank_statement(osv.osv):
                 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
 
             self.write(cr, uid, [st.id], {'name': st_number}, context=context)
-            self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st_number)
+            self.log(cr, uid, st.id, _('Statement %s is confirmed and entries are created.') % st_number)
             done.append(st.id)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
@@ -501,4 +501,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 25b2ffffa91..d2bf4928095 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -375,6 +375,9 @@ class account_invoice(osv.osv):
 
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
+        for inv_id, name in self.name_get(cr, uid, ids, context=context):
+            message = _('Invoice ') + " '" + name + "' "+ _("is marked as paid.")
+            self.log(cr, uid, inv_id, message)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 18218bee6ff..c310440b02f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -111,7 +111,7 @@
     <menuitem id="menu_attendee_invitations"
             name="Meeting Invitations" parent="crm.menu_meeting_sale"
             sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended,base.group_sale_salesman" />
+            groups="base.group_no_one" />
 
 </data>
 </openerp>

From 68a015bc4203dd005537806be9b34072f6dd0e25 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 13:58:17 +0200
Subject: [PATCH 242/294] [FIX] stock: fixed invoicing wizard to work properly
 on multiple pickings - invoice type is automatically determined

bzr revid: odo@openerp.com-20101015115817-g1jy04x90cyinv7j
---
 .../stock/wizard/stock_invoice_onshipping.py  | 122 +++++++-----------
 .../wizard/stock_invoice_onshipping_view.xml  |  10 +-
 2 files changed, 53 insertions(+), 79 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index cb6dd79a632..d841c7cb37a 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -29,90 +29,67 @@ class stock_invoice_onshipping(osv.osv_memory):
     _columns = {
         'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True),
         'group': fields.boolean("Group by partner"),
-        'type': fields.selection([('out_invoice', 'Customer Invoice'),
-                    ('in_invoice', 'Supplier Invoice'),
-                    ('out_refund', 'Customer Refund'),
-                    ('in_refund', 'Supplier Refund')] , 'Type', required=True),
         'invoice_date': fields.date('Invoiced date'),
     }
-    
+
     def view_init(self, cr, uid, fields_list, context=None):
         if context is None:
             context = {}
-        res= super(stock_invoice_onshipping, self).view_init(cr, uid, fields_list, context=context)            
-        pick_obj=self.pool.get('stock.picking')
-        count=0        
-        for pick in pick_obj.browse(cr, uid,context.get('active_ids', False)):
+        res = super(stock_invoice_onshipping, self).view_init(cr, uid, fields_list, context=context)
+        pick_obj = self.pool.get('stock.picking')
+        count = 0
+        active_ids = context.get('active_ids',[])
+        for pick in pick_obj.browse(cr, uid, active_ids):
             if pick.invoice_state != '2binvoiced':
-                count=count+1
-        if len(context.get('active_ids'))==1 and count==1:
-             raise osv.except_osv(_('Warning !'),'This picking list does not require invoicing.')
-        if  len(context.get('active_ids'))==count:
-            raise osv.except_osv(_('Warning !'),'None of these picking lists require invoicing.')
+                count += 1
+        if len(active_ids) == 1 and count:
+            raise osv.except_osv(_('Warning !'), _('This picking list does not require invoicing.'))
+        if len(active_ids) == count:
+            raise osv.except_osv(_('Warning !'), _('None of these picking lists require invoicing.'))
         return res
-    
-    def _get_type(self, cr, uid, context=None):
-        """ To get invoice type.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: The ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return: Invoice type
-        """
+
+    def _get_type(self, pick):
+        src_usage = dest_usage = None
+        pick_type = None
+        if pick.invoice_state=='2binvoiced':
+            if pick.move_lines:
+                src_usage = pick.move_lines[0].location_id.usage
+                dest_usage = pick.move_lines[0].location_dest_id.usage
+            if pick.type == 'out' and dest_usage == 'supplier':
+                pick_type = 'in_refund'
+            elif pick.type == 'out' and dest_usage == 'customer':
+                pick_type = 'out_invoice'
+            elif pick.type == 'in' and src_usage == 'supplier':
+                pick_type = 'in_invoice'
+            elif pick.type == 'in' and src_usage == 'customer':
+                pick_type = 'out_refund'
+            else:
+                pick_type = 'out_invoice'
+        return pick_type
+
+    def create_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        picking_obj = self.pool.get('stock.picking')
-        src_usage = dest_usage = None
-        for pick in picking_obj.browse(cr, uid, context['active_ids'], context=context):
-            if pick.invoice_state=='2binvoiced':
-                if pick.move_lines:
-                    src_usage = pick.move_lines[0].location_id.usage
-                    dest_usage = pick.move_lines[0].location_dest_id.usage
-                if pick.type == 'out' and dest_usage == 'supplier':
-                    type = 'in_refund'
-                elif pick.type == 'out' and dest_usage == 'customer':
-                    type = 'out_invoice'
-                elif pick.type == 'in' and src_usage == 'supplier':
-                    type = 'in_invoice'
-                elif pick.type == 'in' and src_usage == 'customer':
-                    type = 'out_refund'
-                else:
-                    type = 'out_invoice'
-        return type
-
-    _defaults = {
-        'type': _get_type,
-    }
-
-    def create_invoice(self, cr, uid, ids, context):
-        """ To create invoice
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return: Invoice ids
-        """
         result = []
         picking_obj = self.pool.get('stock.picking')
-        mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-        for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
-            if context.get('new_picking', False):
-                onshipdata_obj[id] = onshipdata_obj.new_picking
-                onshipdata_obj[ids] = onshipdata_obj.new_picking
+        onshipdata_obj = self.read(cr, uid, ids[0], ['journal_id', 'group', 'invoice_date'])
+        if context.get('new_picking', False):
+            onshipdata_obj['id'] = onshipdata_obj.new_picking
+            onshipdata_obj[ids] = onshipdata_obj.new_picking
 
-            type = onshipdata_obj['type']
-            context['date_inv'] = onshipdata_obj['invoice_date']
-            res = picking_obj.action_invoice_create(cr, uid,context['active_ids'],
-                  journal_id = onshipdata_obj['journal_id'],
-                  group=onshipdata_obj['group'],
-                  type=type,
-                  context=context)
-            invoice_ids = res.values()
-            if not invoice_ids:
-                raise osv.except_osv(_('Error'), _('Invoice is not created'))
+        context['date_inv'] = onshipdata_obj['invoice_date']
+        invoice_ids = []
+        for picking in picking_obj.browse(cr, uid, context.get('active_ids', []), context=context):
+            if picking.invoice_state == '2binvoiced':
+                res = picking_obj.action_invoice_create(cr, uid, [picking.id],
+                      journal_id = onshipdata_obj['journal_id'],
+                      group=onshipdata_obj['group'],
+                      type=self._get_type(picking),
+                      context=context)
+                invoice_ids.extend(res.values())
+
+        if not invoice_ids:
+            raise osv.except_osv(_('Error'), _('No invoice were created'))
 
         return {
             'domain': "[('id','in', ["+','.join(map(str,invoice_ids))+"])]",
@@ -120,7 +97,6 @@ class stock_invoice_onshipping(osv.osv_memory):
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
-            'views': False,
             'context': context,
             'type': 'ir.actions.act_window',
         }
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 2a660905c8c..6a4cfec5fca 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -6,18 +6,16 @@
             <field name="model">stock.invoice.onshipping</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create invoices">
-                    <separator colspan="4" string="Create invoices" />
+              <form string="Create invoice">
+                    <separator colspan="4" string="Create invoice" />
                     <field name="journal_id"/>
                     <newline/>
                     <field name="group"/>
                     <newline/>
-                    <field name="type"/>
-                    <newline/>
                     <field name="invoice_date" />
-                       <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                       <button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button name="create_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
         </record>

From 4d775842c126abc07682f6bbbb1866385c00d6c5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 13:58:50 +0200
Subject: [PATCH 243/294] [IMP] stock: rename Outgoing Orders to Outgoing
 Deliveries

bzr revid: odo@openerp.com-20101015115850-lejy2g3pu9jodl48
---
 addons/stock/stock_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9f6d71b99b0..caf981f423e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -779,7 +779,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Outgoing Deliveries">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="origin"/>
@@ -798,7 +798,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Outgoing Picking list">
+                <form string="Outgoing Deliveries">
                     <group col="6" colspan="4">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -935,8 +935,8 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Deliveries"/>
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Deliveries"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
@@ -962,7 +962,7 @@
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Outgoing Orders</field>
+            <field name="name">Outgoing Deliveries</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From 9ebbe74663d7ccfd8a3ab746e003a27bd4beaac2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 14:09:51 +0200
Subject: [PATCH 244/294] [FIX] sale, purchase: update tests for removal of
 type field in picking invoice wizard

bzr revid: odo@openerp.com-20101015120951-l3mlfur6mbw8f2lx
---
 addons/purchase/test/purchase_from_picking.yml | 1 -
 addons/sale/test/invoice_on_shipped_qty.yml    | 1 -
 addons/sale/test/picking_order_policy.yml      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index d0c1cbcb527..c72d375a774 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -140,7 +140,6 @@
   !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
     invoice_date: '2010-05-11'
     journal_id: account.bank_journal
-    type: in_invoice
 - 
   I create Invoice.
 - 
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
index ab24c8541fd..364b709d033 100644
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -71,7 +71,6 @@
   !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_6}:
     invoice_date: '2010-07-17'
     journal_id: account.sales_journal
-    type: out_invoice
 -
   Then I click on 'Create Invoices' button
 -
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index c3f4ba87aaf..a1ea5cab18c 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -64,7 +64,6 @@
   !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
     invoice_date: '2010-07-15'
     journal_id: account.sales_journal
-    type: out_invoice
 -
   Then I click on 'Create Invoices' button
 -

From 8cb9274de789c7548e65cc3ae55606f3fa8451e7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 15 Oct 2010 17:45:13 +0530
Subject: [PATCH 245/294] improve code

bzr revid: apa@tinyerp.com-20101015121513-o8dsvcfgbr67ytzc
---
 addons/account/report/account_tax_report.py | 12 ++++++------
 addons/account/wizard/account_vat.py        |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index 02ade140d34..d968ee9029e 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -37,7 +37,7 @@ class tax_report(rml_parse.rml_parse):
             'get_company': self._get_company,
             'get_currency': self._get_currency,
             'get_lines': self._get_lines,
-			'get_years': self.get_years,            
+            'get_years': self.get_years,
         })
 
 
@@ -51,12 +51,12 @@ class tax_report(rml_parse.rml_parse):
         if form['periods']:
             periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name'])
             for period in periods_l:
-		        if res['periods']=='':
-			        res['periods'] = period['name']
-		        else:
-			        res['periods'] += ", "+ period['name']
+                if res['periods']=='':
+                    res['periods'] = period['name']
+                else:
+                    res['periods'] += ", "+ period['name']
         return res
-            
+
     def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 3b0504394b8..0c33517d428 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -27,12 +27,12 @@ class account_vat_declaration(osv.osv_memory):
     _inherit = "account.common.account.report"
     _columns = {
 	    'based_on': fields.selection([('invoices','Invoices'),
-		                              ('payments','Payments'),],
-		                             'Based On', required=True),
+                                      ('payments','Payments'),],
+                                      'Based On', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
         'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),
-		}
+        }
 
     def _get_company(self, cr, uid, context={}):
         user_obj = self.pool.get('res.users')

From 93d4adf38777198909f38345a24b0952c73c8b27 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Fri, 15 Oct 2010 18:19:26 +0530
Subject: [PATCH 246/294] [MOD/IMP] hr_* Improvement in access rights and
 groups and remove the dashboard action from main menu and set to dashboard
 menu

bzr revid: amp@tinyerp.com-20101015124926-hmjgg5arnfeit7f2
---
 addons/hr/board_hr_view.xml                           | 11 ++++++-----
 addons/hr_timesheet_sheet/board_hr_timesheet_view.xml |  2 +-
 .../hr_timesheet_sheet/security/ir.model.access.csv   |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index c740114789a..2bcc7738397 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data>
         <menuitem id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem
-            id="menu_hr_deshboard"
-            name="Human Resources"
-            parent="base.dashboard"/>
 
     <!-- This board view will be complete by other hr_* modules-->
         <record id="board_hr_form" model="ir.ui.view">
@@ -32,6 +28,11 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_hr_form"/>
         </record>
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
+        <menuitem
+            id="menu_hr_deshboard"
+            name="Human Resources"
+            parent="base.dashboard"
+            action="open_board_hr"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index a50042c3dfb..13193e66d99 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -3,7 +3,7 @@
     <data>
     <menuitem
         id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" 
-        sequence="0" groups="base.group_hr_manager"/>
+        sequence="0"/>
     <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 9d0159bbc1a..f55ee0fb5e0 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -6,3 +6,4 @@
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
+"access_timesheet_report_user","timesheet.report.user","model_timesheet_report","base.group_hr_manager",1,1,1,1

From d0d4d60b7540920b92b2b6823266623adbf1fd40 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 15:23:00 +0200
Subject: [PATCH 247/294] [FIX] sale, purchase: fix yaml tests after modifying
 picking invoice wizard

bzr revid: odo@openerp.com-20101015132300-5qbrrbfekta4kla2
---
 .../purchase/test/purchase_from_picking.yml   | 24 +++++--------------
 addons/sale/test/invoice_on_shipped_qty.yml   | 15 ++++--------
 addons/sale/test/picking_order_policy.yml     | 15 ++++--------
 3 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index c72d375a774..20dd3f0f907 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -122,35 +122,23 @@
  I check that an entry gets created related to stock move.
 -
   !python {model: purchase.order}: |
-    from tools.translate import _
     pur_id1=self.browse(cr, uid, ref("purchase_order_po2"))
     picking_obj = self.pool.get('stock.picking')
     ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     pick_id = picking_obj.browse(cr, uid, ids)[0]
     move_obj = self.pool.get('stock.move')
     search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
-    assert search_id, _('No Incoming Product!')
--
-  I check that Traceability moves are created.
+    assert search_id, 'No Incoming Product!'
 -
   Then I create an invoice from picking by clicking on "Create Invoice" wizard 
-- 
-  I create stock invoice on shipping entry.
-- 
-  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
-    invoice_date: '2010-05-11'
-    journal_id: account.bank_journal
-- 
-  I create Invoice.
 - 
   !python {model: stock.invoice.onshipping}: |
-    pur_obj=self.pool.get('purchase.order')  
+    pur_obj=self.pool.get('purchase.order')
     pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
-    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
-      "tz": False, "search_default_approved": 1, "active_model": "stock.picking",
-      "active_ids": ids, "active_id": ids[0], })
+    pick_ids = [x.id for x in pur_id1.picking_ids]
+    id = self.create(cr, uid, {'invoice_date': '2010-05-11', 'journal_id': ref('account.expenses_journal')},
+      {'active_ids': pick_ids})
+    self.create_invoice(cr, uid, [id], {"active_ids": pick_ids})
 -
   I check that an invoice_id field of Delivery&Invoices gets bind with the value.
 -
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
index 364b709d033..3ed4387067a 100644
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -65,23 +65,16 @@
            'product_uom': move.product_uom.id,
        }
        self.do_partial(cr, uid, [pick.id],partial_datas)
--
-  Then I create the invoice from the two partial picking
-- 
-  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_6}:
-    invoice_date: '2010-07-17'
-    journal_id: account.sales_journal
 -
   Then I click on 'Create Invoices' button
 -
   !python {model: stock.invoice.onshipping}: |
     sale_obj = self.pool.get('sale.order')  
     sale_id = sale_obj.browse(cr, uid, ref("sale_order_so6"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', sale_id.name)])
-    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_6")], {"lang": "en_US",
-      "search_default_available": 1, "tz": False, "active_model": "stock.picking",
-      "contact_display": "partner", "active_ids": ids, "active_id": ids[0]})
+    ids = [x.id for x in sale_id.picking_ids]
+    wiz_id = self.create(cr, uid, {'invoice_date': '2010-07-17', 'journal_id': ref('account.sales_journal')},
+      {'active_ids': ids})
+    self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids})
 -
   I verify whether the invoice has been generated for SO
 -
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index a1ea5cab18c..b12bddd7ecc 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -58,23 +58,16 @@
           'product_uom': move.product_uom.id,
       }
       self.do_partial(cr, uid, [pick.id],partial_datas)
--
-  Then I create invoice from picking
--
-  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
-    invoice_date: '2010-07-15'
-    journal_id: account.sales_journal
 -
   Then I click on 'Create Invoices' button
 -
   !python {model: stock.invoice.onshipping}: |
     sale_obj=self.pool.get('sale.order')  
     sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', sale_id.name)])
-    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
-      "search_default_available": 1, "tz": False, "active_model": "stock.picking",
-      "contact_display": "partner", "active_ids": ids, "active_id": ids[0]})
+    ids = [x.id for x in sale_id.picking_ids]
+    wiz_id = self.create(cr, uid, {'invoice_date': '2010-07-15', 'journal_id': ref('account.sales_journal')},
+      {'active_ids': ids})
+    self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids})
 -
   I check that an invoice has been created.
 -

From af1ac033e190bcd98bbcd2df2b7925dddca98443 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Fri, 15 Oct 2010 18:56:40 +0530
Subject: [PATCH 248/294] [FIX] HR Evaluation Plan Phase \n[FIX] POS Retun
 Picking

bzr revid: jam@tinyerp.com-20101015132640-ieziln79k73pmtov
---
 addons/hr_evaluation/hr_evaluation.py     |  2 +-
 addons/point_of_sale/wizard/pos_return.py | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 6b7d9cba59c..571882ab12a 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -51,7 +51,7 @@ class hr_evaluation_plan_phase(osv.osv):
         'name': fields.char("Phase", size=64, required=True),
         'sequence': fields.integer("Sequence"),
         'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
-        'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', required=True, ondelete='cascade'),
+        'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', ondelete='cascade'),
         'action': fields.selection([
             ('top-down','Top-Down Appraisal Requests'),
             ('bottom-up','Bottom-Up Appraisal Requests'),
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 99e697ea826..abeadfc9931 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -143,6 +143,23 @@ class pos_return(osv.osv_memory):
              @return: Return the add product form again for adding more product
 
         """
+        current_rec = self.read(cr, uid, data[0], context=context)
+        order_obj =self.pool.get('pos.order')
+        line_obj = self.pool.get('pos.order.line')
+        pos_current = order_obj.browse(cr, uid, context.get('active_id'))
+        pos_line_ids = pos_current.lines
+        if pos_line_ids:
+            for pos_line in pos_line_ids:
+                line_field = "return"+str(pos_line.id)
+                pos_list = current_rec.keys()
+                newline_vals = {}
+                if line_field in pos_list :
+                    less_qty = current_rec.get(line_field)
+                    pos_cur_line = line_obj.browse(cr, uid, pos_line.id, context=context)
+                    qty = pos_cur_line.qty
+                    qty = qty - less_qty
+                    newline_vals.update({'qty':qty})
+                    line_obj.write(cr, uid, pos_line.id, newline_vals, context=context)
         return {
             'name': _('Add Product'),
             'view_type': 'form',

From bb3b2ab637eeb259b96e8298995dd86aa5c1cb93 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 15:27:25 +0200
Subject: [PATCH 249/294] [FIX] stock_location: avoid possible recursion in
 workflow, plus make source location required for pulled flow

bzr revid: odo@openerp.com-20101015132725-2cwi0tiwb4xbjhmw
---
 addons/stock_location/procurement_pull.py     | 2 --
 addons/stock_location/stock_location_view.xml | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 8b780d7a7a6..31316bf4eae 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -42,8 +42,6 @@ class procurement_order(osv.osv):
         for procurement in self.browse(cr, uid, ids):
             for line in procurement.product_id.flow_pull_ids:
                 if line.location_id==procurement.location_id:
-                    if not line.location_src_id:
-                        self.write(cr, uid, procurement.id, {'message': _('No source location defined to generate the picking !')})
                     return (line.type_proc=='move') and (line.location_src_id)
         return False
 
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index eca4ade39fa..96d3fd84809 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -43,7 +43,7 @@
                     <page string="Logistic Flow">
                         <field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
                             <tree string="Pulled flows">
-                                <field name="location_id"/>
+                                <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                 <field name="type_proc"/>
                                 <field name="name"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -59,7 +59,7 @@
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <newline/>
                                 <group col="4" colspan="4" attrs="{'invisible':[('type_proc','!=','move')]}">
-                                    <field name="location_src_id"/>
+                                    <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                     <field name="picking_type"/>
                                     <field name="partner_address_id"/>
                                     <field name="procure_method"/>

From 00ad7bcff8d79ae27309f83c71db95f1b13809c2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 15 Oct 2010 19:07:29 +0530
Subject: [PATCH 250/294] [IMP] Peoject->task - Dealy Value

bzr revid: ron@tinyerp.com-20101015133729-id40xkl3qb8lu20e
---
 addons/project/project.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index ca6a30e0a6d..ee1ce7649b7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -395,10 +395,13 @@ class task(osv.osv):
                 if hours.get(task.id, False):
                     dur_in_user_uom =  uom_obj._compute_qty(cr, uid, default_uom, hours.get(task.id, 0.0), user_uom)
                     hours[task.id] = dur_in_user_uom
-
+        timespent=0
         for task in self.browse(cr, uid, ids, context=context):
             res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
-            res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
+#            res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
+            for ctimespent in task.work_ids:
+                timespent=timespent+ctimespent.hours
+            res[task.id]['delay_hours'] = task.planned_hours - timespent
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)

From 739d702e520381344d1447163c6a8af746cc30c7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 15:42:15 +0200
Subject: [PATCH 251/294] [IMP] stock: improved labels in return picking

bzr revid: odo@openerp.com-20101015134215-jmgk2as2sv3wn7y5
---
 addons/stock/wizard/stock_return_picking.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 4bddc9a7ee4..78852202440 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -83,7 +83,7 @@ class stock_return_picking(osv.osv_memory):
                         if 'return%s'%(m.id) not in self._columns:
                             self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
                         if 'invoice_state' not in self._columns:
-                            self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+                            self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be refunded/invoiced'), ('none', 'No invoicing')], string='Invoicing', required=True)
             if not valid_lines:
                 raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
@@ -119,7 +119,7 @@ class stock_return_picking(osv.osv_memory):
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
-            res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
+            res['fields']['invoice_state']={'string':_('Invoicing'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing'))]}
             arch_lst.append('<group col="2" colspan="4">')
             arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
             arch_lst.append('<button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />')

From 3cf2eaa9ff92e39b86b5413573ae5ac97a6196e0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 15:44:14 +0200
Subject: [PATCH 252/294] [ADD] sale, stock: add filters for pickings to
 invoice and done pickings + corresponding menu in Sales > Billing

bzr revid: odo@openerp.com-20101015134414-plenh0pvoe3rj8gd
---
 addons/sale/stock_view.xml  | 13 +++++++++++++
 addons/stock/stock_view.xml |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index dddcad07932..d0d38cc3d94 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -61,5 +61,18 @@
             </field>
         </record>
 
+        <!--  Add menu: Billing - Deliveries to invoice -->
+        <record id="outgoing_picking_list_to_invoice" model="ir.actions.act_window">
+            <field name="name">Deliveries to Invoice</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
+            <field name="search_view_id" ref="stock.view_picking_out_search"/>
+        </record>
+        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="sale.menu_invoiced" sequence="20"/>
+
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9f6d71b99b0..ff581dbaa4c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -937,9 +937,12 @@
                     <group col="8" colspan="4">
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Outgoing Orders already processed"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
+                        <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" />
                         <field name="origin"/>
@@ -1168,6 +1171,9 @@
                         <separator orientation="vertical" />
                         <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                        <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+                    </group>
                 </search>
             </field>
         </record>

From 55bde876199ba531a9f61385d8ef3ef38dfb6f0b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 15:45:10 +0200
Subject: [PATCH 253/294] [IMP] stock: hide "Create Invoice" button when not
 needed on stock.picking

bzr revid: odo@openerp.com-20101015134510-zlwpbkwsj17r4d6x
---
 addons/stock/stock_view.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff581dbaa4c..2adb71abb4d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -720,7 +720,9 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <group colspan="1" states="done">
+                                    <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -907,10 +909,12 @@
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <group colspan="1" states="done">
+                                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1128,7 +1132,9 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <group colspan="1" states="done">
+                                    <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">

From 7c80d51511930118e34d979196f8ad5802f529ad Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 15 Oct 2010 19:28:06 +0530
Subject: [PATCH 254/294] [IMP] sale->configuration :Add Email Menu

bzr revid: ron@tinyerp.com-20101015135806-bn6e6n3i1fhegkhs
---
 addons/mail_gateway/mail_gateway_view.xml | 24 +++++++++++++++++++++++
 addons/project/project.py                 |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index ab118295db5..f3be1eff422 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+        <menuitem id="base.menu_mail_gateway" name="Email"
+            parent="base.menu_base_config" sequence="1" />
+
         <record model="ir.ui.view" id="view_mailgate_message_form">
           <field name="name">mailgate.message.form</field>
             <field name="model">mailgate.message</field>
@@ -85,6 +89,20 @@
             </field>
         </record>
 
+
+
+
+        <record id="action_view_mail_message" model="ir.actions.act_window">
+            <field name="name">Message</field>
+            <field name="res_model">mailgate.message</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_mailgate_message_search"/>
+        </record>
+
+
+
+
         <record model="ir.ui.view" id="view_mailgate_thread_form">
             <field name="name">mailgate.thread.form</field>
             <field name="model">mailgate.thread</field>
@@ -134,6 +152,9 @@
             </field>
         </record>
 
+
+
+
          <!--        Emails action-->
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
             <field name="name">Mailgateway Threads</field>
@@ -192,5 +213,8 @@
        src_model="mailgate.message"
        domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
 
+           <menuitem id="menu_email_gateway_form"
+               parent="base.menu_mail_gateway" action="action_view_mail_message" />
+
     </data>
 </openerp>
diff --git a/addons/project/project.py b/addons/project/project.py
index ee1ce7649b7..a09855d3bce 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -399,9 +399,11 @@ class task(osv.osv):
         for task in self.browse(cr, uid, ids, context=context):
             res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
 #            res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
+
             for ctimespent in task.work_ids:
                 timespent=timespent+ctimespent.hours
             res[task.id]['delay_hours'] = task.planned_hours - timespent
+
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)

From be0622d714df1536314d1b5910f47d585d3de2a1 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 15 Oct 2010 19:35:28 +0530
Subject: [PATCH 255/294] [IMP] Improved tips on menu

bzr revid: vir@tinyerp.com-20101015140528-kazs7hi10bxst6t0
---
 addons/base_action_rule/base_action_rule_view.xml     |  1 +
 addons/crm/crm_lead_menu.xml                          |  2 +-
 addons/crm/crm_lead_view.xml                          |  2 ++
 addons/crm/crm_meeting_menu.xml                       |  3 ++-
 addons/crm/crm_opportunity_menu.xml                   | 11 ++---------
 addons/crm/crm_phonecall_menu.xml                     |  4 ++--
 addons/crm/crm_phonecall_view.xml                     |  1 +
 addons/crm/crm_view.xml                               |  1 +
 addons/crm/report/crm_lead_report_view.xml            |  4 ++--
 addons/crm/report/crm_phonecall_report_view.xml       |  2 +-
 addons/crm_claim/crm_claim_menu.xml                   |  2 +-
 addons/crm_claim/report/crm_claim_report_view.xml     |  1 +
 addons/crm_fundraising/crm_fundraising_menu.xml       |  2 +-
 .../report/crm_fundraising_report_view.xml            |  2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml             |  2 +-
 .../crm_helpdesk/report/crm_helpdesk_report_view.xml  |  2 +-
 addons/crm_profiling/crm_profiling_view.xml           |  1 +
 addons/product/product_view.xml                       |  4 ++--
 addons/sale/report/sale_report_view.xml               |  2 +-
 addons/sale/sale_view.xml                             |  9 ++-------
 .../sale_journal/report/sale_journal_report_view.xml  |  1 +
 addons/sale_journal/sale_journal_view.xml             |  2 ++
 addons/wiki_sale_faq/wiki_sale_faq_view.xml           |  4 ++--
 23 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 01951b3c9b8..cc8966316fd 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -114,6 +114,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_base_action_rule_tree"/>
+            <field name="help">Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email.</field>
         </record>
 
            <menuitem id="menu_base_action_rule_form"
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index b26dcc29f41..a92a36aba33 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -10,7 +10,7 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
         <field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id}</field>
-        <field name="help">A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.</field>
+        <field name="help">'Leads' allows you to manage and keep track of all first potential interests of a partner in one of your products or services. A lead is a first, unqualified, contact with a prospect or customer. After being qualified, a lead can be converted into a business opportunity with the creation of the related partner for further detailed tracking of any linked activities. You can use leads when you import a database of prospects or to integrate your website's contact form with OpenERP.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 99ebcf63592..fb45e8a7b1b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -11,6 +11,7 @@
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
         <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
         <field name="context">{'object_id':'crm.lead'}</field>
+        <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle.</field>
     </record>
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
@@ -26,6 +27,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+            <field name="help">Create specific categories that fit your company's  activities in order to better classify and analyse them after they have been maintained in your leads and opportunities. You can use categories to reflect your product structure or the different types of sales you do.</field>
         </record>
 
         <menuitem action="crm_lead_categ_action"
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index c310440b02f..73880da9523 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -51,7 +51,7 @@
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
-        <field name="help">The calendar of meetings is shared between sales teams and fully integrated with the others applications like the employee holidays. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
+        <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
@@ -106,6 +106,7 @@
          <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
         <field name="domain">[('ref','like','crm.meeting,')]</field>
          <field name="context">{"search_default_toreview":1, "search_default_user_id":uid}</field>
+        <field name="help">'Meeting Invitations' allows you to create and manage the meeting invitations sent/to be sent to your colleagues/partners.</field>
      </record>
 
     <menuitem id="menu_attendee_invitations"
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index d2d2a299edb..9a065571324 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -31,16 +31,9 @@
           <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id,'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
-          <field name="help">Opportunities allows you to track your best deals pipeline: history of
-the communication, expected revenues, stage of each opportunity,
-excepted closings, etc. Opportunities are usually connected with the
-email gateway: new emails may create opportunities and each opportunity
-automatically gets the history of the conversation with the customer.
+          <field name="help">Opportunities allows you to manage and keep track of your sales pipeline by creating specific customer or prospect related sales documents in order to follow up potential sales. Information such as the expected revenue, opportunity stage, expected closing date, communication history and so on can be maintained in them. Opportunities can be connected with the email gateway: new emails create opportunities, each of them automatically gets the history of the conversation with the customer.
 
-Your teams will be able to plan meeting and phonecalls from
-opportunities, to convert opportunities into quotations, to manage
-documents related to the opportunity, to track all activities related to
-this customer, etc.</field>
+You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.</field>
      </record>
 
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 5c5a43edbd8..d030a4f24f6 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -69,7 +69,7 @@
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
         <field name="context" eval="'{\'search_default_section_id\':section_id, \'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
-        <field name="help">Trace easily all your Inbound calls. The Inbound menu open a search view in editable mode, so you can easily modify or add a new call record. With the actions buttons convert a lead into an opportunity or plan a meeting.</field>
+        <field name="help">The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form for the traceability of every contact you get with a partner. From the call record, you can trigger a request for another call, a meeting or a business opportunity.</field>
 
     </record>
 
@@ -107,7 +107,7 @@
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
         <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
-        <field name="help">The Outbound menu open a search view in editable mode, so you can easily modify or plan a new call. Actions buttons allows you to to make you call status evolved for a better follow up of your planned calls. During calls, convert your lead into an opportunity, plan a meeting or canceled it.</field>
+        <field name="help">Outbound Calls lists all the calls to be performed by your sales team. They can record the information about the call on the form view. These information will appear on the partner form for the traceability of every contact you get with a customer. You can import a .CSV file with a list of calls to be done for your sales team.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ca38f587f00..5b796d20b8d 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -11,6 +11,7 @@
         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
         <field name="context">{'object_id':'crm.phonecall'}</field>
+        <field name="help">Create specific phone call categories to better sort the type of calls tracked in the system.</field>
     </record>
 
     <menuitem action="crm_phonecall_categ_action" name="Categories"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 912736bd912..b77de509045 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -85,6 +85,7 @@
             <field name="res_model">crm.case.section</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
+            <field name="help">Sales team allows you to organize your different salesmen or departments into separate teams. Each team will work in his own list of opportunities, sales orders, eso. Each user can set a team by default in his preferences. The opportunities and sales order he will see, will be automatically filtered according to his team.</field>
         </record>
 
         <menuitem action="crm_case_section_act"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index da0aa1cffba..b711bd68fb5 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -202,7 +202,7 @@
             <field name="context">{'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
             <field name="domain">[('type', '=', 'lead')]</field>
-            <field name="help">Leads Analysis allows you to consult different informations relative to CRM. Check for treatments delays, number of responses given and emails send. You can sort out your leads analysis on different groups to get fine grained analysis.</field>
+            <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
@@ -226,7 +226,7 @@
             <field name="context">{"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
             <field name="domain">[('type', '=', 'opportunity')]</field>
-            <field name="help">Opportunities Analysis menu gives you an instant access to your opportunities like expected revenue, planned cost, overpassed deadline or the number of exchanges by opportunity.</field>
+            <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 9100c75a7ae..69dd06c5ad6 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -159,7 +159,7 @@
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
-            <field name="help">Get an anlysis of Phone Calls number and delay to close, stage, user suits to different groups for a global or a fine grained analysis.</field>
+            <field name="help">From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index c02bc33340d..18642f18282 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -16,7 +16,7 @@
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
-            <field name="help">Record and trace your customers' claims here. A claim is defined by a client name, several types, a status and a priority level. A  claim can also be a preventive or repairing action. A claim can be linked to a reference like a sales order, or a lot. You can send emails with attachments and get the history of the claim treatment (emails send, interventions type, etc.). </field>
+            <field name="help">Record and track your customers' claims. Claims can be linked to a sales order or a lot. You can send emails with attachments and get the history of everything that happened on a specific claim (emails sent, interventions type and so on..). Claims can be automatically linked to an email address using the mail gateway module.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 276c8b2b771..04be54e2052 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -196,6 +196,7 @@
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
+            <field name="help">Have a general overview of all claims processed in the system by sorting them with specific criteria.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index d521bc91592..85fa4ffd70b 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -15,7 +15,7 @@
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
         <field name="context">{"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
-        <field name="help">When you wish to support your organization or a campaign, trace here all your activities for collecting money. The menu open a search list where you can find funds description, email, history, probability of success. Several actions buttons allows you to easily modify your different fund status.</field>
+        <field name="help">If you need to support your organization or a campaign, with 'Fund Raising' you can track all you fund raising activities. The search list allows you to filter by funds description, email, history and probability of success.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 957db9ec9c3..25222a56b2d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -172,7 +172,7 @@
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
-            <field name="help">With Fund Raising get at a glance a view to your fund raising campaigns with the estimated revenue, average probability and delay to close.</field>
+            <field name="help">Have a general overview of all fund raising activities by sorting them with specific criteria such as the estimated revenue, average success probability and delay to close.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 7bc6faf4ee0..80077e9a51e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -13,7 +13,7 @@
             <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
             <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
             <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
-            <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
+            <field name="help">'Helpdesk and Support' allows you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary and assign a priority level. Depending on your need, you may consider using the issues system of OpenERP to manage your support activities.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index cee5d12045b..8dbfe843d9e 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -162,7 +162,7 @@
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
-            <field name="help">Helpdesk allows you to consult different informations relative to support demands. Check for treatments delays, number of responses given and emails send and costs. You can sort out your analysis on different groups to get fine grained analysis.</field>
+            <field name="help">Have a general overview of all support requests by sorting them with specific criteria such as the processing time, number of requests answered, emails sent and costs.</field>
         </record>
 
            <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index e0dbcce05a1..d029240a768 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -14,6 +14,7 @@
           <field name="res_model">crm_profiling.questionnaire</field>
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
+          <field name="help">You can create specific topic related questionnaires that will be used to guide your team(s) in the sales cycle by helping them to ask the right questions. Using the segmentation tool, you will be able to automatically assign a partner to a category based on his answers to the different questionnaires.</field>
         </record>
 
         <menuitem parent="base.menu_crm_config_lead" id="menu_segm_questionnaire"
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b58fa4cc811..272e41ea7a1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -193,7 +193,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_product_tree_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
-            <field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
+            <field name="help">You must define a Product for everything you buy or sell. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information of your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman,base.group_system"/>
@@ -252,7 +252,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
-            <field name="help">This is a hyerarchical structure of your product's categories, you can enter a category to browse all products in this category and his children.</field>
+            <field name="help">Here is a list of all your products classified by category. You can click on a category to get the list of all products linked to this category or to a child of this category.</field>
         </record>
         <menuitem
             action="product_category_action"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 87f134e857c..bf2786f17ed 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -125,7 +125,7 @@
         <field name="search_view_id" ref="view_order_product_search"/>
         <field name="view_id" ref="view_order_product_tree"/>
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
-        <field name="help">With Sales Analysis consult your sales total amount suits to different group criteria (salesman, partner, product, etc.)</field>
+        <field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 85dd4c86c27..1c193f8fb9f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -288,12 +288,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="help">The sales order manages the invoicing, the product fullfilment and the
-delivery processes. OpenERP can handle products, services and
-consumables so that a sales order can trigger tasks, manufacturing
-orders, purchases, etc. It support several invoicing methods according
-to your configuration: from the sales order, from the pickings, etc.
-            </field>
+            <field name="help">Sales Orders helps you manage quotations and orders done with your customers. OpenERP suggests that you to start by creating a quotation. Once the order is confirmed, the quotation is converted into a Sale Order. OpenERP can handle several types of products so that a sales order can trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sale order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
@@ -490,7 +485,7 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="filter" eval="True"/>
-            <field name="help">Lines to invoice opens a search view with sales order and their status.</field>
+            <field name="help">Here is a list of each sales order line to be invoiced. This view allows you to invoice sales orders partially, by lines of sales order. You don't need this list if you invoice based on the delivery orders or if you invoice sales totally.</field>
         </record>
 
         <record id="action_order_line_tree3" model="ir.actions.act_window">
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index 63caea90768..e73fdcf9785 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -79,6 +79,7 @@
 	        <field name="view_mode">tree,graph</field>
 	        <field name="search_view_id" ref="view_sale_journal_report_search"/>
 	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="help">This view allows you to access your sales orders or quotations by journal. You can create journal in order to group different sales orders by teams and perform automatic actions on a journal (confirm or cancel all sales of a journal).</field>
 	    </record>
 
 	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all"
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 029908da37a..1567c5662bb 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -45,6 +45,7 @@
             <field name="res_model">sale_journal.invoice.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create specific invoicing types that can be maintained in your sales orders. An invoicing type can, for example, be a time lapse to be observed before billing your sales orders. Example: invoice daily, invoice every Wednesday, at end of month, etc.</field>
         </record>
 
      <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/>
@@ -143,6 +144,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_sale_journal_search"/>
+            <field name="help">Display and maintain the sales journals to be used in your system. A sales journal is the place where all specific sales are recorded. If you do not need more than one sales journal, just create a generic sales journal that will be the default journal to be used for all made sales.</field>
         </record>
 
 
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index f65e542aed9..d1432c74b02 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -13,7 +13,7 @@
            <field name="res_model">ir.attachment</field>
            <field name="view_type">form</field>
            <field name="domain" eval="[('parent_id','=',ref('dir_sale'))]"></field>
-           <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
+           <field name="help">Documents gives you an access to all attached files to any record. It is a repository of all documents such as emails, project related attachments or any other documents. From this view, you can search on the content of the documents. OpenERP automatically assign meta-data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents.</field>
        </record>
 
        <record model="ir.actions.act_window" id="action_wiki_test">
@@ -23,7 +23,7 @@
            <field name="view_mode">tree,form</field>
            <field name="domain" eval="[('group_id','=',ref('wiki_groups_sale_faq'))]"/>
            <field name="search_view_id" ref="wiki.view_wiki_filter"/>
-           <field name="help">FAQ is a wiki page used to share frequently ask questions.</field>
+           <field name="help">Wiki pages allow you to share ideas and questions with co-workers. You can create a new document that can be linked to one or several applications (specifications of a project, a FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface.</field>
        </record>
 
         <menuitem

From 40f4295ac6332aa771a4777cfe7d3d8165110761 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 19:38:59 +0530
Subject: [PATCH 256/294] [IMP] project_long_term: gantt view

bzr revid: hmo@tinyerp.com-20101015140859-hc10fm4aardz065s
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 713322f5f0e..6dd336af923 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,7 +13,7 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="resource_id" date_start="date_start" date_stop="date_end" mode="year">
+              <gantt color="phase_id" date_start="date_start" date_stop="date_end" mode="year">
                <level object="project.project" link="project_id" domain="[]">
                     <field name="phase_id"/>
                 </level>

From c18c64a99a15162e82290bfc9a7336d103a807e6 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 15 Oct 2010 19:41:26 +0530
Subject: [PATCH 257/294] [IMP] project : improved access rights, group and
 menus

bzr revid: jas@tinyerp.com-20101015141126-gzqsm3jm4sei200d
---
 addons/hr_timesheet/hr_timesheet_view.xml        |  1 -
 .../hr_timesheet_sheet_view.xml                  |  7 +++++--
 addons/project/project_view.xml                  |  2 +-
 addons/project/report/project_report_view.xml    |  6 +++---
 addons/project/security/ir.model.access.csv      | 12 ++++++++++--
 addons/project/security/project_security.xml     | 10 +++++++++-
 addons/project_gtd/project_gtd_view.xml          |  2 +-
 addons/project_gtd/security/ir.model.access.csv  |  2 ++
 addons/project_issue/project_issue_view.xml      |  2 +-
 .../report/project_issue_report_view.xml         |  4 ++--
 .../project_issue/security/ir.model.access.csv   | 14 ++++++++++++--
 .../security/project_issue_security.xml          |  9 +++++++++
 .../security/ir.model.access.csv                 | 16 +++++++++++++++-
 .../project_long_term/project_long_term_view.xml |  8 ++++----
 .../security/ir.model.access.csv                 | 10 ++++++++--
 addons/project_mailgate/__openerp__.py           |  6 +++---
 .../security/ir.model.access.csv                 |  3 +++
 addons/project_messages/__openerp__.py           |  3 ++-
 .../project_messages/project_messages_view.xml   |  2 +-
 .../security/ir.model.access.csv                 |  2 ++
 .../security/ir.model.access.csv                 |  6 +++++-
 .../project_scrum/security/ir.model.access.csv   |  9 ++++++---
 .../project_timesheet/project_timesheet_view.xml |  2 +-
 .../security/ir.model.access.csv                 |  2 ++
 24 files changed, 107 insertions(+), 33 deletions(-)
 create mode 100644 addons/project_mailgate/security/ir.model.access.csv

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 08ec23bd872..d7700d16db3 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -5,7 +5,6 @@
         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
                   parent="base.menu_main_pm" sequence="3"/>
 
-
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cb034a8659d..f95a2b5aba0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -186,6 +186,9 @@
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
              sequence="2"/>
 
+        <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
+            sequence="5"/>
+
         <!--
             Company inheritancy
         -->
@@ -322,8 +325,8 @@
             </field>
         </record>
   <!-- Timesheet Button on Employee Form -->
-  <act_window 
-           context="{'search_default_employee_id': [active_id]}" 
+  <act_window
+           context="{'search_default_employee_id': [active_id]}"
            id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
 
     </data>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3ea6dab6649..6b801aac440 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -325,7 +325,7 @@
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
-                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
 					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 246bbfbecf7..eb781690c1b 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -115,9 +115,9 @@
                         <newline/>
                         <field name="date_start"/>
                         <field name="date_end"/>
-                        <field name="date_deadline"/>                        
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
-                        
+
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
@@ -149,7 +149,7 @@
             <field name="help">Get detailed analysis by task</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index cdd939c79ec..d842574f5ce 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,12 +1,12 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,0,0,0
+"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
 "access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
@@ -28,3 +28,11 @@
 "access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0
 "access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
 "access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
+"access_project_project_project_financial_user","project.project.project.financial.user","model_project_project","group_project_finance_user",1,0,0,0
+"access_project_task_project_financial_user","project.task.project.financial.user","model_project_task","group_project_finance_user",1,0,0,0
+"access_project_task_work_project_financial_user","project.task.work.project.financial.user","model_project_task_work","group_project_finance_user",1,0,0,0
+"access_report_project_task_user_project_financial_user","report.project.task.user.project.financial.user","model_report_project_task_user","group_project_finance_user",1,0,0,0
+"access_project_board_project_financial_user","board.board.project.financial.user","board.model_board_board","group_project_finance_user",1,0,0,0
+"access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0
+"access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0
+"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 97453dcb33b..f38dc5593d1 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -51,7 +51,15 @@
         <field name="name" >Projects According to User</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="groups" eval="[(6, 0, [ref('group_project_manager')])]"/>
-        <field name="domain_force">[('user_id','=',user.id)]</field>
+         <field name="domain_force">[('members','in',[user.id])]</field>
+    </record>
+
+    <record model="ir.rule" id="project_user_rule">
+        <field name="name" >Projects According to Members</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field eval="1" name="perm_read"/>
+        <field name="groups" eval="[(6, 0, [ref('group_project_user')])]"/>
+        <field name="domain_force">[('members','in',[user.id])]</field>
     </record>
 
 </data>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index fc05ee00e61..d80dd86a243 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -30,7 +30,7 @@
         <field name="res_model">project.gtd.context</field>
     </record>
 
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system"
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system,project.group_project_finance_user"
                 parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 210ac9f6c4a..0986ea1570f 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -7,3 +7,5 @@
 "access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
 "access_project_gtd_context_system","project.gtd.context system","model_project_gtd_context","base.group_system",1,1,1,1
 "access_project_gtd_timebox_system","project.gtd.timebox system","model_project_gtd_timebox","base.group_system",1,1,1,1
+"access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0
+"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 1298a6f8852..9e79f367ca4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system"/>
+        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system,project.group_project_finance_user"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index e6fc4cb5a43..dd09592916d 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -56,7 +56,7 @@
                   <group col="16" colspan="8">
                            <filter string="Year" icon="terp-go-year" help="Current Year"
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        />                               
+                        />
 
                        <filter string="Month" icon="terp-go-month" name="This Month"
                         domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -177,7 +177,7 @@
         </record>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
-        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
+        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager,project.group_project_finance_user"/>
 
 
   </data>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index ece2be3a784..b113853cbd2 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,0,0,0
+"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
 "access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
 "access_project_issue","project.issue","model_project_issue","project_issue.group_project_supporter",1,1,1,1
 "access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
@@ -11,4 +11,14 @@
 "access_project_issue_system","project.issue system","model_project_issue","base.group_system",1,0,0,0
 "access_project_issue_report_system","project.issue.report system","model_project_issue_report","base.group_system",1,0,0,0
 "access_crm_case_section_system","crm.case.section system","crm.model_crm_case_section","base.group_system",1,1,1,1
-"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
+"access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0
+"access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
+"access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0
+"access_project_issue_report_financial_user","project.issue.report.financial.user","model_project_issue_report","project.group_project_finance_user",1,0,0,0
+"access_project_issue_board_project_financial_user","board.board.project.issue.financial.user","board.model_board_board","project.group_project_finance_user",1,0,0,0
+"access_project_issue_project_financial_user","project.issue.financial.user","model_project_issue","project.group_project_finance_user",1,0,0,0
+"access_mailgate_message_project_financial_user","mailgate.message.financial.user","mail_gateway.model_mailgate_message","project.group_project_finance_user",1,0,0,0
+"access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
+"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
+"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
+"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
\ No newline at end of file
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index d0aeabafc05..e3fc5a80e3a 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -4,5 +4,14 @@
 	     <record id="group_project_supporter" model="res.groups">
 	        <field name="name">Project / Support Manager</field>
 	    </record>
+        <record model="ir.rule" id="project_issue_rule">
+            <field name="name" >Issues according to Users</field>
+            <field name="model_id" ref="model_project_issue"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="1" name="perm_create"/>
+            <field eval="1" name="perm_write"/>
+            <field name="groups" eval="[(6, 0, [ref('project.group_project_user')])]"/>
+            <field name="domain_force">[('project_id.members','in',[user.id])]</field>
+        </record>
  	</data>
 </openerp>
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 235bb4d1bfc..25bcbe03ccd 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -5,4 +5,18 @@
 "access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
 "access_hr_analytic_timesheet_system","hr_analytic_timesheet system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,0,0,0
 "access_hr_timesheet_sheet_sheet_project_system","hr_timesheet_sheet.sheet system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
-
+"access_hr_analytic_timesheet_project_financial_user","account.analytic.line.timesheet.project.financial.user","account.model_account_analytic_line","project.group_project_finance_user",1,1,1,0
+"access_account_analytic_journal_project_financial_user","account.analytic.journal.project.financial.user","account.model_account_analytic_journal","project.group_project_finance_user",1,1,1,0
+"access_account_fiscalyear_project_financial_user","account.fiscalyear.project.financial.user","account.model_account_fiscalyear","project.group_project_finance_user",1,1,1,0
+"access_hr_timesheet_invoice_factor_project_financial_user","hr_timesheet_invoice.factor.project.financial.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_finance_user",1,1,1,0
+"access_account_invoice_project_financial_user","account.invoice.project.financial.user","account.model_account_invoice","project.group_project_finance_user",1,1,1,0
+"access_hr_analytic_timesheet_project_manager","account.analytic.line.timesheet.project.manager","account.model_account_analytic_line","project.group_project_manager",1,1,1,1
+"access_account_analytic_journal_project_manager","account.analytic.journal.project.manager","account.model_account_analytic_journal","project.group_project_manager",1,1,1,1
+"access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
+"access_hr_timesheet_invoice_factor_project_manager","hr_timesheet_invoice.factor.project.manager","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_manager",1,1,1,1
+"access_account_invoice_project_manager","account.invoice.project.manager","account.model_account_invoice","project.group_project_manager",1,1,1,1
+"access_analytic_account_line_project_user","analytic_account_line_timesheet user","analytic.model_account_analytic_line","project.group_project_user",1,1,1,0
+"access_account_analytic_journal_project_user","account.analytic.journal.project.user","account.model_account_analytic_journal","project.group_project_user",1,1,1,0
+"access_account_fiscalyear_project_user","account.fiscalyear.project.user","account.model_account_fiscalyear","project.group_project_user",1,1,1,0
+"access_hr_timesheet_invoice_factor_project_user","hr_timesheet_invoice.factor.project.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_user",1,1,1,0
+"access_account_invoice_project_user","account.invoice.project.user","account.model_account_invoice","project.group_project_user",1,1,1,0
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 713322f5f0e..232d04686d9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -369,17 +369,17 @@
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase"
-            groups="base.group_extended"
+            groups="base.group_extended,project.group_project_finance_user,project.group_project_manager"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="base.menu_project_long_term" sequence="3"/>
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"
+            groups="base.group_extended,project.group_project_finance_user"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 7af7984d7e6..08297cee95d 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,10 +1,16 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
 "access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
 "access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,0,0,0
 "access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
 "access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,1,1
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
+"access_project_resource_allocation_financial_user","project.resource.allocation.financial.user","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0
+"access_project_phase_financial_user","project.phase.financial.user","model_project_phase","project.group_project_finance_user",1,0,0,0
+"access_resource_resource_financial_user","resource.resource.financial.user","model_resource_resource","project.group_project_finance_user",1,0,0,0
+"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0
+"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0
+"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
\ No newline at end of file
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index cd3d0caeaf8..a5e7fd46f4c 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -29,11 +29,11 @@
     "depends": ["project", "mail_gateway"],
     "description": """This module is an interface that synchronises mails with OpenERP Project Task.
 
-It allows creating tasks as soon as a new mail arrives in our configured mail server. 
-Moreover, it keeps track of all further communications and task states.  
+It allows creating tasks as soon as a new mail arrives in our configured mail server.
+Moreover, it keeps track of all further communications and task states.
     """,
     "init_xml": [],
-    "update_xml": [
+    "update_xml": ["security/ir.model.access.csv",
         "project_mailgate_view.xml",
     ],
     'demo_xml': [
diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv
new file mode 100644
index 00000000000..1a840d89e9a
--- /dev/null
+++ b/addons/project_mailgate/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mailgate_message_project_manager","project.mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,0
+"access_mailgate_message_project_user","project.mailgate.message.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 352fe797f22..97f9c4f2be5 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -32,7 +32,8 @@
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
-    'update_xml': ['project_messages_view.xml'],
+    'update_xml': ['security/ir.model.access.csv',
+                   'project_messages_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index e270d2d001a..7042ce9d9b2 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -109,6 +109,6 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="project_messages.view_project_message_tree"/>
        </record>
-       <menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management"/>
+       <menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/>
      </data>
 </openerp>
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index fb0b4e8255a..e31ffd860cb 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
 "access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
+"access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0
+"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index 330a25485c7..2c6c92db8ff 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_analytic_planning_project_manager","report_account_analytic.planning manager","model_report_account_analytic_planning","project.group_project_manager",1,0,0,0
+"access_report_account_analytic_planning_project_manager","report_account_analytic.planning manager","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_line_project_manager","report_account_analytic.planning.line manager","model_report_account_analytic_planning_line","project.group_project_manager",1,0,0,0
 "access_report_account_analytic_planning_stat_project_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,0,0,0
 "access_report_account_analytic_planning_stat_project_user","report_account_analytic.planning.stat user","model_report_account_analytic_planning_stat","project.group_project_user",1,1,1,0
@@ -9,3 +9,7 @@
 "access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
 "access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
 "access_report_account_analytic_planning_system","report_account_analytic.planning system","model_report_account_analytic_planning","base.group_system",1,0,0,0
+"access_report_account_analytic_planning_financial_user","report_account_analytic.planning.financial.user","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0
+"access_report_account_analytic_planning_stat_financial_user","report_account_analytic.planning.stat.financial.user","model_report_account_analytic_planning_stat","project.group_project_finance_user",1,0,0,0
+"access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 109dba056df..38599644751 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -2,11 +2,14 @@
 "access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,1,1,0
 "access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,0
 "access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,1,1,0
-"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,0,0,0
-"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,0,0,0
-"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,0,0,0
+"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,1,1,1
+"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,1,1,1
+"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
 "access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
 "access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
 "access_scrum_sprint_system","project_scrum.sprint system","model_project_scrum_sprint","base.group_system",1,0,0,0
 "access_scrum_product_backlog_system","project_scrum.product.backlog system","model_project_scrum_product_backlog","base.group_system",1,0,0,0
 "access_scrum_meeting_system","project_scrum.meeting system","model_project_scrum_meeting","base.group_system",1,0,0,0
+"access_project_scrum_backlog_financial_user","project_scrum.product.backlog.financial.user","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0
+"access_project_scrum_sprint_financial_user","project_scrum.sprint.financial.user","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0
+"access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 15928e1287f..05be6d5466e 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -37,6 +37,6 @@
         <menuitem id="menu_project_billing_line" name="Bill Tasks Work"
             parent="menu_project_billing" action="hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree"/>
         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                  parent="base.menu_main_pm" sequence="3"/ groups="project.group_project_finance_user">
+                parent="base.menu_main_pm" sequence="5" groups="project.group_project_finance_user"/>
     </data>
 </openerp>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index ab1e82cacb6..8f10009fa12 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -4,3 +4,5 @@
 "access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
 "access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,1,1,1
 "access_hr_timesheet_sheet_sheet_system","hr.timesheet.sheet.sheet.system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,1,1,1
+"access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0
+"access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0

From 3ddfda284e441c3f82f831f87e27ee75ab07076e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 17:30:09 +0200
Subject: [PATCH 258/294] [IMP] stock: more consistent icons and filters in
 stock search views for "Done" and "To Invoice" filtering

bzr revid: odo@openerp.com-20101015153009-bwj1wym5xy60jmj6
---
 addons/stock/stock_view.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 39d56564806..c92463b5677 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -750,6 +750,7 @@
                     <group col="10" colspan="4">
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
+                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
@@ -767,6 +768,10 @@
                         <separator orientation="vertical" />
                         <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -945,7 +950,7 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Outgoing Deliveries to invoice"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" />
@@ -1154,9 +1159,10 @@
             <field name="model">stock.picking</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Input Picking List">
+                <search string="Incoming Shipments">
                     <group col="8" colspan="4">
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
+                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>

From 3ce6888e424f45cbc6c6c0148cc7686057c81ac7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 21:17:01 +0530
Subject: [PATCH 259/294] [IMP] project_long_term: improve gantt view of
 resource allocation

bzr revid: hmo@tinyerp.com-20101015154701-6fw3rbkjfpilagji
---
 addons/project_long_term/project_long_term.py       | 11 +++++++++++
 addons/project_long_term/project_long_term_view.xml |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d6d43f83c5d..cfe4ff4f283 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -395,7 +395,18 @@ class project_resource_allocation(osv.osv):
     _name = 'project.resource.allocation'
     _description = 'Project Resource Allocation'
     _rec_name = 'resource_id'
+
+    def get_name(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for allocation in self.browse(cr, uid, ids, context=context):
+            name = allocation.resource_id.name
+            if allocation.user_id:
+                name = '%s' %(allocation.user_id.name)
+            name += ' (%s%%)' %(allocation.useability)
+            res[allocation.id] = name
+        return res
     _columns = {
+        'name': fields.function(get_name, method=True, type='char', size=256),
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
         'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c88c2229745..5e6ccebfe75 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,9 +13,9 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="phase_id" date_start="date_start" date_stop="date_end" mode="year">
-               <level object="project.project" link="project_id" domain="[]">
-                    <field name="phase_id"/>
+              <gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
+               <level object="project.phase" link="phase_id" domain="[]">
+                    <field name="name"/>
                 </level>
               </gantt>
             </field>

From 475a9c625d383de29162203ff373f25fc54d57a4 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 15 Oct 2010 18:55:08 +0200
Subject: [PATCH 260/294] [FIX] stock: removed unused statement

bzr revid: qdp-launchpad@tinyerp.com-20101015165508-5ip71y1jx0aa5iuj
---
 addons/stock/wizard/stock_fill_inventory_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index e8dd6d323d1..c97a662c846 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -25,7 +25,6 @@
             src_model="stock.inventory"
             view_mode="form"
             target="new"
-            multi="False"        
             context="{'search_default_in_location':1}" 
             key2="client_action_multi"    
             id="action_view_stock_fill_inventory"/>    

From 12e5a78d6ecc369a181e7950fca2991a36db8d07 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Sat, 16 Oct 2010 03:17:18 +0530
Subject: [PATCH 261/294] [FIX] Account_voucher : minor fix

bzr revid: jvo@tinyerp.com-20101015214718-9oetl1dh9y5qjjo7
---
 addons/account_voucher/account_voucher.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 6883a53b13f..c048763ac5d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -257,10 +257,9 @@ class account_voucher(osv.osv):
 
         total = 0.0
         total_tax = 0.0
-
         for line in line_ids:
             line_amount = 0.0
-            line_amount = line[2].get('amount')
+            line_amount = line[2] and line[2].get('amount',0.0) or 0.0
             voucher_line_ids += [line[1]]
             voucher_total += line_amount
 

From db6ee299b9bda8561074d6b70f4327b3341ec96d Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sat, 16 Oct 2010 00:01:00 +0200
Subject: [PATCH 262/294] fix

bzr revid: fp@fp-laptop-20101015220100-h9a9m5zkfnyfpx9e
---
 addons/project/project_view.xml               |  2 +-
 addons/project_issue/project_issue_menu.xml   |  2 +-
 addons/project_long_term/project_long_term.py |  4 +---
 .../project_long_term_view.xml                | 23 +++++++++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ce54b58a378..a74bacf8e4e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -432,7 +432,7 @@
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion. A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.</field>
         </record>
-        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
+        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index df76e808bff..89c3085c2cf 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -49,6 +49,6 @@
             view_type="form"/>
 
     <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management"
-            action="project_issue_categ_act0" sequence="3"/>
+            action="project_issue_categ_act0" sequence="4"/>
 </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index cfe4ff4f283..faea0916906 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -399,9 +399,7 @@ class project_resource_allocation(osv.osv):
     def get_name(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for allocation in self.browse(cr, uid, ids, context=context):
-            name = allocation.resource_id.name
-            if allocation.user_id:
-                name = '%s' %(allocation.user_id.name)
+            name = allocation.phase_id.name
             name += ' (%s%%)' %(allocation.useability)
             res[allocation.id] = name
         return res
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 70bed5aba41..1ca78537340 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -14,7 +14,7 @@
             <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
-               <level object="project.phase" link="phase_id" domain="[]">
+               <level object="res.users" link="user_id" domain="[]">
                     <field name="name"/>
                 </level>
               </gantt>
@@ -73,7 +73,7 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Resource Allocations">
+                <search string="Resources Allocation">
                     <group colspan="4" col="20">
                         <field name="resource_id"/>
                         <field name="phase_id"/>
@@ -89,9 +89,8 @@
                 </search>
             </field>
         </record>
-
        <record id="act_resouce_allocation" model="ir.actions.act_window">
-            <field name="name">Resource Allocations</field>
+            <field name="name">Resources Allocation</field>
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
@@ -243,7 +242,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="year">
+                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="month">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
@@ -298,7 +297,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
+             <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -356,7 +355,7 @@
         context="{'search_default_phase_id': [active_id]}"/>
 
     <act_window
-    	context="{'search_default_project_id': [active_id]}"
+        context="{'search_default_project_id': [active_id]}"
         id="act_project_phases"
         name="Phases"
         res_model="project.phase"
@@ -368,8 +367,12 @@
     # Menu Items
     # ------------------------------------------------------
 
+        <menuitem action="act_project_phase_list"
+            groups="base.group_extended"
+            id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
+
         <menuitem action="act_project_phase"
-            groups="base.group_extended,project.group_project_finance_user,project.group_project_manager"
+            groups="base.group_extended"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
@@ -379,8 +382,8 @@
             groups="base.group_extended,project.group_project_finance_user"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 

From bf9d455d684c15882d87b1069e2d5f78aee61853 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sat, 16 Oct 2010 00:03:57 +0200
Subject: [PATCH 263/294] merge

bzr revid: fp@fp-laptop-20101015220357-k89fr0ooa5f5yfcx
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 272e41ea7a1..d7b4163f0ee 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>                   
-                   <filter string="Consumable/Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />

From bbda9884fea2850a2554caaa5801fc886f6175d2 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 16 Oct 2010 04:48:26 +0000
Subject: [PATCH 264/294] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101016044826-iguaxij8k6v3z012
---
 addons/account/i18n/mn.po                     |   34 +-
 addons/account_anglo_saxon/i18n/mn.po         |   66 +
 addons/account_budget/i18n/sr.po              |    6 +-
 addons/account_cancel/i18n/mn.po              |   37 +
 addons/account_coda/i18n/hr.po                |    6 +-
 addons/account_coda/i18n/sr.po                |    6 +-
 addons/account_followup/i18n/sr.po            |    6 +-
 addons/account_invoice_layout/i18n/sr.po      |    6 +-
 addons/account_payment/i18n/mn.po             |    6 +-
 addons/account_payment/i18n/ru.po             |   12 +-
 addons/account_payment/i18n/sr.po             |    6 +-
 addons/account_reporting/i18n/sr.po           |    6 +-
 addons/account_tax_include/i18n/sr.po         |    6 +-
 addons/account_voucher/i18n/sr.po             |    6 +-
 addons/analytic/i18n/sr.po                    |    6 +-
 .../analytic_journal_billing_rate/i18n/sr.po  |    6 +-
 addons/analytic_user_function/i18n/sr.po      |    6 +-
 addons/audittrail/i18n/ru.po                  |   69 +-
 addons/base_contact/i18n/sr.po                |  133 +-
 addons/base_iban/i18n/sr.po                   |   24 +-
 addons/base_module_quality/i18n/sr.po         |   20 +-
 addons/base_module_record/i18n/sr.po          |  110 +-
 addons/base_report_creator/i18n/sr.po         |  185 +--
 addons/base_report_designer/i18n/sr.po        |   54 +-
 addons/base_setup/i18n/sr.po                  |    6 +-
 addons/base_vat/i18n/sr.po                    |    6 +-
 addons/crm_profiling/i18n/sr.po               |  173 +++
 addons/decimal_precision/i18n/ru.po           |    8 +-
 addons/delivery/i18n/ru.po                    |   54 +-
 addons/delivery/i18n/sr.po                    |    6 +-
 addons/email_template/i18n/sr.po              | 1293 +++++++++++++++++
 addons/hr_evaluation/i18n/ru.po               |  279 ++++
 addons/mrp_jit/i18n/ru.po                     |    6 +-
 addons/mrp_operations/i18n/hr.po              |    6 +-
 addons/mrp_operations/i18n/sr.po              |  443 ++++++
 addons/mrp_repair/i18n/sr.po                  |  685 +++++++++
 addons/mrp_subproduct/i18n/sr.po              |   90 ++
 addons/point_of_sale/i18n/sr.po               |    6 +-
 addons/process/i18n/sr.po                     |    6 +-
 addons/product/i18n/sr.po                     |   34 +-
 addons/product_expiry/i18n/sr.po              |    6 +-
 addons/product_manufacturer/i18n/mn.po        |   12 +-
 addons/product_margin/i18n/sr.po              |    6 +-
 addons/product_visible_discount/i18n/sr.po    |    6 +-
 addons/project_messages/i18n/sr.po            |    6 +-
 addons/project_retro_planning/i18n/sr.po      |    6 +-
 addons/purchase_analytic_plans/i18n/sr.po     |    6 +-
 addons/sale_analytic_plans/i18n/sr.po         |    6 +-
 addons/stock/i18n/mn.po                       |    6 +-
 addons/warning/i18n/sr.po                     |    6 +-
 50 files changed, 3547 insertions(+), 442 deletions(-)
 create mode 100644 addons/account_anglo_saxon/i18n/mn.po
 create mode 100644 addons/account_cancel/i18n/mn.po
 create mode 100644 addons/crm_profiling/i18n/sr.po
 create mode 100644 addons/email_template/i18n/sr.po
 create mode 100644 addons/hr_evaluation/i18n/ru.po
 create mode 100644 addons/mrp_operations/i18n/sr.po
 create mode 100644 addons/mrp_repair/i18n/sr.po
 create mode 100644 addons/mrp_subproduct/i18n/sr.po

diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 7c955886d37..4c9ccd539ba 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 03:35+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 04:44+0000\n"
+"Last-Translator: Гоби <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -647,7 +647,7 @@ msgstr "Харилцагчийн төлбөрийн нөхцөл"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Дан�ны бичилт гүйц��лт"
+msgstr "Дан�ны бичилт бууралт"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
@@ -3119,7 +3119,7 @@ msgstr "�налитик Журнал"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr "Бичл�гийн н�р"
+msgstr "Гүйлг��ний н�р"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -4542,7 +4542,7 @@ msgstr "Дан�ны бичилт"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "�влагын дан� болон төлбөр"
+msgstr "�влага & Өглөг"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4625,7 +4625,7 @@ msgstr "�ийлүүл�гчийн �анхүү бүртг�л"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "�налитик �анхүүгийн �тати�тик"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4657,7 +4657,7 @@ msgstr "�налитик дан�ны мод"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
 msgid "Filter on Partners"
-msgstr ""
+msgstr "Харилцагч д��р шүүлт хийх"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4837,7 +4837,7 @@ msgstr "�/к дугаар"
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
+msgstr "Дан�ны өртөг, орлого журналаар"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -5036,7 +5036,7 @@ msgstr "Татварын тайлбар"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr ""
+msgstr "Дан�ны автомат үү���н шилжилтүүд рүү холбох"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
@@ -5058,7 +5058,7 @@ msgstr "/"
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "Үү�г�гд��н тоо болон бичл�гүүдийг агуулж байна"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5094,7 +5094,7 @@ msgstr "Журналын бүт�ц"
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "Бүртг�лийн мөрүүд"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5425,7 +5425,7 @@ msgstr "Төлөлтийн нөхцөл"
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable and Payable"
-msgstr ""
+msgstr "�влага болон өглөг"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5528,7 +5528,7 @@ msgstr "Ерөнхий журнал"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
-msgstr "Т�нц�л"
+msgstr "Балан�"
 
 #. module: account
 #: rml:account.invoice:0
@@ -6077,7 +6077,7 @@ msgstr "Үнийн н�х�мжл�л"
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr "�а�жилтын авлагын дан�"
+msgstr "�влагын на�жилт"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -6326,7 +6326,7 @@ msgstr "Дан�ны төрлөөр"
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Өнөөдрийг хүрт�лх авлагын на�жилт"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
@@ -6368,7 +6368,7 @@ msgstr "Үү�г�х огноо"
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "�а�жилтын авлага"
+msgstr "�влагын на�жилт"
 
 #. module: account
 #: view:report.invoice.created:0
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
new file mode 100644
index 00000000000..5c016a4b0ea
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -0,0 +1,66 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-10-15 11:31+0000\n"
+"Last-Translator: sugi <Unknown>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "�гуулахын дан�"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Д�лг�цийн XML алдаатай!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Үнийн өөрчлөлтийн дан�"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Эн� дан� нь худалдан авалтын үн� болон өртгийн үнийн хоорондох үнийн "
+"өөрчлөлтийг дүгн�хийн тулд ашиглагдана."
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index 44d9554c859..c98287d9e32 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 10:57+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:22+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
new file mode 100644
index 00000000000..29ccc3a3db9
--- /dev/null
+++ b/addons/account_cancel/i18n/mn.po
@@ -0,0 +1,37 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:03+0000\n"
+"PO-Revision-Date: 2010-10-15 11:33+0000\n"
+"Last-Translator: sugi <Unknown>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Д�лг�цийн XML алдаатай!"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Дан� цуцлах"
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index a7212b53edf..0b56b4f2664 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_coda/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-10-14 20:51+0000\n"
-"Last-Translator: robert <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:33+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po
index 2c8e5a84e9e..c5af7899172 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/account_coda/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-10-14 11:15+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index 1501c7191d7..d882a65d26a 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 11:52+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/sr.po b/addons/account_invoice_layout/i18n/sr.po
index 58532d22362..ae168dc498c 100644
--- a/addons/account_invoice_layout/i18n/sr.po
+++ b/addons/account_invoice_layout/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 12:09+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index 03ae6c68183..5bd7975811f 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 06:58+0000\n"
-"Last-Translator: Jacara <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index a77dfcf2567..04dc80f93c7 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:53+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-10-15 11:34+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -275,7 +275,7 @@ msgstr "Произве�ти платежи"
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Тип коммуникации"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
@@ -332,7 +332,7 @@ msgstr "Партнер"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr ""
+msgstr "Приемник �ообщени� коммуникации"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
@@ -502,7 +502,7 @@ msgstr "Сумма в валюте партнера"
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr ""
+msgstr "Коммуникации 2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
index d563ea941c0..4fd733e9ea5 100644
--- a/addons/account_payment/i18n/sr.po
+++ b/addons/account_payment/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 13:06+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po
index c79527b314f..38289723f44 100644
--- a/addons/account_reporting/i18n/sr.po
+++ b/addons/account_reporting/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 13:59+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:23+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/i18n/sr.po b/addons/account_tax_include/i18n/sr.po
index a74323d1144..bfcc7a71005 100644
--- a/addons/account_tax_include/i18n/sr.po
+++ b/addons/account_tax_include/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 14:04+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index abad7de54da..b9f3ee0d7e1 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 14:35+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:35+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index f2fc1ab5105..77fb1553933 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-10-14 15:01+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
index d65fb0fd7fb..cad00d3772c 100644
--- a/addons/analytic_journal_billing_rate/i18n/sr.po
+++ b/addons/analytic_journal_billing_rate/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 15:09+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:19+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index ff890fa4c9e..846409dd53d 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 15:16+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:40+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 9bc201a24c2..cf6d78603e0 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 00:52+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 12:05+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Проведение аудита"
 
 #. module: audittrail
 #: constraint:ir.model:0
@@ -43,6 +43,8 @@ msgstr "Подпи�ка"
 #: view:audittrail.log:0
 msgid "Old Value : "
 msgstr ""
+"Старое значение.\\nпред�тавление пробела. Введите пробел в �квивалентную "
+"позицию перевода "
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
@@ -52,7 +54,7 @@ msgstr "Создать"
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "Логи аудита"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
@@ -82,7 +84,7 @@ msgstr "Про�мотреть журнал"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "audittrail.log.line"
-msgstr ""
+msgstr "Строки лога аудита"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
@@ -92,17 +94,17 @@ msgstr "Метод"
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr ""
+msgstr "Форма лога"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "Идентификатор лога"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "Идентификатор запи�и"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
@@ -112,12 +114,12 @@ msgstr "�апи�ать"
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
 msgid "Audittrails"
-msgstr ""
+msgstr "Проведение аудита"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "Строки лога"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -138,17 +140,17 @@ msgstr "Объект"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Правила проведени� аудита"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "Запи�ь лога по"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "�овое значение тек�та: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -158,6 +160,9 @@ msgid ""
 "    Subscribe Rules for read, write, create and delete on objects and check "
 "logs"
 msgstr ""
+"Позвол�ет админи�тратору от�леживать операции каждого пользовател�  по в�ем "
+"объектам �и�темы.\\nУ�танавливает правила читать, пи�ать, �оздавать и "
+"удал�ть на объектах и проверить журналы."
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
@@ -172,7 +177,7 @@ msgstr "Пользователь"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "Старое значение тек�та: "
 
 #. module: audittrail
 #: constraint:ir.ui.view:0
@@ -187,12 +192,12 @@ msgstr "�азвание"
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "Строги лога"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
 msgid "Subscribed Rules"
-msgstr ""
+msgstr "Правила подпи�ки"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
@@ -202,12 +207,12 @@ msgstr "Пол�"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "Правила проведени� аудита"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "audittrail.rule"
-msgstr ""
+msgstr "Правила аудита"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -217,17 +222,17 @@ msgstr "Отпи�ать��"
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log writes"
-msgstr ""
+msgstr "Запи�и лога"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "audittrail.log"
-msgstr ""
+msgstr "Журнал проведени� аудита"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "Опи�ание пол�"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
@@ -237,12 +242,12 @@ msgstr "Удалить"
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,open:0
 msgid "Open Logs"
-msgstr ""
+msgstr "Открыть лог"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "�овое значение тек�та"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
@@ -252,7 +257,7 @@ msgstr "�азвание правила"
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log reads"
-msgstr ""
+msgstr "Чтение лога"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
@@ -262,22 +267,22 @@ msgstr "Журналы"
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "�овое значение"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
 msgid "View Logs"
-msgstr ""
+msgstr "Чтение лога"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log creates"
-msgstr ""
+msgstr "Созданные журналы"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Логи проведени� аудита"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
@@ -287,7 +292,7 @@ msgstr "Правила"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "�овое значение "
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
@@ -297,7 +302,7 @@ msgstr "Пользователи"
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "Старое значение тек�та"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,end:0
@@ -307,4 +312,4 @@ msgstr "Отмена"
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log deletes"
-msgstr ""
+msgstr "Удаленные логи"
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
index 9a3fb65353b..9a727107d05 100644
--- a/addons/base_contact/i18n/sr.po
+++ b/addons/base_contact/i18n/sr.po
@@ -8,35 +8,36 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 11:50+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Seq. Osobe"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "es.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Funkcija Partnera"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -46,97 +47,97 @@ msgstr ""
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakti"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Partner Seq."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutni"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Funkcija Kontakta Partnera"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Drugo"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Kontakt na funkciju"
 
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partner na adresu"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# Kontakata"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Dodatno polje za Tel"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
-msgstr ""
+msgstr "Funkcija"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Faks"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "Jezik"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Određuje Osobe i Funkcije"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Funkcije Osoba"
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 msgid "Base Contact"
-msgstr ""
+msgstr "Osnovni Kontakt"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_partner:0
@@ -144,212 +145,214 @@ msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
 msgstr ""
+"redosled važnosti ovog naziva Posla-Radnog mesta u listi naziva Poslova-"
+"Radnih mesta povezanog Partnera"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Datum Završetka"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Poslovi kontakta"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Nacionalnost"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
-msgstr ""
+msgstr "redosled važnosti ove Adrese u listi Adresa povezanog Partnera"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Glavni Posao"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Glavna Funkcija"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Definisi Partnere i njihove Adrese"
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact Process"
-msgstr ""
+msgstr "Postupak Osnovnog Kontakta"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Sekv."
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Dodatak"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobilni"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Interna/Externa Ekstenzija Tel. broja"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Ljudi s kojima radite."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Funkcije i Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: base_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Kompanije s kojima radite."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Glavni Poslodavac."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Funkcija na Adresu"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Kontakti partnera"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Kontakt partnera"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Rad na Privatnoj adresi"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
 msgid "Last Name"
-msgstr ""
+msgstr "Prezime"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr ""
+msgstr "Opšte"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Prošlost"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr ""
+msgstr "Opšte informacije"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Poslovi na istoj Adresi Partnera"
 
 #. module: base_contact
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Po�etni datum"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Definisi Funkcije i Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr ""
+msgstr "Internet stranica"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
 msgid "Birth Date"
-msgstr ""
+msgstr "Datum rođenja"
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 23ba5329fd3..a7322e54490 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -8,57 +8,57 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 11:58+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "Pošt. Broj"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr ""
+msgstr "Međunarodni broj Bankovnog ra�una"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr ""
+msgstr "bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr ""
+msgstr "iban"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN konto"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr ""
+msgstr "Broj konta"
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 083bd2bfafd..8459f9c8d98 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 15:37+0000\n"
+"PO-Revision-Date: 2010-10-15 12:04+0000\n"
 "Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -138,32 +138,32 @@ msgstr "Sumarno"
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Sacuvaj Izvestaj"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Standardne stavke"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Sacuvaj Izvestaj"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Provera Kvaliteta"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "modul.detalj.kvalitet"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -174,12 +174,12 @@ msgstr "Rezultat"
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 65d7ba6bb4f..227308f8233 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/i18n/sr.po
@@ -8,99 +8,100 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:24+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 12:24+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,category:0
 #: wizard_field:base_module_record.module_save,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Категорија"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_field:base_module_record.module_save,init,info_text:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr ""
+msgstr "Izaberi objekat za cuvanje"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
 #: wizard_field:base_module_record.module_save,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,directory_name:0
 #: wizard_field:base_module_record.module_save,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Ime Direktorijuma"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "Samo Zapisi"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Demo Podaci"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 #: wizard_field:base_module_record.module_save,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Ime Fajla"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,version:0
 #: wizard_field:base_module_record.module_save,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Verzija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr ""
+msgstr "Objekti se Snimaju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "Zapis od Datuma"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 #: wizard_view:base_module_record.module_save,init:0
 msgid "Recording Information"
-msgstr ""
+msgstr "Informacija o Snimanju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_save,init,info_status:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -112,111 +113,111 @@ msgstr ""
 #: wizard_view:base_module_record.module_save,init:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Snimanje Modula"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Izvezi Podesavanja kao Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "Hvala unaprijed na Vašem Doprinosu"
 
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Lista Objekata za zapis"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr ""
+msgstr "Po�ni Snimanje"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr ""
+msgstr "Ne Snima"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
 #: wizard_field:base_module_record.module_save,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Puni Opis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,name:0
 #: wizard_field:base_module_record.module_save,info,name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Naziv Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
 msgid "Objects"
-msgstr ""
+msgstr "Objekti"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
 #: wizard_field:base_module_record.module_save,save,module_file:0
 msgid "Module .zip File"
-msgstr ""
+msgstr ".zip datoteka Modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording information"
-msgstr ""
+msgstr "Informacija o Snimanju"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul uspješno kreiran !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording Stopped"
-msgstr ""
+msgstr "Snimanje zaustavljeno"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr ""
+msgstr "Kreirano"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr ""
+msgstr "Hvala što ste koristili Snima� Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr ""
+msgstr "Nastavi Prethodnu Sesiju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
 #: wizard_field:base_module_record.module_save,info,website:0
 msgid "Documentation URL"
-msgstr ""
+msgstr "URL Dokumentacije"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr ""
+msgstr "Izmenjen"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr ""
+msgstr "Snimanje"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
 msgid "Record"
-msgstr ""
+msgstr "Snima"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,stop,end:0
@@ -224,25 +225,25 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,save:0
 #: wizard_button:base_module_record.module_save,init,check:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr ""
+msgstr "Snima� Modula"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Obi�ni podaci"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
 #: wizard_button:base_module_record.module_save,end,end:0
 msgid "OK"
-msgstr ""
+msgstr "U redu"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -252,6 +253,9 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
+"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
+"korištenjem mogućnosti Modula: 'base_module_publish'."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -260,16 +264,19 @@ msgid ""
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
 msgstr ""
+"Snima� Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP "
+"klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
+"bilo kojoj Bazi Podataka za ponovnu upotrebu ili publiciranje."
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
 msgid "Record module"
-msgstr ""
+msgstr "Snimi Modul"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "Kreacija Modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -277,30 +284,33 @@ msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
 msgstr ""
+"Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Po�ni "
+"Snimanje\""
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
 #: wizard_field:base_module_record.module_save,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Tip Podataka"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,intro:0
 #: wizard_view:base_module_record.module_save,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "Informacija o Modulu"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr ""
+msgstr "Sacuvaj Snimljen Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
 msgstr ""
+"OpenERP Snima� je zaustavljen. Ne zaboravite da sacuvate snimljen Modul."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -309,20 +319,20 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,end:0
 #: wizard_button:base_module_record.module_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "Kreiran & Izmijenjen"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
-msgstr ""
+msgstr "Zaustavi Snimanje"
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index a0d62708967..661e7d96bb0 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:24+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 12:52+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -24,378 +24,381 @@ msgid ""
 "records.\n"
 " e.g. res_partner.id=3"
 msgstr ""
+"Unesite izraz za polje po kojem želite filtrirati zapise.\n"
+"npr. res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
-msgstr ""
+msgstr "Tip grafikona"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Used View"
-msgstr ""
+msgstr "Korišten prikaz"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Filter Values"
-msgstr ""
+msgstr "Vrednosti filtra"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,graph_mode:0
 msgid "Graph Mode"
-msgstr ""
+msgstr "Grafi�ki"
 
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Graph View"
-msgstr ""
+msgstr "Grafi�ki prikaz"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
 msgid "Value"
-msgstr ""
+msgstr "Vrednost"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
 msgid "Set Filter Fields"
-msgstr ""
+msgstr "Postavi filterska polja"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
 msgid "Report Filters"
-msgstr ""
+msgstr "Filteri izvještaja"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,sql_query:0
 msgid "SQL Query"
-msgstr ""
+msgstr "SQL upit"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: wizard_button:base_report_creator.report.menu.create,init,create_menu:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Kreiraj Meni"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operator"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "OR"
-msgstr ""
+msgstr "ILI"
 
 #. module: base_report_creator
 #: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action
 #: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action_config
 msgid "Custom Reports"
-msgstr ""
+msgstr "Prilagođeni izvještaji"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report.menu.create,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Informacije Menija"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Sum"
-msgstr ""
+msgstr "Suma"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
-msgstr ""
+msgstr "Navedeni objekti"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Field List"
-msgstr ""
+msgstr "Lista polja"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tip izveštaja"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
-msgstr ""
+msgstr "Dodaj Filter"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
 msgid "Create Menu for Report"
-msgstr ""
+msgstr "Kreiraj Meni za Izveštaje"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Obrazac"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type3:0
 #: selection:base_report_creator.report.fields,calendar_mode:0
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
 msgid "Report"
-msgstr ""
+msgstr "Izveštaj"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Po�etni datum"
 
 #. module: base_report_creator
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Tree"
-msgstr ""
+msgstr "Stablo"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
 msgid "Authorized Groups"
-msgstr ""
+msgstr "Autorizovane Grupe"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_orientation:0
 msgid "Graph Orientation"
-msgstr ""
+msgstr "Orjentacija grafikona"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Authorized Groups (empty for all)"
-msgstr ""
+msgstr "Autorizovane Grupe(Prazno za sve)"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr ""
+msgstr "Bezbednost"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Naziv Menija"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "AND"
-msgstr ""
+msgstr "I"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr ""
+msgstr "Kalendar Mod"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
 msgid "Display Fields"
-msgstr ""
+msgstr "Polja Displeja"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "Y Axis"
-msgstr ""
+msgstr "Y osa"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr ""
+msgstr "Kalendar"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Graph"
-msgstr ""
+msgstr "Grafikon"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
 msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Priprema"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Set Filter Values"
-msgstr ""
+msgstr "Postavi Vrednosti Filtera"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr ""
+msgstr "Uspravno"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
 msgid "Rows And Columns Report"
-msgstr ""
+msgstr "Izvestaj redova i kolona"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "General Configuration"
-msgstr ""
+msgstr "Opšte podešavanje"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
 msgid "Select Field to filter"
-msgstr ""
+msgstr "Odaberite polje za filtriranje"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr ""
+msgstr "Vodoravno"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr ""
+msgstr "Metod grupisanja"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Uslov"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
-msgstr ""
+msgstr "Brojanje"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "X Axis"
-msgstr ""
+msgstr "X osa"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Roditeljski Meni"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
 msgid "Confirm Filter"
-msgstr ""
+msgstr "Potvrdi Filter"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Naziv Filtera"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
 msgid "Open Report"
-msgstr ""
+msgstr "Otvori izveštaj"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Grupisano"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
 msgid "Report Creator"
-msgstr ""
+msgstr "Kreator izveštaja"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report.menu.create,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: base_report_creator
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
 msgid "First View"
-msgstr ""
+msgstr "Prvi pogled"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Delay"
-msgstr ""
+msgstr "Kašnjenje"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "Polje"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
-msgstr ""
+msgstr "Filteri na poljima"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Pie Chart"
-msgstr ""
+msgstr "Tortni grafikon"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type3:0
 msgid "Third View"
-msgstr ""
+msgstr "Treći pogled"
 
 #. module: base_report_creator
 #: model:ir.module.module,description:base_report_creator.module_meta_information
@@ -407,85 +410,91 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"Ovi moduli vam dozvoljavaju kreiranje bilo kojeg statisti�kog\n"
+"izvještaja iz više objekata. To je graditelj SQL upita i pretrazivac\n"
+"za krajnje korisnike.\n"
+"\n"
+"Nakon instalacije, modul dodaje Meni za kreiranje prilagođenog izvještaja\n"
+"na Meniju Glavne Table.\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Uniq Colors"
-msgstr ""
+msgstr "Jedinstvene boje"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Naziv izveštaja"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr ""
+msgstr "Polja"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Average"
-msgstr ""
+msgstr "Prose�no"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Reports"
-msgstr ""
+msgstr "Izveštaji"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimum"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
 msgid "Values"
-msgstr ""
+msgstr "Вредно�ти"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Bar grafikon"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
 msgid "Second View"
-msgstr ""
+msgstr "Drugi pogled"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report.menu.create,init:0
 msgid "Create Menu For This Report"
-msgstr ""
+msgstr "Kreiraj Meni za ovaj izveštaj"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "View parameters"
-msgstr ""
+msgstr "Parametri prikaza"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
 msgid "Filter Field"
-msgstr ""
+msgstr "polje Filtera"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,field_ids:0
 msgid "Fields to Display"
-msgstr ""
+msgstr "Polja za Prikaz"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index bee67bea6e7..380fd397706 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -8,89 +8,89 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 13:03+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr ""
+msgstr "Predstavljanje"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Upload your modified report"
-msgstr ""
+msgstr "Pošalji promenjen izveštaj na Server"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
 msgid "Upload the modified report"
-msgstr ""
+msgstr "Pošalji promenjen izveštaj na Server"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
 msgid "The .SXW report"
-msgstr ""
+msgstr ".SXW Izveštaj"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Report modified"
-msgstr ""
+msgstr "Izveštaj je promenjen"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,init,get_form:0
 msgid "Modify a report"
-msgstr ""
+msgstr "Izmeni Izveštaj"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Your report has been modified."
-msgstr ""
+msgstr "Vaš je Izveštaj izmenjen"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr ""
+msgstr "Modul Interfejsa Dizajnera Izveštaja"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form,report_id:0
 #: wizard_field:base_report_designer.modify,get_form_result,report_id:0
 #: wizard_field:base_report_designer.modify,send_form,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Izveštaj"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
 msgid "Report Designer"
-msgstr ""
+msgstr "Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 #: wizard_view:base_report_designer.modify,get_form_result:0
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Get a report"
-msgstr ""
+msgstr "Napravi Izvještaj"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,get_form_result:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0
 msgid "Your .SXW file"
-msgstr ""
+msgstr "Vaša .SXW datoteka"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer"
-msgstr ""
+msgstr "Dizajner Izveštaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
@@ -100,47 +100,51 @@ msgid ""
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
 msgstr ""
+"Ovo je Predložak vašeg traženog Izveštaja. Spremite ga kao .SXW datoteku i "
+"otvorite s programon OpenOffice. Ne zaboravite instalirati Tiny OpenOffice "
+"paket kako biste mogli vršiti izmjene. kad izvršite izmjene, vratite "
+"datoteku u Open ERP koristeći ovaj Čarobnjak."
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
 msgid "Update the report"
-msgstr ""
+msgstr "Ažurirajte Izvještaj"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 msgid "Create a new report"
-msgstr ""
+msgstr "Napravi novi Izvještaj"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
 msgid "Modify an existing report"
-msgstr ""
+msgstr "Izmeni postojeći izveštaj"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,end:0
 #: wizard_button:base_report_designer.modify,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,end:0
 #: wizard_button:base_report_designer.modify,send_form,end:0
 #: wizard_button:base_report_designer.modify,send_form_result,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,operation:0
 msgid "Operation"
-msgstr ""
+msgstr "Postupak"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer introduction"
-msgstr ""
+msgstr "Uvod u Dizajner Izveštaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 msgid "Select your report"
-msgstr ""
+msgstr "Odaberite izvještaj"
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index cb71335bbef..1c11be3bb17 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 15:31+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index f9cd814e4ad..98aecb1e7f2 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 15:18+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/crm_profiling/i18n/sr.po b/addons/crm_profiling/i18n/sr.po
new file mode 100644
index 00000000000..a9e8c5a0a5d
--- /dev/null
+++ b/addons/crm_profiling/i18n/sr.po
@@ -0,0 +1,173 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 11:26+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_profiling
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+msgid "Question"
+msgstr "Pitanje"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,open:0
+msgid "Open Questionnaire"
+msgstr "Otvori Upitnik"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Pod Profili"
+
+#. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "crm_profiling management"
+msgstr "crm_profiling upravljanje"
+
+#. module: crm_profiling
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+msgid "Answer"
+msgstr "Odgovor"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Profiliranje"
+
+#. module: crm_profiling
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Isklju�eni Odgovori"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Odgovori"
+
+#. module: crm_profiling
+#: wizard_field:open_questionnaire,init,questionnaire_name:0
+msgid "Questionnaire name"
+msgstr "Ime Upitnka"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Koristi Upitnka"
+
+#. module: crm_profiling
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+msgid "Questionnaires"
+msgstr "Upitnici"
+
+#. module: crm_profiling
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+msgid "Questionnaire"
+msgstr "Upitnik"
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "Greška ! Ne možete kreirati rekurzivne profile."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Koristi Pravila Profiliranja"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible answers"
+msgstr "Raspoloživi odgovori"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Uklju�eni Odgovori"
+
+#. module: crm_profiling
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check this box if you want to use this tab as part of the segmentation rule. "
+"If not checked, the criteria beneath will be ignored"
+msgstr ""
+"Ozna�ite ovde ako želite koristiti ovu karticu (Tab) kao deo pravila "
+"segmentacije. Ako ne ozna�ite, kriterijum koji sledi će biti ignorisan."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "Pitanja"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Roditeljski Profil"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,end:0
+#: wizard_button:open_questionnaire,open,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentacije Partnera"
+
+#. module: crm_profiling
+#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
+msgid "Using a questionnaire"
+msgstr "Korištenje Upitnika"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,open,compute:0
+msgid "Save Data"
+msgstr "Sacuvaj Podatke"
diff --git a/addons/decimal_precision/i18n/ru.po b/addons/decimal_precision/i18n/ru.po
index 3088918479a..9540d916491 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-09-30 06:57+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-10-15 12:07+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -85,4 +85,4 @@ msgstr "�а�тройка точно�ти"
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "Точно�ть де��тичных знаков"
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index dd7cb8d23a2..dafebaa043b 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:53+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-10-15 12:51+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -37,7 +37,7 @@ msgstr "Продажи и закупки"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Destination"
-msgstr "�азначение"
+msgstr "Ме�то назначени�"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -68,6 +68,8 @@ msgstr "�едопу�тимое им� модели в определении 
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
 msgstr ""
+"Этот метод до�тавки должен и�пользовать�� при фактурировании на о�новании "
+"данных упаковки."
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -77,17 +79,17 @@ msgstr "Ра�ценки на до�тавку"
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr ""
+msgstr "Почтовый индек� отправител�"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Фик�ированный"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr ""
+msgstr "Раздел�ема� �трока"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -104,7 +106,7 @@ msgstr "Генерировать черновики �четов при полу
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery line of grid"
-msgstr ""
+msgstr "Раздел�ема� �трока по�тавки"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -114,12 +116,12 @@ msgstr "До�тавка"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "Раздел�емые �троки"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "Ра�ценка"
+msgstr "Разделение"
 
 #. module: delivery
 #: view:res.partner:0
@@ -135,7 +137,7 @@ msgstr "�ктивен"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr ""
+msgstr "Определение разделени�"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -156,12 +158,12 @@ msgstr "У�луга или изделие, �оответ�твующее до
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Condition"
-msgstr ""
+msgstr "У�ловие"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_carrier
 msgid "Carrier and delivery grids"
-msgstr ""
+msgstr "Разделение по�тавки и перевозчика"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -190,6 +192,7 @@ msgstr "Страны"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ошибка. ЕИМ по умолчанию и закупочна� ЕИМ должны иметь одинаковую категорию."
 
 #. module: delivery
 #: view:sale.order:0
@@ -199,18 +202,18 @@ msgstr "Примечани�"
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
-msgstr ""
+msgstr "Переменный фактор"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 #: field:delivery.grid.line,type:0
 msgid "Variable"
-msgstr ""
+msgstr "Переменна�"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr ""
+msgstr "Им� разделени�"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -235,7 +238,7 @@ msgstr "Мак�имальное значение"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
 msgid "Add Delivery Costs"
-msgstr ""
+msgstr "Добавить �тоимо�ть до�тавки"
 
 #. module: delivery
 #: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -248,7 +251,7 @@ msgstr "Метод до�тавки"
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr ""
+msgstr "Идентификатор"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -258,12 +261,12 @@ msgstr "Оператор"
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr ""
+msgstr "Перевозчики и по�тавки"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr ""
+msgstr "Разделение по�тавки"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -289,28 +292,33 @@ msgid ""
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
 msgstr ""
+"Позвол�ет добавить методы до�тавки в заказы на продажу и упаковку. Вы можете "
+"определить �воего �об�твенного перевозчика и выполнить разделение по�тавка "
+"дл� определени� �тоимо�ти. При �оздании �чета-фактуры на о�новании упаковки, "
+"Open ERP имеет возможно�ть добавл�ть и вычи�лить �троки до�тавки."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr ""
+msgstr "Почтовый индек� получател�"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr ""
+msgstr "Фактурирование по упаковке"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
 msgstr ""
+"Заполните �то поле, е�ли вы планируете �чет до�тавки о�нованный на упаковке."
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Стоимо�ть по�тавки"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index 7c60150a88a..86c33eac8ec 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 17:38+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
new file mode 100644
index 00000000000..dc07a3a7172
--- /dev/null
+++ b/addons/email_template/i18n/sr.po
@@ -0,0 +1,1293 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 05:34+0000\n"
+"PO-Revision-Date: 2010-10-15 14:52+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Carobnjak Slanja Emaila"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Konfiguracija Email-a"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr "Emailovi sa vise stavki sacuvanih u outbox-u"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Data"
+msgstr "Podaci Email-a"
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Prima (za)"
+
+#. module: email_template
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Carobnjak je Zavrsio"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Cisti Tekst & HTML bez attachemnta"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"Email naloga %s nije uspeo da se uloguje. MOguci Razlozi: Ne mogu se "
+"konektovati ba server\n"
+"Greska: %s"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Sadrzaj"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "Brisanje zapisa nije uspleo"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+"Selektuj ako ovaj nalog ne pripada specificiranom korisniku ali je deo neke "
+"organizacije npr:info@companydomain.com"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Posalji sada"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "Ne moze se dodati"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Email Nalozi"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Posalji SVE Emailove"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Referenca Servera Email-a"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "My Accounts"
+msgstr "Moji Nalozi"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Pošalji poštu"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Odobreno"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "HTML zapis"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+msgstr ""
+"Ime fajla moze biti napisano i sa razmaknicama( donja crta) npr "
+"2009_SO003.pdf"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Email nalog"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "Slanje Emaila je neuspesno zbog jednog ili vise objekata"
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Predlozeni jezik Email-a. Razmaknice(donja crta) se mogu ovde koristiti. Npr "
+"${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number,eg:SMTP-587 "
+msgstr "Upisi broj Port-a npr SMTP-587 "
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Odgovor - Za"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Obriši radnju"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Dozvoli Nalog"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+msgid "E-MAIL Templates"
+msgstr "E-MAIL Obrasci"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Referentni Dokumenat"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "Uspesno kompletirano"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Oba HTML & Tekst ( Miksovano)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "U redu"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Oba HTML & Tekst ( Aternativno)"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Mako templates not installed"
+msgstr "Mako Obrazac nije instaliran"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Br. trazenih Poruka"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Download Full Mail"
+msgstr "Download Celu poruku"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid "The default recipient of email.Placeholders can be used here."
+msgstr ""
+"Predlozeni primalac Email-a. Razmaknice se mogu koristiti ( donja crta)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Mailboxes"
+msgstr "Postanski Sanducici"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Prika�eni fajlovi"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (samo u python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Od Email-a"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Warning"
+msgstr "Upozorenje"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Nalozi"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Track campaign items"
+msgstr "Prati stavke Kampanje"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Sadrzaj ( text)"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+"TIP: Visestruki emailovi su poslati na istom jeziku( prvi koji je "
+"predlozen). Savetujemo vam da saljete E mailove u grupama po odgovarajucim "
+"jezicima."
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Tema"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: yourname@yourdomain.com "
+msgstr "npr: yourname@yourdomain.com "
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Å ablon"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Standarni Sadrzaj ( text)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Слање"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Ubaci Prosto polje"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Telo ( HTML )"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Slanje/Prijem"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Pregled Å ablona"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Sadrzaj ( Samo TEKST-WEB Klijent)"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Dugme �arobnjaka"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Out going connection test failed"
+msgstr "Test izlazne konekcije nije uspeo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr "Mail od naloga %s je uspesno poslat"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Standardan sadrzaj"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr "Mako Sabloni"
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Tekstualna verzija poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (Email Attachment)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Poslate Stavke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+"Slanje poruke %s nije uspelo. Verovatan uzrok: Ne mogu se logovati na "
+"server\n"
+"Greska: %s"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Test Izlazne Konekcije"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Postansko Sandu�e"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Mozete pridodati postojeci fajl ovom sablonu, tako da ce on biti dodat u "
+"svim poruka,a kreiranih iz ovog sablona"
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Korisnicki nalog"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Dodaj moj potpis poruci"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Izveštaj"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Selektuj polje modela koje zelis da koristis\n"
+"Ako je to vezno polje,. bicete u mogucnosti da izaberete podveze u polju "
+"ispod\n"
+"( Napomena: Ako nema nikakvog izbora budite sigurni da ste izabrali ispravan "
+"model)"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Napredno"
+
+#. module: email_template
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni Argumenti"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr "Gradilac Ekstenizja"
+
+#. module: email_template
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "HTML Sadrzaj"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Suspendovan nalog"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Ova se vrednost koristi ako je polje prazno"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Pregled Sablona"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Server"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+"Iskopiraj i zalepi vrednost na lokaciju koju zelis da se koristi kao "
+"sistemsku vrednost"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+"Kada izaberete vezu polja, ovo polje ce specificirati sub vrednost koju "
+"mozete koristiti"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Kada se koristi vezno polje, ovo polje ce vam pokazati tip polja koje ste "
+"izabrali"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Jezik"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Sadrzaj Texta (Raw HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Potpis"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Sub-model"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Telo teksta (Plain Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Telo teksta (Text)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Datum Slanja/Prijema"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Izvestaj za slanje"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "podaci o serveru"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "Br. Generisanih poruka"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Detalji poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "SMTP SERVER ili PORT nije specificiran"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "Napomena: Ovo je Raw HTML."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr "Visestruki Carobnjak Meilova Korak 1"
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Vezni Korisnik"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr "Telo poruke (Rich Text Clients Only)"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Da"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr "Radnja prozora"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
+msgstr ""
+"Preuzimanje datuma i vremena nije uspelo. Datum:Date:%s \\n \tGreska:%s"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "SMTP Server"
+msgstr "SMTP server"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr "HTML, a drugacije Text"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "U pripremi"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "Ne"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr "Sadrzaj Poste"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "The template name must be unique !"
+msgstr "Ime Sablona mora biti jedinstveno"
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "BCC"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Samo tekst"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: email_template
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr "Interni Naziv Modula"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "Sifra Poruke"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr "Prihvatljivo samo za unutrasnje stavke"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+"Nakon klika na 'posalji sve poruke', poruke ce biti poslate u outbox i "
+"ociscene  u sledecem koraku Posalji/Primi"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Odlazno"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Inicirano"
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr "Potpis iz detalja korisnika ce biti pridodat poruci"
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "Od Naloga"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr "Izmesani sadrzaj"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr "Zahtev za Re-Aktivacijom"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+msgid "Email Templates"
+msgstr "Sabloni Poruka"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "Korisni�ko ime"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Pod Polje"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Samo korisnicima iz ovih grupa ce biti dozvoljeno da salju poruke iz ovog "
+"Sablona"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "OutBox"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Sacuvaj u Pripremi"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The default subject of email. Placeholders can be used here."
+msgstr ""
+"Podrazumevana Tema poruke. Razmaknice se mogu ovde koristiti ( donja crta)"
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"e-mail."
+msgstr ""
+"Ubaci ovde sve attachmente za dati dokument koji zelis da prikljucis poruci"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Craobnjak Slanja Poste"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#, python-format
+msgid "Email Template"
+msgstr "Sablon Poruka"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr "Licne Poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Error sending mail: %s\" % str(e)))\n"
+"        \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"        if ids is None:\n"
+"            ids = []\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        filters = [('folder', '=', 'outbox"
+msgstr ""
+"Greska slanja poruke: %s\" % str(e)))\n"
+"         \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"if ids is None:\n"
+"ids = []\n"
+"if context is None:\n"
+"context = {}\n"
+"filters = [('folder', '=', 'outbox"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "File Name Pattern"
+msgstr "Ime fajla paterna"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Slanje POruke (%s)"
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr "Ime Fajla Izvestaja"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr "Izraz"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Django templates not installed"
+msgstr "Django Sabloni nisu instalirani"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Prilozi"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "Za"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port "
+msgstr "SMTP Port "
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr "Text, inace HTML"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Copy of template "
+msgstr "Kopija Sablona "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr "Izbrisi poruku"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr "Sabloni Poruka za Modele"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Zatvori"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr "Sadrzaj (HTML-Web Client Only)"
+
+#. module: email_template
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr "Copy text   \t %s (Email Attachment)"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Ni jedan locni nalog nije kreiran za vas. \n"
+"Ili pitajte administratora ili napravite sami sebi licni postanski nalog."
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr "Dozvoljene Korisnicke Grupe"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Polje"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Podaci o korisniku"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Су�пендован"
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Fascikla"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr "Smeće"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Postansko Sanduce"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Specificiraj korisnicko ime ako tvoj SMTP zahteva autorizaciju, inace ostavi "
+"prazno."
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Missing mail account"
+msgstr "Nedostaje Email nalog"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr "SMTP test je prosao uspesno"
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr "Sablon poruka za OpenERP"
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr "Kreiraj akciju"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr "Poruka sa naloga %s nije uspela. Moguci razlog: Nalog nije omogucen"
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr "Null вредно�т"
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr "Jezik Sablona"
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr "Poslato"
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+"Vrednost Sifre poruke, ako trebas da je specificiras. Na primer da bi je "
+"automatski prepoznao kasnije."
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+msgid "Emails"
+msgstr "Email-ovi"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Å abloni"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Naziv izveštaja"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "Pregled Sablona Poruke"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Pregled Poruke"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr "Postojeci fajlovi"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Personal Accounts"
+msgstr "Licni Nalozi"
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+"\n"
+"    Sablon Poruke je izvucen iz Power Email, samo da bi poslao poruke.\n"
+"    "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr "Sadrzaj (HTML)"
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+"Iskopiraj ovaj HTML kod u telo svoje HTML poruke da bi se prikazala "
+"informacija u vasoj poruci"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr "email_template.account"
+
+#. module: email_template
+#: field:email.template,object_name:0
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr "Model"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr "Osnovna Konekcija za datu Sifru NE postoji"
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr "Saradjivanje"
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg:smtp.gmail.com "
+msgstr "Upisi ime izlaznog servera, npr: smtp.gmail.com "
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
+msgid "Company Mails"
+msgstr "Poruke Preduzeca"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Adrese"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr "Poruke ce biti poslate sa ovog omogucenog naloga"
+
+#. module: email_template
+#: field:email.template,def_subject:0
+msgid "Default Subject"
+msgstr "Predefinisana tema"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here."
+msgstr ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here."
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"Poruka sa Naloga %s nije prosla. MOguci Razlog: MIME GRESKA\n"
+"Opis: %s"
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr "Format Poruke"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Nalozi Preduzeca"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "email-template"
+msgstr "sablon-poruke"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+msgstr ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr "Jednostavni Carobnjak POruka Korak 1"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr "Ima Attachment"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this if you want the outgoing e-mails to include a tracking marker "
+"that makes it possible to identify the replies an link them back to the "
+"campaign item"
+msgstr ""
+"Omogucava vam , ako zelite da vase izlazne poruke sadrze markera pratnje "
+"koji vam daju mogucnost da kasnije identifikujete odgovore i posaljewte ih "
+"npr stavci Kampanje."
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "No Description"
+msgstr "Bez Opisa"
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
new file mode 100644
index 00000000000..b8b98c309e4
--- /dev/null
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -0,0 +1,279 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-10-15 13:06+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr "Информаци�"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"�азвание объекта должно начинать�� � x_  и не должно �одержать �пециальных "
+"�имволов !"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr "Ра�пи�ание �ледующей оценки"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr "Плохие моменты"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr "Мо� �ледуюша� оценка"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr "Значени�"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr "Хорошие моменты"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "Стату�"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "Оценка"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr "�еофициальные данные"
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "�едопу�тимое им� модели в определении дей�тви�."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr "Сотрудник"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr "Улучшить"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Оценка"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr "Тип оценки"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "Стату�"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr "Применить категории"
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr "Возможно�ть �оздани� оценки �отрудников."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr "Цитата"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr "Гибко�ть роли"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr "Оценка пользовател�"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr "Результаты выбора"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr "Оценки"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "Конфигураци�"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr "По�ледующие оценки"
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "�еправильный XML дл� про�мотра архитектуры!"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr "Критерии оценки"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr "Мои предыдущие оценки"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index eb080bbdf16..6a197c5f042 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 15:05+0000\n"
-"Last-Translator: Ivan Y <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index ac409da6df1..362ffedb2c2 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 20:48+0000\n"
-"Last-Translator: robert <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
new file mode 100644
index 00000000000..fa858dff025
--- /dev/null
+++ b/addons/mrp_operations/i18n/sr.po
@@ -0,0 +1,443 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 10:57+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_startoperation0
+msgid "Start Operation"
+msgstr "Zapo�ni postupak"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Pause"
+msgstr "Pauza"
+
+#. module: mrp_operations
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_startoperation0
+msgid "Operation is started"
+msgstr "Postupak je pokrenut"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Information"
+msgstr "Informacija"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
+msgid "Start Cancel Operation"
+msgstr "Pokreni ponistenje Operacije"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "In Production"
+msgstr "U produkciji"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
+msgid "Operations Code"
+msgstr "Sifre Operacija"
+
+#. module: mrp_operations
+#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
+msgid "Mrp Operation Process"
+msgstr "Mrp Procesni Postupak"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.production.workcenter.line,state:0
+#: field:mrp_operations.operation.code,start_stop:0
+msgid "Status"
+msgstr "Status"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
+msgid "Start Done Operation"
+msgstr "Pokreni Zavrsetak Postupka"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Start"
+msgstr "Pokreni"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,production_id:0
+msgid "Production"
+msgstr "Proizvodnja"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Calendar View"
+msgstr "Kalendarski pogled"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_workorder0
+msgid "Work Center"
+msgstr "Radionica"
+
+#. module: mrp_operations
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action
+msgid "Work Order Events Using Bar Codes"
+msgstr "Radni Nalozi Koriscenjem Bar-Koda"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Set Draft"
+msgstr "Postavi u Pripremu"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
+#: view:mrp.production.workcenter.line:0
+msgid "Work Orders"
+msgstr "Radni Nalozi"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
+msgid "Start - Stop Codes"
+msgstr "Pokreni - Zaustavi Sifre"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,uom:0
+msgid "UOM"
+msgstr "JM"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation.code:0
+msgid "Production Operation Code"
+msgstr "Operaciona Sifra Proizvodnje"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Planirani datum"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_productionstart0
+msgid "From production order, create the workorder"
+msgstr "Iz Naloga proizvodnje kreiraj Radni Nalog"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Hours by Workcenter"
+msgstr "Radionicki Sati"
+
+#. module: mrp_operations
+#: help:mrp.production,allow_reorder:0
+msgid ""
+"Check this to be able to move independently all production orders, without "
+"moving dependent ones."
+msgstr ""
+"Cekiraj ovde da bi bio u mogucnosti da nezavisno premestas sve proizvodne "
+"naloge, bez pomeranja onih zavisnih."
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action
+msgid "All Work Orders"
+msgstr "Svi Radni Nalozi"
+
+#. module: mrp_operations
+#: rml:mrp.code.barcode:0
+msgid "("
+msgstr "("
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Product to Produce"
+msgstr "Proizvod za Proizvodnju"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
+msgid "Workcenters Barcode"
+msgstr "Radionicki Bar-Kod"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_doneoperation0
+#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
+msgid "Operation is done"
+msgstr "Postupak je zavrsen"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Planned Date"
+msgstr "Planirani datum"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Ready to Produce"
+msgstr "Spreman za Proizvodnju"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Finished"
+msgstr "Završeno"
+
+#. module: mrp_operations
+#: field:mrp.production,allow_reorder:0
+msgid "Free Serialisation"
+msgstr "Slobodna Serializacija"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action_planning
+msgid "Work Orders Planning"
+msgstr "Planiranje Radnih Naloga"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_productionorder0
+msgid "Production Order"
+msgstr "Proizvodni Nalog"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_productionorder0
+msgid "Production order for any products"
+msgstr "Proizvodni nalog za bilo koji proizvod"
+
+#. module: mrp_operations
+#: field:stock.move,move_dest_id_lines:0
+msgid "Children Moves"
+msgstr "Pomeranje Podgurpa"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,name:0
+msgid "Operation Name"
+msgstr "Ime Postupka"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
+msgid "mrp_operations.operation"
+msgstr "mrp_operacije.operacija"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_finished:0
+#: field:mrp.production.workcenter.line,date_planned_end:0
+#: field:mrp_operations.operation,date_finished:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: mrp_operations
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Real"
+msgstr "Реални"
+
+#. module: mrp_operations
+#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
+msgid "Workcenter Production start end workflow"
+msgstr "Radionicka Proizvodnja pocetak i kraj posla"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,delay:0
+msgid "This is delay between operation start and stop in this workcenter"
+msgstr "Ovo je razlika izmedju pocetka i kraja posla ove Radionice"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,product:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
+msgid "From work order, define the cycles and hour for creating product"
+msgstr ""
+"Iz Radnog Naloga, definisi cikluse i sate potrebne za zavrsetak proizvoda"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,delay:0
+msgid "Working Hours"
+msgstr "Radni Sati"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action
+msgid "Future Work Orders"
+msgstr "Buduci Radni Nalozi"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,production_state:0
+msgid "Prod.State"
+msgstr "Stanje Proizvoda"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,order_date:0
+msgid "Order Date"
+msgstr "Datum Naloga"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_workorder0
+msgid "Production Work Center"
+msgstr "Proizvodna Radionica"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_productionstart0
+msgid "Production start Operation"
+msgstr "Pocetak Operacije Proizvodnje"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Packing Exception"
+msgstr "Izuzetak Pakovanja"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,workcenter_id:0
+msgid "Workcenter"
+msgstr "Radionica"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_start:0
+#: field:mrp.production.workcenter.line,date_start_date:0
+#: field:mrp_operations.operation,date_start:0
+msgid "Start Date"
+msgstr "Po�etni datum"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
+msgid "mrp_operations.operation.code"
+msgstr "mrp_operacije.postupak.sifra"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
+#: view:mrp.production.workcenter.line:0
+msgid "Operations"
+msgstr "Radnje"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,code_id:0
+#: field:mrp_operations.operation.code,code:0
+msgid "Code"
+msgstr "Å ifra"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
+msgid "Confirmed Work Orders"
+msgstr "Potvrdi Radne naloge"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action
+msgid "Work Orders to Do"
+msgstr "Radni Nalozi na cekanju"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_canceloperation0
+msgid "Cancel Operation"
+msgstr "Otkazi Operaciju"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
+msgid "Work start Operation"
+msgstr "Pocetak Rada Operacije"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
+msgid "Start/Stop Barcode"
+msgstr "pokreni/Zaustavi Bar-Kod"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Resume"
+msgstr "Nastavi"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_doneoperation0
+msgid "Done Operation"
+msgstr "Zavrsena Operacija"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,qty:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: mrp_operations
+#: rml:mrp.code.barcode:0
+msgid ")"
+msgstr ")"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Production Operation"
+msgstr "Operacije Proizvoda"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Waiting Goods"
+msgstr "Cekamo Dobra"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Duration"
+msgstr "Trajanje"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_canceloperation0
+#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
+msgid "Operation is cancelled"
+msgstr "Operacija je otkazana"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Canceled"
+msgstr "Отказано"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Start working"
+msgstr "Pocetak Posla"
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
new file mode 100644
index 00000000000..7986e0b074f
--- /dev/null
+++ b/addons/mrp_repair/i18n/sr.po
@@ -0,0 +1,685 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 10:31+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees Line"
+msgstr "Dodatne Linije"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,repair_id:0
+#: field:mrp.repair.line,repair_id:0
+msgid "Repair Order Ref"
+msgstr "Ref.Nalog za Popravku"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,move_id:0
+msgid "Inventory Move"
+msgstr "Premesti Inventar"
+
+#. module: mrp_repair
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Untaxed amount"
+msgstr "Iznos bez Poreza"
+
+#. module: mrp_repair
+#: field:mrp.repair,state:0
+msgid "Repair State"
+msgstr "Stanje Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Printing Date"
+msgstr "Datum Å¡tampe"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom_qty:0
+#: rml:repair.order:0
+msgid "Quantity"
+msgstr "Koli�ina"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Set to Draft"
+msgstr "Postavi u pripremu"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Invoice Exception"
+msgstr "Izuzetak u izdavanju Ra�una"
+
+#. module: mrp_repair
+#: field:mrp.repair,address_id:0
+msgid "Delivery Address"
+msgstr "Adresa Dostave"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Make Invoice"
+msgstr "Kreiraj ra�un"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_subtotal:0
+#: field:mrp.repair.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Invoice address :"
+msgstr "Adresa ra�una:"
+
+#. module: mrp_repair
+#: field:mrp.repair,guarantee_limit:0
+msgid "Guarantee limit"
+msgstr "Garancija"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_tax:0
+#: field:mrp.repair.fee,tax_id:0
+#: field:mrp.repair.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Net Total :"
+msgstr "Ukupno neto"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "VAT"
+msgstr "PDV"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Operations"
+msgstr "Radnje"
+
+#. module: mrp_repair
+#: field:mrp.repair,move_id:0
+msgid "Move"
+msgstr "Pomeri"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+msgid "Repair Orders"
+msgstr "Nalozi Popravke"
+
+#. module: mrp_repair
+#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
+msgid "Quotation / Order"
+msgstr "Ponude / Nalozi"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Extra Info"
+msgstr "Dodatne Informacije"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
+msgid "Repairs in quotation"
+msgstr "Popravke u Najavi"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Osvežavanje ra�una"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repairs order"
+msgstr "Nalozi Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Repair Order N° :"
+msgstr "Nalog Br :"
+
+#. module: mrp_repair
+#: field:mrp.repair,prodlot_id:0
+#: rml:repair.order:0
+msgid "Lot Number"
+msgstr "Serijski Broj"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "Popravka u Toku"
+
+#. module: mrp_repair
+#: field:mrp.repair,fees_lines:0
+msgid "Fees Lines"
+msgstr "Dodatne Linije"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
+msgid "Repair Fees line"
+msgstr "Dodatne Linije Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Fees Line(s)"
+msgstr "Dodana linija(e)"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "To be Invoiced"
+msgstr "Da bude Fakturisano"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke:"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Start Repair"
+msgstr "Start Popravke"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Koli�ina (UoM)"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,to_invoice:0
+#: field:mrp.repair.line,to_invoice:0
+msgid "To Invoice"
+msgstr "Fakturisati"
+
+#. module: mrp_repair
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
+msgid "Repairs"
+msgstr "Popravke"
+
+#. module: mrp_repair
+#: field:mrp.repair,picking_id:0
+msgid "Packing"
+msgstr "Pakovanje"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Total :"
+msgstr "Ukupno:"
+
+#. module: mrp_repair
+#: field:mrp.repair,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenovnik"
+
+#. module: mrp_repair
+#: help:mrp.repair,state:0
+msgid "Gives the state of the Repair Order"
+msgstr "Dato Stanje Naloga Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,quotation_notes:0
+msgid "Quotation Notes"
+msgstr "Kotacija napomene"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_progress_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_progress
+msgid "Repairs in progress"
+msgstr "Popravka u Toku"
+
+#. module: mrp_repair
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: mrp_repair
+#: help:mrp.repair,guarantee_limit:0
+msgid ""
+"The garantee limit is computed as: last move date + warranty defined on "
+"selected product. If the current date is below the garantee limit, each "
+"operation and fee you will add will be set as 'not to invoiced' by default. "
+"Note that you can change manually afterwards."
+msgstr ""
+"Garancija je izracunata kao: Datum odlaska + garancija definisana za dati "
+"proizvod. Ako je dati datum manji od garanciskog limita, svaka radnja i "
+"dopune bice poostavljene kao \"za ne fakturisati' kao osnovna postavka. "
+"Trebate znati da ovo mozete kasnije rucno promeniri."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repair Line"
+msgstr "Linija Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "N° :"
+msgstr "Br.:"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_method:0
+msgid "Invoice Method"
+msgstr "Metod Fakturisanja"
+
+#. module: mrp_repair
+#: field:mrp.repair,repaired:0
+msgid "Repaired"
+msgstr "Popravljeno"
+
+#. module: mrp_repair
+#: wizard_field:mrp.repair.make_invoice,init,group:0
+msgid "Group by partner invoice address"
+msgstr "Grupisano po adresama faktura partnera"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,invoice_line_id:0
+#: field:mrp.repair.line,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Red ra�una"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Total amount"
+msgstr "Ukupan iznos"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Canceled"
+msgstr "Отказано"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "Before Repair"
+msgstr "Pre POpravke"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_id:0
+msgid "Current Location"
+msgstr "Trenutna Lokacija"
+
+#. module: mrp_repair
+#: wizard_button:mrp.repair.cancel,display,yes:0
+msgid "Yes"
+msgstr "Da"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoiced:0
+#: field:mrp.repair.fee,invoiced:0
+#: field:mrp.repair.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturisano"
+
+#. module: mrp_repair
+#: wizard_button:mrp.repair.cancel,display,end:0
+msgid "No"
+msgstr "Ne"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.make_invoice,init:0
+#: wizard_button:mrp.repair.make_invoice,init,invoice:0
+msgid "Create invoices"
+msgstr "Kreiranje ra�una"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+#: rml:repair.order:0
+msgid "Add"
+msgstr "Dodaj"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_form
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_form
+msgid "New Repair"
+msgstr "Nova Popravka"
+
+#. module: mrp_repair
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Iznos bez poreza"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Guarantee Limit"
+msgstr "Garancija traje do"
+
+#. module: mrp_repair
+#: field:mrp.repair,product_id:0
+#: rml:repair.order:0
+msgid "Product to Repair"
+msgstr "Proizvod za Popravku"
+
+#. module: mrp_repair
+#: help:mrp.repair,pricelist_id:0
+msgid "The pricelist comes from the selected partner, by default."
+msgstr "Cenovnik stize od selektovanog partnera, po postavci"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.cancel,display:0
+msgid ""
+"This operation  will  cancel the  Repair process, but  will not cancel it's "
+"Invoice. Do you want to continue?"
+msgstr ""
+"Ova operacija ce otkazati proces popravke, ali nece ponistiti i fakturu "
+"iste. Zelis li da nastavim"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Najava"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Compute"
+msgstr "Izracunaj"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Potvrdi Popravku"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Repair Quotation"
+msgstr "Pretpostavka Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "End Repair"
+msgstr "Kraj Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "History"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair
+msgid "Repairs Order"
+msgstr "Nalog Popravki"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_ready_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_ready
+msgid "Repairs Ready to Start"
+msgstr "Popravke spremne za start"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_2binvoiced_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_2binvoiced
+msgid "Repairs to be invoiced"
+msgstr "Popravke za fakturisanje"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_id:0
+msgid "Invoice"
+msgstr "Ra�un"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees"
+msgstr "Porezi"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: wizard_button:mrp.repair.make_invoice,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Odredišna lokacija"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Operation Line(s)"
+msgstr "Linija(e) Operacije"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_line
+msgid "Repair Operations Lines"
+msgstr "Operacione Linije Popravke"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_dest_id:0
+msgid "Delivery Location"
+msgstr "Lokacija Ispostave"
+
+#. module: mrp_repair
+#: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
+msgid "Products Repairs Module"
+msgstr "Modul Popravki Proizvoda"
+
+#. module: mrp_repair
+#: help:mrp.repair,invoice_method:0
+msgid ""
+"This field allow you to change the workflow of the repair order. If value "
+"selected is different from 'No Invoice', it also allow you to select the "
+"pricelist and invoicing address."
+msgstr ""
+"Ovo ti polje omogucava da promenis radni prozor u nalogu popravki. Ako je "
+"selektovana vrednost drugacija od onog gde pise ( nema Faktura), on ti "
+"takodje omogucava da selektujes cenovnik i adresu afkturisanja."
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_unit:0
+#: field:mrp.repair.line,price_unit:0
+#: rml:repair.order:0
+msgid "Unit Price"
+msgstr "Jedini�na cijena"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.make_invoice,init:0
+msgid "Do you really want to create the invoices ?"
+msgstr "Da li zaista želite da kreirate ra�un?"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,name:0
+#: field:mrp.repair.line,name:0
+#: rml:repair.order:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mrp_repair
+#: field:mrp.repair,operations:0
+msgid "Operation Lines"
+msgstr "Operacione Linije"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_id:0
+#: field:mrp.repair.line,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoice Corrected"
+msgstr "Ispravljen ra�un"
+
+#. module: mrp_repair
+#: help:mrp.repair,deliver_bool:0
+msgid ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a packing with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
+msgstr ""
+"Cekiraj ovu kucicu ako zelis da upravljas sa isporukama, onda kada je "
+"proizvod popravljen. ako je cekirano, kreirace pakovanje za selektovani "
+"proizvod. Treba napomenuti da mozes selektovati lokaciju u Info tabu, ako si "
+"omogucio prosireni prozor,"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: mrp_repair
+#: field:mrp.repair,deliver_bool:0
+msgid "Deliver"
+msgstr "Isporuka"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,internal_notes:0
+msgid "Internal Notes"
+msgstr "Interne Napomene"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Taxes:"
+msgstr "Porezi:"
+
+#. module: mrp_repair
+#: model:ir.actions.wizard,name:mrp_repair.wizard_mrp_repair_make_invoice
+msgid "Make invoices"
+msgstr "Kreiranje ra�una"
+
+#. module: mrp_repair
+#: field:mrp.repair,name:0
+msgid "Repair Ref"
+msgstr "Ref Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+#: rml:repair.order:0
+msgid "Remove"
+msgstr "Уклони"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.cancel,display:0
+msgid "Cancel Repair...??"
+msgstr "Otkazujes Popravku ??"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom:0
+#: field:mrp.repair.line,product_uom:0
+msgid "Product UoM"
+msgstr "JM Proizvoda"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_invoice_id:0
+msgid "Invoicing Address"
+msgstr "Adresa Fakturisanja"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "After Repair"
+msgstr "Nakon Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoicing"
+msgstr "Fakturisanje"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_id:0
+msgid "Source Location"
+msgstr "Lokacija izvora"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. module: mrp_repair
+#: model:ir.actions.wizard,name:mrp_repair.action_cancel_repair
+#: view:mrp.repair:0
+msgid "Cancel Repair"
+msgstr "Otkazi Popravku"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "No Invoice"
+msgstr "Ne Fakturisi"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "States"
+msgstr "Stanja"
+
+#. module: mrp_repair
+#: help:mrp.repair,partner_id:0
+msgid ""
+"This field allow you to choose the parner that will be invoiced and delivered"
+msgstr ""
+"Ovo polje ti omogucava da izaberes partnera kojem ce biti isporuceno i "
+"fakturisano"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_total:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Ready to Repair"
+msgstr "Spremno za Popravku"
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_subproduct/i18n/sr.po
new file mode 100644
index 00000000000..57cb0e7ab91
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/sr.po
@@ -0,0 +1,90 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 10:26+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_subproduct
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: mrp_subproduct
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "pod proizvodi"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Mrp Sub Product"
+msgstr "Mrp Pod Proizvod"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tip Kolicine"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Kol, Proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "JM proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Pod proizvodi"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: mrp_subproduct
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+msgid "MRP Sub Product"
+msgstr "MRP Pod Proizvod"
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 06121a92100..4efa16dc46b 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 16:21+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 07:35+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 4adb94895c5..a27778e2c95 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 17:10+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 2a17ab4b5a7..291a5383976 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:17+0000\n"
-"Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
+"PO-Revision-Date: 2010-10-15 11:15+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr ""
+msgstr "Maks. marža"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -121,7 +121,7 @@ msgstr "Obezbeđene metode"
 #. module: product
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
@@ -197,7 +197,7 @@ msgstr "Zalihe proizvoda"
 #. module: product
 #: model:product.category,name:product.product_category_services
 msgid "Services"
-msgstr "Servisi"
+msgstr "Usluge"
 
 #. module: product
 #: help:product.template,list_price:0
@@ -230,12 +230,12 @@ msgstr "Datum od kada je ova verzija cenovnika validna."
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr "Dolazno"
+msgstr "Ulazna"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr "Pravljenje zaliha"
+msgstr "Prebaci na zalihu"
 
 #. module: product
 #: view:product.product:0
@@ -246,7 +246,7 @@ msgstr "Težina"
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr ""
+msgstr "Tihi ventilator"
 
 #. module: product
 #: help:product.template,supply_method:0
@@ -276,7 +276,7 @@ msgstr "Prodajni cenovnik"
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "Ako je drugi cjenik"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -294,7 +294,7 @@ msgid ""
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
 msgstr ""
-"Postavite cenu tako da je ona višestruka ova vrednost.\n"
+"Postavlja cenu tako da je ona višestruka vrednost ove vrednosti.\n"
 "Zaokruženje se primenjuje nakon popusta a pre poskupljenja.\n"
 "Ako hoćete da Vam se cena završava sa 9.99, postavite zaokruženje 10, "
 "dodatak -0.01"
@@ -307,7 +307,7 @@ msgstr "Nova cena ="
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Virtual Stock"
-msgstr "Stvarne zalihe"
+msgstr "Efektivna zaliha"
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -355,7 +355,7 @@ msgstr "Naziv pravila"
 #. module: product
 #: model:ir.ui.menu,name:product.menu_config_product
 msgid "Configuration"
-msgstr "Konfiguracija"
+msgstr "Podešavanje"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -401,7 +401,7 @@ msgstr "Tastatura"
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Partner"
 
 #. module: product
 #: field:product.template,sale_delay:0
@@ -452,7 +452,7 @@ msgstr "Eksplicitno ime pravila za ovu stavku cenovnika."
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr ""
+msgstr "Min. marža"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -467,7 +467,7 @@ msgstr "Procesor AMD Athlon XP 1800+"
 #. module: product
 #: selection:product.template,state:0
 msgid "In Production"
-msgstr "U produkciji"
+msgstr "U proizvodnji"
 
 #. module: product
 #: field:product.category,child_id:0
@@ -536,7 +536,7 @@ msgstr "Cenovnici"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Partner Product Name"
-msgstr "Naziv proizvoda partnera"
+msgstr "Partnerov naziv proizvoda"
 
 #. module: product
 #: view:product.product:0
diff --git a/addons/product_expiry/i18n/sr.po b/addons/product_expiry/i18n/sr.po
index 45aff2de715..0e23a25ed56 100644
--- a/addons/product_expiry/i18n/sr.po
+++ b/addons/product_expiry/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-10-14 16:33+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 634d811682c..b8c7ddbf7b7 100644
--- a/addons/product_manufacturer/i18n/mn.po
+++ b/addons/product_manufacturer/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-12 12:35+0000\n"
-"PO-Revision-Date: 2010-08-13 08:22+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-15 10:00+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -27,7 +27,7 @@ msgstr ""
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer Product Code"
-msgstr ""
+msgstr "Бараа үйлдв�рл�гчийн код"
 
 #. module: product_manufacturer
 #: constraint:ir.ui.view:0
@@ -56,7 +56,7 @@ msgstr "Барааны атрибутууд"
 #: view:product.manufacturer.attribute:0
 #: view:product.product:0
 msgid "Product Attributes"
-msgstr ""
+msgstr "Барааны онцлогууд"
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,name:0
@@ -88,7 +88,7 @@ msgstr "Бүт��гд�хүүний �трибут & Үйлдв�рл�гч"
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer Product Name"
-msgstr ""
+msgstr "Бараа үйлдв�рл�гчийн н�р"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sr.po b/addons/product_margin/i18n/sr.po
index 093d6fe3963..c2e99bd2878 100644
--- a/addons/product_margin/i18n/sr.po
+++ b/addons/product_margin/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 16:52+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:21+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
index ec3aaa917c3..94fa025a2e8 100644
--- a/addons/product_visible_discount/i18n/sr.po
+++ b/addons/product_visible_discount/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-03-25 12:11+0000\n"
-"PO-Revision-Date: 2010-10-14 16:57+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
diff --git a/addons/project_messages/i18n/sr.po b/addons/project_messages/i18n/sr.po
index 422799eed49..cb2e777e123 100644
--- a/addons/project_messages/i18n/sr.po
+++ b/addons/project_messages/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 10:28+0000\n"
-"PO-Revision-Date: 2010-10-14 20:39+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_messages
diff --git a/addons/project_retro_planning/i18n/sr.po b/addons/project_retro_planning/i18n/sr.po
index ec176d1c175..d70f5b3f565 100644
--- a/addons/project_retro_planning/i18n/sr.po
+++ b/addons/project_retro_planning/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 20:41+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/purchase_analytic_plans/i18n/sr.po b/addons/purchase_analytic_plans/i18n/sr.po
index e9fba1bf5fa..f3a1d1b86dc 100644
--- a/addons/purchase_analytic_plans/i18n/sr.po
+++ b/addons/purchase_analytic_plans/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 20:32+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sr.po b/addons/sale_analytic_plans/i18n/sr.po
index ceaa67abddb..5332a39285e 100644
--- a/addons/sale_analytic_plans/i18n/sr.po
+++ b/addons/sale_analytic_plans/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 20:30+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:33+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index ab28ad3cc9a..33e60ea3573 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 13:27+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:16+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index 9f01330dfd7..733a627ada9 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 17:20+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 09:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning

From 80cd518e1d1692751c2d073cd3f389022230cda0 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Sat, 16 Oct 2010 13:56:55 +0530
Subject: [PATCH 265/294] [ADD/MOD] Improved tooltips on menus

bzr revid: vir@tinyerp.com-20101016082655-jtqm0447fb7zkrv9
---
 addons/account/account_invoice_view.xml             |  6 +++---
 addons/account/account_view.xml                     |  6 +++++-
 addons/account/project/project_view.xml             |  2 +-
 addons/account/wizard/account_chart_view.xml        |  1 +
 addons/account/wizard/account_move_journal_view.xml |  3 +++
 .../voucher_payment_receipt_view.xml                |  2 ++
 .../account_voucher/voucher_sales_purchase_view.xml |  1 +
 addons/base_calendar/base_calendar_view.xml         |  1 +
 addons/crm/crm_meeting_view.xml                     |  1 +
 addons/crm/crm_view.xml                             |  1 +
 addons/crm_claim/crm_claim_view.xml                 |  2 ++
 addons/crm_fundraising/crm_fundraising_view.xml     |  2 ++
 addons/crm_helpdesk/crm_helpdesk_view.xml           |  1 +
 addons/delivery/delivery_view.xml                   |  2 ++
 addons/event/event_view.xml                         |  1 +
 addons/hr_timesheet/hr_timesheet_view.xml           |  2 +-
 .../hr_timesheet_invoice_view.xml                   |  2 +-
 .../wizard/hr_timesheet_current_view.xml            |  1 +
 .../marketing_campaign/marketing_campaign_view.xml  |  6 +++---
 addons/mrp/mrp_view.xml                             | 12 +++++++-----
 addons/mrp/report/mrp_production_order_view.xml     |  1 +
 addons/mrp/report/mrp_report_view.xml               |  4 ++--
 addons/mrp_operations/mrp_operations_view.xml       |  2 +-
 addons/mrp_repair/mrp_repair_view.xml               |  1 +
 addons/procurement/procurement_view.xml             |  3 ++-
 addons/procurement/wizard/schedulers_all_view.xml   |  2 +-
 addons/product/pricelist_view.xml                   |  2 ++
 addons/product/product_view.xml                     |  6 +++++-
 addons/project/project_view.xml                     |  5 +++--
 addons/project/report/project_report_view.xml       |  2 +-
 addons/project_gtd/project_gtd_view.xml             |  2 ++
 addons/project_issue/project_issue_menu.xml         |  2 +-
 addons/project_issue/project_issue_view.xml         |  1 +
 .../report/project_issue_report_view.xml            |  2 +-
 addons/project_long_term/project_long_term_view.xml |  2 +-
 addons/project_scrum/project_scrum_view.xml         |  3 +++
 addons/purchase/purchase_view.xml                   | 11 +++++++----
 addons/purchase/report/purchase_report_view.xml     |  2 ++
 .../purchase_requisition_view.xml                   |  1 +
 addons/resource/resource_view.xml                   |  2 +-
 addons/sale/sale_view.xml                           |  1 +
 .../report/picking_journal_report_view.xml          |  1 +
 addons/stock/report/report_stock_move_view.xml      |  2 ++
 addons/stock/report/report_stock_view.xml           |  1 +
 addons/stock/stock_view.xml                         | 13 +++++++++++++
 45 files changed, 97 insertions(+), 32 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 18484a7d1c8..71c211bb2c3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -430,7 +430,7 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
+            <field name="help">Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers.</field>
         </record>
 
 
@@ -458,7 +458,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
+            <field name="help">Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -471,7 +471,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">A customer refund is a credit note to your customer that cancel invoice or a part of it.</field>
+            <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 49de367122b..cc44e4563d8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -635,6 +635,7 @@
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
             <field name="context">{'journal_type':'bank'}</field>
             <field name="search_view_id" ref="view_bank_statement_search"/>
+            <field name="help">A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form.</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
             <field name="sequence" eval="1"/>
@@ -956,7 +957,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_tax_code_tree"/>
-            <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
+            <field name="help">The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country.</field>
         </record>
 
         <!--
@@ -1188,6 +1189,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
 
         <menuitem
@@ -1435,6 +1437,7 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="help">A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc.</field>
         </record>
 
         <menuitem
@@ -2675,6 +2678,7 @@
             <field name="search_view_id" ref="view_account_bank_statement_filter"/>
             <field name="domain">[('journal_id.type', '=', 'cash')]</field>
             <field name="context">{'journal_type':'cash'}</field>
+            <field name="help">Cash Register allows you to manage cash entries in your cash journals.</field>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 6795ae6a0f8..9a482155b4f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -129,7 +129,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
-            <field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
+            <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
         </record>
 
         <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index f35a2c5480c..f2e278b06ce 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -31,6 +31,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_chart"/>
             <field name="target">new</field>
+            <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index da59388eb91..24fe913d179 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -20,6 +20,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
         </record>
         <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
             parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
@@ -31,6 +32,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'purchase','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
         <menuitem action="action_account_moves_purchase"
             id="menu_eaction_account_moves_purchase"
@@ -46,6 +48,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'bank','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
         </record>
 
         <menuitem
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 8169cac31e3..a8f827e7bb8 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -235,6 +235,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_vendor_pay"/>
             <field name="target">current</field>
+            <field name="help">The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills.</field>
         </record>
         <record id="action_vendor_payment_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -342,6 +343,7 @@
             <field name="search_view_id" ref="view_voucher_filter_customer_pay"/>
             <field name="view_id" eval="False"/>
             <field name="target">current</field>
+            <field name="help">Sales payment allows you to register the payments you receive from your customers. In order to record a payment, you must enter the customer, the payment method (=the journal) and the payment amount. OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.</field>
         </record>
         <record id="action_vendor_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ad44b842587..ed6e98ad17d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -172,6 +172,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_sale"/>
             <field name="target">current</field>
+            <field name="help">When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt.</field>
         </record>
         <record id="action_sale_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index b5f234aa7cb..ba1c165a351 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -208,6 +208,7 @@
             <field name="res_model">res.alarm</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create specific calendar alarms that can be assigned to calendar events or meetings.</field>
         </record>
 
         <!--        Menu for Alarms-->
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index dfeadb85bcc..163a2f5878a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -11,6 +11,7 @@
         <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
         <field name="context">{'object_id':'crm.meeting'}</field>
+        <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
     </record>
 
      <menuitem action="crm_meeting_categ_action"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b77de509045..95b0f318bac 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -325,6 +325,7 @@
             <field name="res_model">crm.segmentation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create specific partner categories that you will then be able to assign to your partners to better manage your interactions with them. The segmentation tool will assign categories to partners based on defined criteria.</field>
         </record>
 
        <menuitem action="crm_segmentation_tree-act"
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9839f03bd6d..45b18d3baab 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -15,6 +15,7 @@
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
             <field name="context">{'object_id':'crm.claim'}</field>
+            <field name="help">Create claim categories to better manage and classify your claims. Some example of claims can be: preventive action, corrective action.</field>
         </record>
 
         <menuitem action="crm_claim_categ_action" name="Categories"
@@ -30,6 +31,7 @@
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
             <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
             <field name="context">{'object_id':'crm.claim'}</field>
+            <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
 
          <menuitem action="crm_claim_stage_act" name="Stages"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 51650f8b7d5..eea653a4d48 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -15,6 +15,7 @@
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
             <field name="context">{'object_id':'crm.fundraising'}</field>
+            <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
         </record>
 
         <menuitem action="crm_fund_categ_action" name="Categories"
@@ -30,6 +31,7 @@
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
             <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
             <field name="context">{'object_id':'crm.fundraising'}</field>
+            <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
 
          <menuitem action="crm_fundraising_stage_act"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 9c0fe7ac254..55eaf16ff85 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -15,6 +15,7 @@
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
             <field name="context">{'object_id':'crm.helpdesk'}</field>
+            <field name="help">Create and manage helpdesk categories to better manage and classify your support request.</field>
         </record>
 
         <menuitem action="crm_helpdesk_categ_action" name="Categories"
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 3d03235d872..1c9d2263440 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -35,6 +35,7 @@
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create and manage the delivery method(s) you want your sales to be processed with. Each delivery method can be assigned to a pricelist which computes the price of the delivery according to the products sold or delivered.</field>
         </record>
         <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_system"/>
 
@@ -84,6 +85,7 @@
             <field name="res_model">delivery.grid</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">The delivery pricelist allows you to compute the cost and sales price of the delivery based on the weight of the products and other criteria. You can define several pricelists for one delivery method, for each region such as countries or a zone in a specific country defined by a zip code range.</field>
         </record>
         <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 2fe04b165aa..918147b79cb 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -272,6 +272,7 @@
            <field name="view_mode">tree,form,calendar,graph</field>
            <field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
            <field name="search_view_id" ref="view_event_search"/>
+           <field name="help">Event is the low-level object used by meeting and others documents that have to be synchronized with mobile or calendar applications through caldav. Most of the users should work on the Calendar menu, and not on the list of events.</field>
        </record>
 
       <act_window
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7700d16db3..689e3c31261 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -95,7 +95,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid, "search_default_today":1}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
-            <field name="help">This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.</field>
+            <field name="help">Working Hours allows you to log your working hours by project every day.</field>
         </record>
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 2caa7b15d77..408835fe993 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -118,7 +118,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
-            <field name="help">OpenERP automatically group the entries to be invoiced so you can keep an eye on them on real time in one glance.</field>
+            <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
         </record>
         <menuitem
             action="action_hr_analytic_timesheet_open_tree"
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index f9944d0949f..fe63a4ce7b3 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -23,6 +23,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_hr_timesheet_current_open"/>
         <field name="target">new</field>
+        <field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
     </record>
 
     <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b23826969a8..26690757234 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -115,9 +115,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,diagram</field>
         <field name="view_id" ref="view_marketing_campaign_tree"/>
-       <field name="context">{'group_by': []}</field>
-       <field name="search_view_id" ref="view_marketing_campaign_search"/>
-
+        <field name="context">{'group_by': []}</field>
+        <field name="search_view_id" ref="view_marketing_campaign_search"/>
+        <field name="help">Campaigns are used to tag the source of the new business opportunities or leads. They are mainly used for reporting on the performance of each marketing campaign.</field>
     </record>
 
     <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 32f3100b868..7f7c01b044e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -37,6 +37,7 @@
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Define specific property groups that can be assigned to the properties of your bills of materials.</field>
         </record>
         <menuitem
             id="menu_mrp_configuration"
@@ -99,6 +100,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_mrp_property_search"/>
+            <field name="help">The Properties in OpenERP are used to select the right bill of material in order to manufacture a product, when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will select automatically the BoM to use according the the needs.</field>
         </record>
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
@@ -207,7 +209,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
             <field name="search_view_id" ref="view_mrp_workcenter_search"/>
-            <field name="help">Work Centers are units of manufacture consisting of one or several people and/or machines that can be considered as a unit for the purposes of forecasting capacity and planning.</field>
+            <field name="help">Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
         </record>
 
         <!--
@@ -298,7 +300,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
             <field name="search_view_id" ref="mrp_routing_search_view"/>
-            <field name="help">Routings define the assembly operations to be done in work centers for manufacturing a certain product. They are usually attached to bills of materials which will define the assembly of products required for manufacture or for finished products.</field>
+            <field name="help">Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
         </record>
         <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
@@ -415,7 +417,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
-            <field name="help">Master Bills of Materials are documents that describe the list of raw materials used to make a finished product. You can generate documents for a product manufacturing (defining each manufacturing step) or you could define a single multi-level bill of materials.</field>
+            <field name="help">Master Bill of Materials allows you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoM in order to propose automatically manufacturing orders according to products' needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials.</field>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -423,7 +425,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','!=',False)]</field>
-            <field name="help">Bills of materials Components are components and sub-product used to create master bills of materials.</field>
+            <field name="help">Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component.</field>
         </record>
 
         <!-- BOM menus -->
@@ -757,7 +759,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{'search_default_Current':1}</field>
-            <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
+            <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
 
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 01b3381b0bb..61a0c641a24 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -111,6 +111,7 @@
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
             <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="help">This reporting allows you to analyse your manufacturing activities and performance.</field>
         </record>
 
        	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index dcb2bcb3566..db628eb5431 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -47,7 +47,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_workcenter_load_search"/>
-            <field name="help">Work Center Load is a projection of load in a work center given a period. The load is express in hour and cycle (for machines).</field>
+            <field name="help">Work Center Loads gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles.</field>
         </record>
         <menuitem id="next_id_77" name="Reporting"
             parent="base.menu_mrp_root" sequence="49"/>
@@ -99,7 +99,7 @@
             <field name="res_model">report.mrp.inout</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
+            <field name="help">Weekly Stock Value Variation enables you to track the stock value evolution linked to manufacturing activities, receptions of products and delivery orders.</field>
         </record>
         <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" 
                     parent="next_id_77" groups="mrp.group_mrp_manager"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 62298f4aa5f..cd208b2d5a6 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -202,7 +202,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,gantt,calendar,graph</field>
         <field name="search_view_id" ref="view_mrp_production_workcenter_form_view_filter"/>
-        <field name="help">Work Orders are manufacturing operations required to produce or assemble products. The different work orders will have different impacts on the costs of manufacture and planning depending on the available workload.</field>
+        <field name="help">Work Orders is the list of operations to be performed for each manufacturing order. Once you start the first work order of a manufacturing order, the manufacturing order is automatically marked as started. Once you finish the latest operation of a manufacturing order, the MO is automatically done and the related products are produced.</field>
     </record>
 
     <record model="ir.actions.act_window" id="mrp_production_wc_action_planning">
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 15878ec1b37..756fa94568a 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -211,6 +211,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_repair_order_form_filter"/>
+            <field name="help">Repair orders allows you to organize your reparations on the products. On a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if you have to invoice the reparation to the customer or not.</field>
         </record>    
 
         <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" groups="mrp.group_mrp_user" name="Repair Orders" sequence="50"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 4d54fa256a8..53f84367b17 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -132,7 +132,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_procurement_filter"/>
             <field name="context">{'search_default_current':1}</field>
-            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc.</field>
+            <field name="help">A procurement order is used to record a need in a specific product at a specific location. They are usually created automatically by the sales orders, the Pull Logistics rules or the minimum stock rules. When the procurement order is confirmed, it creates automatically the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc.</field>
         </record>
 
         <record id="procurement_exceptions" model="ir.actions.act_window">
@@ -235,6 +235,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
             <field name="search_view_id" ref="warehouse_orderpoint_search" />
+            <field name="help">You can define your minimum stock rules, so that OpenERP will trigger automatically the propositions of manufacturing or purchase orders according to the stock level. Once the virtual stock of a product (=stock on hand minus all confirmed orders and reservations) is bellow the minimum quantity, OpenERP will generate a procurement request in order to fullfil the stock up to the maximum quantity.</field>
         </record>
 
         <act_window 
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 40c72ee68c7..00b6225101e 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters">
-                <label string="Wizard run all the procurements, and generate task, production order or purchase order based on the product type" colspan="4"/>
+                <label string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing." colspan="4"/>
 				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 589dfb5f290..76623dc5710 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -42,6 +42,7 @@
             <field name="res_model">product.pricelist.version</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="product_pricelist_version_tree_view"/>
+            <field name="help">There can be more than one version of a pricelist. If you need to create new versions of a pricelist, you can do it and manage them from here. Some examples of versions: 2010, 2011, Promotion of February 2010, etc.</field>
         </record>
         <menuitem
             action="product_pricelist_action" id="menu_product_pricelist_action"
@@ -163,6 +164,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="product_pricelist_view_search" />
+            <field name="help">A pricelist contains rules to be evaluated in order to compute the purchase or sale price for all the partners assigned to a pricelist. Pricelists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of this category of product will be based on the supplier price multiplied by 1.80.</field>
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d7b4163f0ee..ef19596d743 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -207,6 +207,7 @@
             <field name="domain">[('purchase_ok','=',1)]</field>
             <field name="view_id" ref="product_product_tree_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
+            <field name="help">Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information on your  products related to procurement logistics, sales price, product category, suppliers and so on.</field>
         </record>
 
         <record id="product_category_form_view" model="ir.ui.view">
@@ -252,7 +253,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
-            <field name="help">Here is a list of all your products classified by category. You can click on a category to get the list of all products linked to this category or to a child of this category.</field>
+            <field name="help">Create and manage product categories you want to be maintained in the system. This allows you to classify your products according to your needs.</field>
         </record>
         <menuitem
             action="product_category_action"
@@ -346,6 +347,7 @@
             <field name="res_model">product.uom</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="product_uom_tree_view"/>
+            <field name="help">Create and manage the units of measure you want to be used in your system. You can define a conversion rate to be used between the several Unit of Measure within the same category.</field>
         </record>
         <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65"/>
         <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
@@ -366,6 +368,7 @@
             <field name="res_model">product.uom.categ</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create and manage the units of measure categories you want to be used in your system. If several units of measures are in the same category, they can be converted within each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days.</field>
         </record>
         <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
 
@@ -397,6 +400,7 @@
             <field name="res_model">product.ul</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create and manage your packaging dimensions and types you want to be maintained in your system.</field>
         </record>
         <menuitem
             action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a74bacf8e4e..df317859e6e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -158,7 +158,7 @@
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{'search_default_Current':1}</field>
-            <field name="help">Consult and define your projects here. A project contains a set of related activities that will be performed by your company. Any project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure very useful for work organization.</field>
+            <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned on it. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to  design large project structure with different phases spread over the project duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on.</field>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
@@ -430,7 +430,7 @@
             <field name="view_id" ref="view_task_tree2"/>
             <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid, "search_default_current": 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
-            <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion. A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.</field>
+            <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to antoher user. If you delegate a task to another user, you get a new task in pending state, which will be re-opened when you have to review the work achieved. If you install the project_timesheet module, tasks works can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
 
@@ -494,6 +494,7 @@
             <field name="res_model">project.task.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="task_type_tree"/>
+            <field name="help">Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue.</field>
         </record>
 
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5d533056405..dfd61087ea1 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -146,7 +146,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
             <field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help">Get detailed analysis by task</field>
+            <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index d80dd86a243..07a5fb5011c 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -28,6 +28,7 @@
     <record model="ir.actions.act_window" id="open_gtd_context_tree">
         <field name="name">Contexts</field>
         <field name="res_model">project.gtd.context</field>
+        <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc.</field>
     </record>
 
     <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system,project.group_project_finance_user"
@@ -66,6 +67,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_gtd_timebox_tree"/>
+        <field name="help">Timeboxes are defined in the "Getting Things Done" methodology. It defines a period of time in order to categorize your tasks: today, this week, this month, long term.</field>
     </record>
 
     <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 89c3085c2cf..518fc37056a 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -15,7 +15,7 @@
         <field name="domain" eval=""/>
         <field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
-        <field name="help">Issues like bugs in a system, client complain, materials breakdown are collected here. A list view allows the manager to quickly check for them, assign them, make their status evolved.</field>
+        <field name="help">Issues such as system bugs, client complains, material breakdowns are collected here. You can define the stages assigned to the resolution of the issue on the project. (analysis, development, done) Using the mailgateway module, the issues can be integrated to an email address (example: support@mycompany.com)</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d9ca4b04e08..0f80136f3bb 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -30,6 +30,7 @@
             <field name="name">Versions</field>
             <field name="res_model">project.issue.version</field>
             <field name="view_type">form</field>
+            <field name="help">You can use the issues tracker in OpenERP to handle bugs in the software development project, to handle claims in after-sales services, etc. Define here the different versions of your products on which you can work on issues.</field>
         </record>
         <menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" />
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index ea864cd152b..e2e34a0f5f5 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -159,7 +159,7 @@
               <field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
-            <field name="help">Track your projects issues and fixing delay with a high accuracy. A multicriteria search tool allows fine-grained analysis.</field>
+            <field name="help">This report on the project issues allows you to analyse the quality of your support or after-sales services. You can track the issues per age. You can analyse the time required to open or close an issue, the number of email to exchange and the time spent on average by issues.</field>
         </record>
 
 
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1ca78537340..025457de18a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -289,7 +289,7 @@
             <field name="view_mode">gantt,tree,form,calendar</field>
             <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
+            <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it.</field>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0c91348c910..6978f09c8f6 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -181,6 +181,7 @@
             <field name="view_type">form</field>
             <field name="context">{'search_default_current': 1,'search_default_user_id':uid,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
+            <field name="help">The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a sprint of developement and can be split into several tasks. The product backlog is managed by the product owner of the project.</field>
         </record>
         <menuitem
             action="action_product_backlog_form"
@@ -350,6 +351,7 @@
             <field name="view_id" ref="view_scrum_sprint_tree"/>
             <field name="context">{"search_default_filter_current": 1}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
+            <field name="help">The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (one month) on which the team implement a list of product backlogs. The sprint review is organized when the team presents his work to the customer and product owner.</field>
         </record>
         <menuitem
             sequence="20"
@@ -448,6 +450,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'search_default_scrum_daily':1,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
+            <field name="help">The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face.</field>
         </record>
         <menuitem sequence="30"
             action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a9996202b20..f56d41a4692 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -13,6 +13,7 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_supplier":1}</field>
             <field name="search_view_id" ref="base.view_res_partner_address_filter"/>
+            <field name="help">Access your supplier records and maintain your relationship with them. You can track all your interactions with them through the history tab: emails, orders, meeting, etc.</field>
         </record>
         <record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>
@@ -55,7 +56,7 @@
         <field name="domain">[('type','=','in_invoice')]</field>
         <field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
         <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.</field>
+            <field name="help">Use this menu to control the invoices to be received by your supplier. OpenERP pre-generates draft of invoices based on your purchase orders or your receptions. Once you receive a supplier invoice, you can control it according to the draft of invoice and validate it.</field>
     </record>
 
      <menuitem name="Supplier Invoices to Receive"
@@ -239,7 +240,7 @@
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.</field>
+            <field name="help">With the Requests for quotation menu you can create new request for quotations, review existing one and confirm them to order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, invoice to control.</field>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
                 sequence="6" groups="group_purchase_manager,group_purchase_user"/>
@@ -251,7 +252,8 @@
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">From the Purchase Orders menu, you can create directly new orders and consult the list of your orders in their various state.</field>
+            <field name="help">From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.
+</field>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
 
@@ -401,7 +403,8 @@
             <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-             <field name="search_view_id" ref="purchase_order_line_search"/>
+            <field name="search_view_id" ref="purchase_order_line_search"/>
+            <field name="help">If you set the invoicing control on a purchase order as "Manual", you can track here all the purchase order lines for which you did not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index d2dbff3be94..f5d1f7a3b42 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -149,6 +149,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="view_id" ref="view_purchase_order_tree"></field>
         <field name="context">{'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field>
     </record>
 
     <record id="action_purchase_order_report_graph" model="ir.actions.act_window">
@@ -177,6 +178,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_in': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field>
     </record>
     <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
 
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index d209ef6b3fd..2a30c3789df 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -152,6 +152,7 @@
         <field name="view_mode">tree,form</field>
         <field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
+        <field name="help">A purchase requisition is a step before the request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to supplier. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.</field>
     </record>
 
     <menuitem
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index a0db745efb4..801e363681f 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -201,7 +201,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{}</field>
             <field name="search_view_id" ref="view_resource_resource_search"/>
-            <field name="help">There you can find clusters of your resources type involved in a specific project phase as well as their workload.</field>
+            <field name="help">Resources allows you to create and manage resources that should be involved in a specific project phase. It also allows you to set their efficiency level and workload based on their weekly working hours</field>
         </record>
 
         <record id="resource_calendar_leave_form" model="ir.ui.view">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1c193f8fb9f..14cc9523951 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -46,6 +46,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
+            <field name="help">If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale.</field>
         </record>
 
         <menuitem action="action_shop_form" id="menu_action_shop_form"
diff --git a/addons/sale_journal/report/picking_journal_report_view.xml b/addons/sale_journal/report/picking_journal_report_view.xml
index bcfa293a64c..8c98b6b3928 100644
--- a/addons/sale_journal/report/picking_journal_report_view.xml
+++ b/addons/sale_journal/report/picking_journal_report_view.xml
@@ -96,6 +96,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
             <field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="help">Display your company picking journal and personalize its view by filtering it with specific selection criteria.</field>
         </record>
 
         <menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 34e6e53dbdf..892c298d5d5 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -143,6 +143,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
         <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
+        <field name="help">Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance.</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
@@ -240,6 +241,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  eval="False"/>
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
     </record>
     <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_system,base.group_user"/>
 
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index cb690cea931..0fc7f206c6b 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -67,6 +67,7 @@
             <field name="view_type">form</field>
              <field name="context">{'search_default_stockable':1}</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Display the last inventories done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year.</field>
         </record>
 
         <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c92463b5677..e3d1bf80b25 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -151,6 +151,7 @@
             <field name="view_id" ref="view_inventory_tree"/>
             <field name="context">{'full':'1'}</field>
             <field name="search_view_id" ref="view_inventory_filter" />
+            <field name="help">The Periodical Inventories are used when you count your number of products available per location. You can use it, once a year, when you do the general inventory or, once you need it, to correct the current stock level of a product.</field>
         </record>
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
@@ -209,6 +210,7 @@
             <field name="res_model">stock.tracking</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tracking_tree"/>
+            <field name="help">This is the list of all your packs. After having selected a Pack, you can get the up-stream or down-stream traceability of the products contained in the pack.</field>
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
@@ -368,6 +370,7 @@
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
             <field name="context">{'full':'1',"search_default_available":1}</field>
+            <field name="help">This is the list of all the production lots (serial numbers) you recorded. After having selected a lot, you can get the up-stream or down-stream traceability of the products contained in lot.</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="group_stock_user,group_stock_manager,base.group_extended"/>
 
@@ -507,6 +510,7 @@
             <field name="view_id" ref="view_location_tree2"/>
             <field name="search_view_id" ref="view_location_search"/>
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
+            <field name="help">Define your locations in order to reflect to your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partners location (customers, suppliers) and virtual locations which are the counter-part of the stock operations like the manufacturing orders consummations, the inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location into the Stock location. Each report can be performed on physicals, partners or virtual locations.</field>
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system,group_stock_manager"/>
 
@@ -528,6 +532,7 @@
             <field name="domain">[('location_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_location_tree"/>
+            <field name="help">This is the structure of your company's warehouses and locations. You can click on a location in order to get the list of the products and their stock level in this particular location and all its children.</field>
         </record>
         <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended,group_stock_manager" sequence="20"/>
 
@@ -567,6 +572,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_tree"/>
+            <field name="help">Create and manage your warehouses and assign them a location from here</field>
         </record>
         <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager,base.group_system"/>
 
@@ -982,6 +988,7 @@
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner_address', 'search_default_available': 1}</field>
             <field name="search_view_id" ref="view_picking_out_search"/>
+            <field name="help">This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules.</field>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1200,6 +1207,7 @@
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
+            <field name="help">The Incoming Shipments is the list of all orders you will receive from your supplier. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1259,6 +1267,7 @@
             <field name="domain">[('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
+            <field name="help">The Internal Moves lists all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has it's own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your pre-configured logistics rules but you can also record manual stock operations.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_picking_tree6_tree_view">
@@ -1446,6 +1455,7 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
             <field name="context">{'search_default_Available':1}</field>
+            <field name="help">This menu gives you the full traceability of inventory operations made on a specific product. You can filter on the product to see all the past or future movements made on the product.</field>
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
 
@@ -1661,6 +1671,7 @@
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{"search_default_receive":1}</field>
             <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
+            <field name="help">The Incoming Products lists all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
@@ -1795,6 +1806,7 @@
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{"search_default_receive":1}</field>
             <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
+            <field name="help">The Outgoing Products lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_out_picking_tree">
@@ -1852,6 +1864,7 @@
             <field name="res_model">stock.journal</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
+            <field name="help">The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc.</field>
         </record>
         <menuitem
             action="action_stock_journal_form"

From 6430fec1082581ee430ed500b2c1a35ab92d1154 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 16:02:41 +0200
Subject: [PATCH 266/294] [IMP] logs

bzr revid: fp@tinyerp.com-20101016140241-dldu351awva0eht0
---
 addons/account/account_bank_statement.py      |  2 +-
 addons/account/invoice.py                     |  3 +--
 addons/crm/crm.py                             |  6 +----
 addons/crm/crm_lead.py                        | 23 +++++++++-------
 addons/crm/crm_meeting.py                     |  2 +-
 addons/crm/crm_opportunity.py                 |  4 +--
 addons/hr_recruitment/hr_recruitment.py       |  7 ++---
 addons/mrp/mrp.py                             | 23 ++++------------
 addons/mrp/procurement.py                     |  2 +-
 addons/procurement/procurement.py             |  9 ++-----
 addons/project/project.py                     | 16 +++++------
 addons/project_issue/project_issue.py         |  6 ++---
 addons/project_mailgate/project_mailgate.py   |  3 ---
 addons/project_scrum/project_scrum.py         |  9 ++-----
 addons/purchase/purchase.py                   | 21 +++++----------
 .../purchase_requisition.py                   | 12 ---------
 addons/sale/sale.py                           |  8 +++---
 addons/sale_journal/sale_journal.py           | 23 +---------------
 addons/stock/stock.py                         | 27 ++++++++++---------
 19 files changed, 65 insertions(+), 141 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index de6356b4575..cf50a1ab62e 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -378,7 +378,7 @@ class account_bank_statement(osv.osv):
                 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
 
             self.write(cr, uid, [st.id], {'name': st_number}, context=context)
-            self.log(cr, uid, st.id, _('Statement %s is confirmed and entries are created.') % st_number)
+            self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
             done.append(st.id)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index d2bf4928095..a39e259681e 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -376,7 +376,7 @@ class account_invoice(osv.osv):
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
         for inv_id, name in self.name_get(cr, uid, ids, context=context):
-            message = _('Invoice ') + " '" + name + "' "+ _("is marked as paid.")
+            message = _('Invoice ') + " '" + name + "' "+ _("is paid.")
             self.log(cr, uid, inv_id, message)
         return True
 
@@ -1221,7 +1221,6 @@ class account_invoice(osv.osv):
 
         inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
         if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
-            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
             code = invoice.currency_id.code
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d6194254c65..c809857de66 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -322,11 +322,7 @@ class crm_case(object):
                                   'active': True})
         self._action(cr, uid, cases, 'cancel')
         for case in cases:
-            message = "The " + self._description + " '" + case.name + "' has been Cancelled."
-            #TODO: Need to differentiate lead and opportunity
-#            if hasattr(case, 'type'):
-#                #TO CHECK: hasattr gives warning for other crm objects that don't have field 'type'
-#                message = "The " + (case.type or 'Case').title() + " '" + case.name + "' has been Cancelled."
+            message = _("The case '%s' has been cancelled.") % (case.name,)
             self.log(cr, uid, case.id, message)
         return True
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 23b1af57b28..3cf191f18ee 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -197,9 +197,12 @@ class crm_lead(crm_case, osv.osv):
             value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
             self.write(cr, uid, ids, value)
 
-        for (id, name) in self.name_get(cr, uid, ids):
-            type = self.browse(cr, uid, id).type or 'Lead'
-            message = (_('The ') + type.title()) + " '" + name + "' "+ _("has been Opened.")
+        for case in self.browse(cr, uid, ids):
+            n = {
+                'lead': _('The lead'),
+                'opportunity': _('The opportunity')
+            }.get(case.type, _('The case'))
+            message = (n +" '" + case.name + "' "+ _("has been opened.")
             self.log(cr, uid, id, message)
         return res
 
@@ -213,11 +216,13 @@ class crm_lead(crm_case, osv.osv):
         """
         res = super(crm_lead, self).case_close(cr, uid, ids, args)
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
-        for (id, name) in self.name_get(cr, uid, ids):
-            lead = self.browse(cr, uid, id)
-            if lead.type == 'lead':
-                message = _('The Lead') + " '" + name + "' "+ _("has been Closed.")
-                self.log(cr, uid, id, message)
+        for case in self.browse(cr, uid, ids):
+            n = {
+                'lead': _('The lead'),
+                'opportunity': _('The opportunity')
+            }.get(case.type, _('The case'))
+            message = (n +" '" + case.name + "' "+ _("has been closed.")
+            self.log(cr, uid, id, message)
         return res
 
     def convert_opportunity(self, cr, uid, ids, context=None):
@@ -315,8 +320,6 @@ class crm_lead(crm_case, osv.osv):
             vals.update(res)
 
         res = self.create(cr, uid, vals, context)
-        message = _('A Lead created') + " '" + subject + "' " + _("from Mailgate.")
-        self.log(cr, uid, res, message)
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 5fc98053046..d2c79bc3497 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -134,7 +134,7 @@ class crm_meeting(crm_case, osv.osv):
         """
         res = super(crm_meeting, self).case_open(cr, uid, ids, args)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Meeting') + " '" + name + "' "+ _("has been Confirmed.")
+            message = _('The meeting') + " '" + name + "' "+ _("has been confirmed.")
             self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 9bc4efda0f8..797d5e70704 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -70,7 +70,7 @@ class crm_opportunity(osv.osv):
         for (id, name) in self.name_get(cr, uid, ids):
             opp = self.browse(cr, uid, id)
             if opp.type == 'opportunity':
-                message = _('The Opportunity') + " '" + name + "' "+ _("has been Won.")
+                message = _('The opportunity') + " '" + name + "' "+ _("has been won.")
                 self.log(cr, uid, id, message)
         return res
 
@@ -94,7 +94,7 @@ class crm_opportunity(osv.osv):
         for (id, name) in self.name_get(cr, uid, ids):
             opp = self.browse(cr, uid, id)
             if opp.type == 'opportunity':
-                message = _('The Opportunity') + " '" + name + "' "+ _("has been Lost.")
+                message = _('The opportunity') + " '" + name + "' "+ _("has been marked as lost.")
                 self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 56217455475..bc6e7193920 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -332,9 +332,6 @@ class hr_applicant(crm.crm_case, osv.osv):
             vals.update(res)
         res = self.create(cr, uid, vals, context=context)
 
-        message = _('A Job Request created') + " '" + subject + "' " + _("from Mailgate.")
-        self.log(cr, uid, res, message)
-
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
@@ -410,7 +407,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         if not date['date_open']:
             self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Job request for') + " '" + name + "' "+ _("is Open.")
+            message = _('The job request ') + " '" + name + "' "+ _("has been set 'in progress'.")
             self.log(cr, uid, id, message)
         return res
 
@@ -426,7 +423,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         job_obj = self.pool.get('hr.job')
         res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Applicant ') + " '" + name + "' "+ _("is Hired.")
+            message = _('Applicant ') + " '" + name + "' "+ _("is being hired.")
             self.log(cr, uid, id, message)
 
         applicant = self.browse(cr, uid, ids)[0]
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5f2695cf3a7..50ed21eb298 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -644,11 +644,7 @@ class mrp_production(osv.osv):
                 move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id': production.location_dest_id.id})
 
-            message = ("Manufacturing Order '%s' for %s %s is Ready to produce.") % (
-                                    name,
-                                    production.product_qty, 
-                                    production.product_id.name, 
-                                   )
+            message = _("Manufacturing order '%s' is ready to produce.") % ( name,)
             self.log(cr, uid, production_id, message)
         return True
 
@@ -759,9 +755,6 @@ class mrp_production(osv.osv):
         
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr)
-        for (id, name) in self.pool.get('product.product').name_get(cr, uid, [production.product_id.id]):
-            message = str(production_qty) + ' ' + production.product_uom.name +" '" + name + _("' have been manufactured for ") + production.name
-        self.log(cr, uid, production_id, message)
         return True
 
     def _costs_generate(self, cr, uid, production):
@@ -929,16 +922,10 @@ class mrp_production(osv.osv):
                 proc_ids.append(proc_id)                
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
             self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
-            message = ("%s '%s' %s %s %s %s %s %s.") % (
-                                    _('Manufacturing Order'), 
-                                    production.name,
-                                    _('for'), 
-                                    production.product_qty, 
-                                    production.product_id.name, 
-                                    _('scheduled for date '), 
-                                    datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
-                                    _('is waiting') 
-                                   )
+            message = _("Manufacturing order '%s' is scheduled for the %s.") % (
+                production.name,
+                datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y'),
+            )
             self.log(cr, uid, production.id, message)
         return picking_id
 
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 29eb2d3bddf..38f07e0f1d1 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -43,7 +43,7 @@ class procurement_order(osv.osv):
         if not bom_id:            
             cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
             for (id, name) in self.name_get(cr, uid, procurement.id):
-                message = _('Procurement ') + " '" + name + "' "+ _("has an exception.") + _('No BoM defined for this product !')
+                message = _('Procurement ') + " '" + name + "' "+ _("has an exception: 'No BoM defined for this product !'")
                 self.log(cr, uid, id, message)
             return False
         return True
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 4f0d3530a80..359586fae7e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -335,8 +335,6 @@ class procurement_order(osv.osv):
                     })
                     move_obj.action_confirm(cr, uid, [id], context=context)
                     self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
-                    message = _("Procurement '%s' is running.") % procurement.name
-                    self.log(cr, uid, procurement.id, message)
         self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
         return True
 
@@ -370,9 +368,8 @@ class procurement_order(osv.osv):
                     cr.execute('update procurement_order set message=%s where id=%s', 
                             (_('Not enough stock and no minimum orderpoint rule defined.'), 
                             procurement.id))
-                    message = _("Procurement '%s' has an exception." \
-                            "Not enough stock and no minimum orderpoint rule defined.") % \
-                            procurement.name
+                    message = _("Procurement '%s' is in exception: not enough stock.") % \
+                            (procurement.name,)
                     self.log(cr, uid, procurement.id, message)
         return ok
 
@@ -451,8 +448,6 @@ class procurement_order(osv.osv):
             if procurement.move_id:
                 if procurement.close_move and (procurement.move_id.state <> 'done'):
                     move_obj.action_done(cr, uid, [procurement.move_id.id])
-                    message = _("Procurement '%s' is done.") % procurement.name
-                    self.log(cr, uid, procurement.id, message)
         res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
diff --git a/addons/project/project.py b/addons/project/project.py
index a09855d3bce..3653d6ba0da 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -248,7 +248,7 @@ class project(osv.osv):
         task_obj.write(cr, uid, task_ids, {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
         self.write(cr, uid, ids, {'state':'close'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Project ') + " '" + name + "' "+ _("is Closed.")
+            message = _('The project ') + " '" + name + "' "+ _("has been closed.")
             self.log(cr, uid, id, message)
         return True
 
@@ -270,7 +270,7 @@ class project(osv.osv):
     def reset_project(self, cr, uid, ids, context=None):
         res = self.setActive(cr, uid, ids, value=True, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Project ') + " '" + name + "' "+ _("is Open.")
+            message = _('The project ') + " '" + name + "' "+ _("has been opened.")
             self.log(cr, uid, id, message)
         return res
 
@@ -634,7 +634,7 @@ class task(osv.osv):
                     if reopen:
                         self.do_reopen(cr, uid, [parent_id.id])
             self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
-            message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
+            message = _("The task '%s' is done") % (task.name,)
             self.log(cr, uid, task.id, message)
         return True
 
@@ -675,7 +675,7 @@ class task(osv.osv):
                     'ref_doc1': 'project.task,%d' % task.id,
                     'ref_doc2': 'project.project,%d' % project.id,
                 })
-            message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
+            message = _("The task '%s' is cancelled.") % (task.name,)
             self.log(cr, uid, task.id, message)
             self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
         return True
@@ -687,7 +687,7 @@ class task(osv.osv):
             if not t.date_start:
                 data['date_start'] = time.strftime('%Y-%m-%d %H:%M:%S')
             self.write(cr, uid, [t.id], data)
-            message = _('Task ') + " '" + t.name + "' "+ _("is Open.")
+            message = _("The task '%s' is opened.") % (t.name,)
             self.log(cr, uid, t.id, message)
         return True
 
@@ -724,15 +724,15 @@ class task(osv.osv):
         else:
             self.do_close(cr, uid, [task.id], context)
         user_pool = self.pool.get('res.users')
-        delegrate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
-        message = _('Task ') + " '" + delegate_data['name'] + "' "+ _("is Delegated to User:") +" '"+ delegrate_user.name +"' "
+        delegate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
+        message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_user.name)
         self.log(cr, uid, task.id, message)
         return True
 
     def do_pending(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'pending'})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Task ') + " '" + name + "' "+ _("is Pending.")
+            message = _('The task ') + " '" + name + "' "+ _("is pending.")
             self.log(cr, uid, id, message)
         return True
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 0e9807c865b..91b7f5b3437 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -58,7 +58,7 @@ class project_issue(crm.crm_case, osv.osv):
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Issue ') + " '" + name + "' "+ _("is Open.")
+            message = _('Issue ') + " '" + name + "' "+ _("has been opened.")
             self.log(cr, uid, id, message)
         return res
 
@@ -73,7 +73,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         res = super(project_issue, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Issue ') + " '" + name + "' "+ _("is Closed.")
+            message = _('Issue ') + " '" + name + "' "+ _("has been closed.")
             self.log(cr, uid, id, message)
         return res
 
@@ -401,8 +401,6 @@ class project_issue(crm.crm_case, osv.osv):
             vals.update(res)
         context.update({'state_to' : 'draft'})
         res = self.create(cr, uid, vals, context)
-        message = _('An Issue created') + " '" + subject + "' " + _("from Mailgate.")
-        self.log(cr, uid, res, message)
         self.convert_to_bug(cr, uid, [res], context=context)
 
         attachents = msg.get('attachments', [])
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 9b6b7d77f7b..c232b41fe76 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -54,9 +54,6 @@ class project_tasks(osv.osv):
             data.update(res)
         res = self.create(cr, uid, data)    
         
-        message = _('A task created') + " '" + subject + "' " + _("from Mailgate.")
-        self.log(cr, uid, res, message)
-        
         attachments = msg.get('attachments', [])
         for attachment in attachments or []:
             data_attach = {
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index e02e16c478b..82395c3eb35 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -86,7 +86,7 @@ class project_scrum_sprint(osv.osv):
             context = {}
         self.write(cr, uid, ids, {'state':'open'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Sprint ') + " '" + name + "' "+ _("is Open.")
+            message = _("The sprint '%s' has been opened.") % (name,)
             self.log(cr, uid, id, message)
         return True
 
@@ -95,7 +95,7 @@ class project_scrum_sprint(osv.osv):
             context = {}
         self.write(cr, uid, ids, {'state':'done'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Sprint ') + " '" + name + "' "+ _("is Closed.")
+            message = _("The sprint '%s' has been closed.") % (name,)
             self.log(cr, uid, id, message)
         return True
 
@@ -214,9 +214,6 @@ class project_scrum_product_backlog(osv.osv):
         if context is None:
             context = {}
         self.write(cr, uid, ids, {'state':'open'}, context=context)
-        for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Product Backlog ') + " '" + name + "' "+ _("is Open.")
-            self.log(cr, uid, id, message)
         return True
 
     def button_close(self, cr, uid, ids, context=None):
@@ -226,8 +223,6 @@ class project_scrum_product_backlog(osv.osv):
         self.write(cr, uid, ids, {'state':'done'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
             obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
-            message = _('Product Backlog ') + " '" + backlog.name + "' "+ _("is Closed.")
-            self.log(cr, uid, backlog.id, message)
         return True
 
     def button_pending(self, cr, uid, ids, context=None):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b288055faf3..9615b089fa2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -270,9 +270,6 @@ class purchase_order(osv.osv):
 
     def wkf_approve_order(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
-        for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Purchase order ') + " '" + name + "' "+_("is approved by the supplier")
-                self.log(cr, uid, id, message)
         return True
 
     #TODO: implement messages system
@@ -285,15 +282,12 @@ class purchase_order(osv.osv):
             for line in po.order_line:
                 if line.state=='draft':
                     todo.append(line.id)
+            message = _("Purchase order '%s' is confirmed.") % (po.name,)
+            self.log(cr, uid, po.id, message)
         current_name = self.name_get(cr, uid, ids)[0][1]
         self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
-            for line in po.order_line:
-                product.append(line.product_id.default_code or '')
-                params = ', '.join(map(lambda x : str(x), product))
-            message = _('Purchase order ') + " '" + po.name + "' "+_('placed on')+ " '" + po.date_order + "' "+_('for')+" '" + params + "' "+ _("is confirmed")
-            self.log(cr, uid, id, message)
         return True
 
     def wkf_warn_buyer(self, cr, uid, ids):
@@ -336,8 +330,8 @@ class purchase_order(osv.osv):
             wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
             wf_service.trg_create(uid, 'purchase.order', p_id, cr)
         for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Purchase order') + " '" + name + "' "+ _("is in the draft state")
-                self.log(cr, uid, id, message)
+            message = _('Purchase order') + " '" + name + "' "+ _("has been set in draft state.")
+            self.log(cr, uid, id, message)
         return True
 
     def action_invoice_create(self, cr, uid, ids, *args):
@@ -417,8 +411,8 @@ class purchase_order(osv.osv):
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
-        for (id,name) in self.name_get(cr, uid, ids):        
-            message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled")
+        for (id,name) in self.name_get(cr, uid, ids):
+            message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled.")
             self.log(cr, uid, id, message)
         return True
 
@@ -723,9 +717,6 @@ class purchase_order_line(osv.osv):
 
     def action_confirm(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context)
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Purchase order line') + " '" + name + "' "+ _("is confirmed")
-            self.log(cr, uid, id, message)
         return True
 
 purchase_order_line()
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 1e0c4f06838..c22ced3e159 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -68,30 +68,18 @@ class purchase_requisition(osv.osv):
                 if str(purchase_id.state) in('draft','wait'):
                     purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
         self.write(cr, uid, ids, {'state': 'cancel'})
-        for (id,name) in self.name_get(cr, uid, ids):
-                    message = _('Tender') + " '" + name + "' "+ _("is cancelled")
-                    self.log(cr, uid, id, message)
         return True
 
     def tender_in_progress(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
-        for (id,name) in self.name_get(cr, uid, ids):
-                    message = _('Tender') + " '" + name + "' "+ _(" is In Progress")
-                    self.log(cr, uid, id, message)
         return True
 
     def tender_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'})
-        for (id,name) in self.name_get(cr, uid, ids):
-                    message = _('Tender') + " '" + name + "' "+ _("is in draft state")
-                    self.log(cr, uid, id, message)
         return True
 
     def tender_done(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
-        for (id,name) in self.name_get(cr, uid, ids):
-                    message = _('Tender') + " '" + name + "' "+ _("is done")
-                    self.log(cr, uid, id, message)
         return True
 
 purchase_requisition()
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4db4641ad4c..91f7a6c3088 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -331,7 +331,7 @@ class sale_order(osv.osv):
             wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
             wf_service.trg_create(uid, 'sale.order', inv_id, cr)
         for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Sale order ') + " '" + name + "' "+ _("is in draft state")
+            message = _("The sale order '%s' has been set in draft state.") %(name,)
             self.log(cr, uid, id, message)
         return True
 
@@ -618,7 +618,7 @@ class sale_order(osv.osv):
                     wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
             sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line],
                     {'state': 'cancel'})
-            message = _('Sale order') + " '" + sale.name + _(" is cancelled")
+            message = _("The sale order '%s' has been cancelled.") % (sale.name,)
             self.log(cr, uid, sale.id, message)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
@@ -630,7 +630,7 @@ class sale_order(osv.osv):
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
             self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
-            message = _('Quotation') + " '" + o.name + "' "+ _("is converted to Sale order")
+            message = _("The quotation '%s' has been converted to a sale order.") % (o.name,)
             self.log(cr, uid, o.id, message)
         return True
 
@@ -989,8 +989,6 @@ class sale_order_line(osv.osv):
                     raise osv.except_osv(
                             _('Could not cancel sale order line!'),
                             _('You must first cancel stock moves attached to this sale order line.'))
-        message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled")
-        self.log(cr, uid, id, message)
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def button_confirm(self, cr, uid, ids, context=None):
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 10f2606955a..8cb10178f02 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -73,9 +73,6 @@ class sale_journal(osv.osv):
             for saleid in sale_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr)
-            for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Sale order of Journal') + " '" + name + "' "+ _("is cancelled")
-                self.log(cr, uid, id, message)
         return True
 
     def button_sale_confirm(self, cr, uid, ids, context={}):
@@ -85,36 +82,21 @@ class sale_journal(osv.osv):
             for saleid in sale_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr)
-            for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Sale orders of Journal') + " '" + name + "' "+ _("is confirmed")
-                self.log(cr, uid, id, message)
         return True
 
     def button_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'open'})
-        for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Sale orders of Journal') + " '" + name + "' "+ _("is opened")
-                self.log(cr, uid, id, message)
         return True
 
     def button_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
-        for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
-                self.log(cr, uid, id, message)
         return True
 
     def button_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
-        for (id,name) in self.name_get(cr, uid, ids):
-                message = _('Sale orders of Journal') + " '" + name + "' "+ _("is closed")
-                self.log(cr, uid, id, message)
         return True
     def button_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'})
-        for (id,name) in self.name_get(cr, uid, ids):
-                    message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
-                    self.log(cr, uid, id, message)
         return True
     def copy(self, cr, uid, id, default=None, context=None):
         """Overrides orm copy method
@@ -182,9 +164,6 @@ class picking_journal(osv.osv):
 
     def button_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'})
-        for (id,name) in self.name_get(cr, uid, ids):
-                    message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
-                    self.log(cr, uid, id, message)
         return True
 
     def button_picking_confirm(self, cr, uid, ids, context={}):
@@ -267,4 +246,4 @@ class sale(osv.osv):
 
 sale()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f1122640424..623db604b83 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1247,23 +1247,25 @@ class stock_picking(osv.osv):
         @param ids: List of Picking Ids
         @param context: A standard dictionary for contextual values
         """
-        msg=''
         for pick in self.browse(cr, uid, ids, context=context):
+            msg=''
+            #if pick.auto_picking:
+            #    continue
             type_list = {
-                'out':'Picking List',
-                'in':'Reception',
-                'internal': 'Internal picking',
+                'out':_("Delivery Order"),
+                'in':_('Reception'),
+                'internal': _('Internal picking'),
             }
-            message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
+            message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
             if pick.min_date:
-                msg=datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d') + "'."
+                msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
             state_list = {
-                          'confirmed': "is scheduled for the '" + msg ,
-                          'assigned': 'is ready to process.',
-                          'cancel': 'is Cancelled.',
-                          'done': 'is processed.',
-                          'draft':'is draft.',
-                          }
+                'confirmed': _("is scheduled") + msg +'.',
+                'assigned': _('is ready to process.'),
+                'cancel': _('is cancelled.'),
+                'done': _('is done.'),
+                'draft':_('is in draft state.'),
+            }
             message += state_list[pick.state]
             self.log(cr, uid, pick.id, message)
         return True
@@ -1997,7 +1999,6 @@ class stock_move(osv.osv):
         for pick_id in picking_ids:
             wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
 
-        picking_obj.log_picking(cr, uid, picking_ids, context=context)
         return True
 
     def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):

From 63d3db6270629918befc28e8e7a3afa5800a22ab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 16:43:35 +0200
Subject: [PATCH 267/294] [IMP] don't show log of auto_picking pickings

bzr revid: fp@tinyerp.com-20101016144335-wlgkpihq4nhi67jd
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 623db604b83..c7973456fb9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1249,8 +1249,8 @@ class stock_picking(osv.osv):
         """
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
-            #if pick.auto_picking:
-            #    continue
+            if pick.auto_picking:
+                continue
             type_list = {
                 'out':_("Delivery Order"),
                 'in':_('Reception'),

From 70ec3487024fca05e1d35cceb2f21f154e1dfedb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 17:28:55 +0200
Subject: [PATCH 268/294] fix

bzr revid: fp@tinyerp.com-20101016152855-jsnp47mjsakx8101
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3cf191f18ee..cc8f4443da8 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -202,7 +202,7 @@ class crm_lead(crm_case, osv.osv):
                 'lead': _('The lead'),
                 'opportunity': _('The opportunity')
             }.get(case.type, _('The case'))
-            message = (n +" '" + case.name + "' "+ _("has been opened.")
+            message = n +" '" + case.name + "' "+ _("has been opened.")
             self.log(cr, uid, id, message)
         return res
 

From af51827c9cd179d34c5fc8d3e63bf0ddf6110243 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 17:29:30 +0200
Subject: [PATCH 269/294] fix_crm_log

bzr revid: fp@tinyerp.com-20101016152930-vc1hf47s1v9k9gbp
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index cc8f4443da8..e387898bd6d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -221,7 +221,7 @@ class crm_lead(crm_case, osv.osv):
                 'lead': _('The lead'),
                 'opportunity': _('The opportunity')
             }.get(case.type, _('The case'))
-            message = (n +" '" + case.name + "' "+ _("has been closed.")
+            message = n +" '" + case.name + "' "+ _("has been closed.")
             self.log(cr, uid, id, message)
         return res
 

From ab30c4663ccca6e0152c6629461287fd17468f2c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 17:46:28 +0200
Subject: [PATCH 270/294] fix

bzr revid: fp@tinyerp.com-20101016154628-vkrhn309haxqhbpu
---
 addons/crm/crm_lead.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e387898bd6d..e6226bb44bb 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -203,7 +203,7 @@ class crm_lead(crm_case, osv.osv):
                 'opportunity': _('The opportunity')
             }.get(case.type, _('The case'))
             message = n +" '" + case.name + "' "+ _("has been opened.")
-            self.log(cr, uid, id, message)
+            self.log(cr, uid, case.id, message)
         return res
 
     def case_close(self, cr, uid, ids, *args):
@@ -222,7 +222,7 @@ class crm_lead(crm_case, osv.osv):
                 'opportunity': _('The opportunity')
             }.get(case.type, _('The case'))
             message = n +" '" + case.name + "' "+ _("has been closed.")
-            self.log(cr, uid, id, message)
+            self.log(cr, uid, case.id, message)
         return res
 
     def convert_opportunity(self, cr, uid, ids, context=None):

From fe9500c14ebfa512f5532846b91972ce4f76dcc0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 18:47:09 +0200
Subject: [PATCH 271/294] [IMP] access rights cleaning

bzr revid: fp@tinyerp.com-20101016164709-8w551aaosqx0dufu
---
 addons/account/security/ir.model.access.csv   |  36 --
 .../security/ir.model.access.csv              |   2 -
 .../security/ir.model.access.csv              |   2 -
 .../security/ir.model.access.csv              |   3 -
 .../account_coda/security/ir.model.access.csv |   1 -
 .../account_followup_view.xml                 |   3 +-
 .../security/ir.model.access.csv              |   3 -
 .../account_invoice_layout_view.xml           |   2 +-
 .../security/ir.model.access.csv              |   1 -
 .../security/ir.model.access.csv              |   2 -
 .../security/ir.model.access.csv              |   1 -
 .../security/ir.model.access.csv              |   2 +-
 .../security/ir.model.access.csv              |   2 -
 addons/auction/auction_view.xml               |   8 +-
 addons/auction/board_auction_view.xml         |   2 +-
 addons/auction/security/ir.model.access.csv   |   9 -
 .../audittrail/security/ir.model.access.csv   |   3 -
 .../security/ir.model.access.csv              |   2 +-
 addons/base_calendar/base_calendar_view.xml   |   6 +-
 addons/crm/board_crm_view.xml                 |   1 -
 addons/crm/crm_view.xml                       |   9 +-
 addons/crm/security/ir.model.access.csv       |  21 -
 addons/crm_claim/crm_claim_view.xml           |   2 +-
 addons/crm_claim/security/ir.model.access.csv |   1 -
 .../security/ir.model.access.csv              |   1 -
 .../crm_helpdesk/security/ir.model.access.csv |   1 -
 .../security/ir.model.access.csv              |   3 -
 .../security/ir.model.access.csv              |   3 +-
 addons/delivery/delivery_view.xml             |   2 +-
 addons/delivery/security/ir.model.access.csv  |   3 -
 .../email_template_account_view.xml           |   3 +-
 .../security/email_template_security.xml      |   2 +-
 .../security/ir.model.access.csv              |   6 +-
 addons/event/board_association_view.xml       |   1 -
 .../report/report_event_registration_view.xml |   2 +-
 addons/event/security/event_security.xml      |   2 +-
 addons/event/security/ir.model.access.csv     |  15 +-
 addons/hr/board_hr_view.xml                   |   1 -
 addons/hr/hr_view.xml                         |   5 +-
 addons/hr_expense/board_hr_expense_view.xml   |   8 +-
 .../hr_holidays/report/holidays_summary.xsl   | 488 +++++++++---------
 .../board_hr_recruitment_statistical_view.xml |   2 +-
 .../report/hr_recruitment_report_view.xml     |  76 +--
 addons/marketing/marketing_view.xml           |   2 +-
 .../marketing/security/marketing_security.xml |   2 +-
 .../security/ir.model.access.csv              |  16 +-
 .../security/marketing_campaign_security.xml  |   2 +-
 addons/mrp/board_manufacturing_view.xml       |   3 -
 addons/mrp/mrp_view.xml                       |  35 +-
 addons/mrp/security/ir.model.access.csv       |  27 -
 .../security/ir.model.access.csv              |   1 -
 addons/point_of_sale/pos_view.xml             |  12 +-
 .../security/ir.model.access.csv              |  15 -
 addons/process/security/ir.model.access.csv   |   5 -
 .../procurement/security/ir.model.access.csv  |   1 -
 addons/product/product_view.xml               |   4 +-
 addons/product/security/ir.model.access.csv   |  10 -
 addons/product_margin/product_margin_view.xml |   2 +-
 addons/project/board_project_view.xml         |   5 -
 addons/project/project_view.xml               |   6 +-
 addons/project/report/project_report_view.xml |   2 +-
 addons/project/security/ir.model.access.csv   |   9 +-
 addons/project_gtd/project_gtd_view.xml       |   2 +-
 .../project_gtd/security/ir.model.access.csv  |   4 +-
 addons/project_issue/project_issue_view.xml   |   2 +-
 .../security/ir.model.access.csv              |   5 +-
 .../security/ir.model.access.csv              |   2 -
 .../project_long_term_view.xml                |   2 +-
 .../security/ir.model.access.csv              |   4 +-
 .../project_planning_view.xml                 |   2 +-
 .../security/ir.model.access.csv              |   3 +-
 .../security/ir.model.access.csv              |   5 +-
 .../security/ir.model.access.csv              |   2 -
 addons/purchase/board_purchase_view.xml       |   1 -
 addons/purchase/purchase_view.xml             |   3 +-
 addons/sale/sale_view.xml                     |   4 +-
 addons/sale/security/ir.model.access.csv      |  13 -
 addons/sale_journal/sale_journal_view.xml     |   4 +-
 .../sale_journal/security/ir.model.access.csv |   5 -
 addons/stock/board_warehouse_view.xml         |  44 +-
 .../stock/report/report_stock_move_view.xml   |   2 +-
 addons/stock/security/ir.model.access.csv     |  14 -
 addons/stock/security/stock_security.xml      |   4 -
 addons/stock/stock_view.xml                   |   8 +-
 .../security/ir.model.access.csv              |   3 -
 addons/stock_planning/stock_planning_view.xml |   4 +-
 addons/wiki/wiki_view.xml                     |   2 +-
 87 files changed, 412 insertions(+), 639 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 56e75a3c036..da8555cf22b 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -99,42 +99,7 @@
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
-"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
-"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
-"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
-"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
-"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
-"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
-"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
-"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
-"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
-"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
-"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
-"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1
-"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1
-"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1
-"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1
-"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1
-"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0
-"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0
-"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0
-"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0
-"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0
-"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1
-"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1
-"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1
-"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0
-"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1
-"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1
-"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1
-"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1
-"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1
-"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1
-"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1
-"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1
-"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1
 "access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
-"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1
 "access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
 "access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
@@ -145,7 +110,6 @@
 "access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
 "access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
 "access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 4db9c88f766..80b9f37db1f 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
-access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0
-access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0
diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index 708094dc520..f7f141ac15a 100644
--- a/addons/account_analytic_plans/security/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
@@ -6,5 +6,3 @@
 "access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
 "access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
 "access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
-"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1
-"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index 9e604ed5bee..b2eb33f3d04 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -4,7 +4,4 @@
 "access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0
 "access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1
 "access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1
-"access_account_budget_post_system","account.budget.post system","model_account_budget_post","base.group_system",1,0,0,0
-"access_crossovered_budget_system","crossovered.budget system","model_crossovered_budget","base.group_system",1,0,0,0
-"access_crossovered_budget_lines_system","crossovered.budget.lines system","model_crossovered_budget_lines","base.group_system",1,1,1,1
 "access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index df4faec11ee..3ab8dccd4ad 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -3,4 +3,3 @@
 "access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
 "access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
 "access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
-"access_account_coda_system","account.coda system","model_account_coda","base.group_system",1,0,0,0
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 85b21ff9e4e..e246e3659e1 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -86,7 +86,8 @@
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_configuration_misc" groups="base.group_system"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu"
+            parent="account.menu_configuration_misc"/>
 
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Followup Report"/>
 
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index ccf257b3ecf..60d179d3cbe 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,9 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
 "access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index c6283ce05dc..0d6a3565784 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -100,7 +100,7 @@
     </record>
 
     <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
-    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message" groups="base.group_system"/>
+    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
 
     </data>
 </openerp>
diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
index 6eede39eb70..c838392e6eb 100644
--- a/addons/account_invoice_layout/security/ir.model.access.csv
+++ b/addons/account_invoice_layout/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
-access_notify_message_system,notify.message system,model_notify_message,base.group_system,1,1,1,1
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index 1d39372a6b3..a4b6fe0af5e 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -7,7 +7,5 @@
 "access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
 "access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1
 "access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
-"access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
-"access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
 "access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
 "access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_report/security/ir.model.access.csv b/addons/account_report/security/ir.model.access.csv
index 66fe44b6714..789f18530e0 100644
--- a/addons/account_report/security/ir.model.access.csv
+++ b/addons/account_report/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_report_report_system","account.report.report system","model_account_report_report","base.group_system",1,0,0,0
 "access_account_report_history","account.report.history","model_account_report_history","account.group_account_manager",1,0,0,0
 "access_account_report_report","account.report.report","model_account_report_report","account.group_account_user",1,1,0,0
 "access_account_report_report_manager","account.report.report manager","model_account_report_report","account.group_account_manager",1,1,1,1
diff --git a/addons/account_reporting/security/ir.model.access.csv b/addons/account_reporting/security/ir.model.access.csv
index e84e663dfda..78dfe260864 100644
--- a/addons/account_reporting/security/ir.model.access.csv
+++ b/addons/account_reporting/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_color_rml,color.rml,model_color_rml,account.group_account_manager,1,1,1,1
-access_account_report_bs,account.report.bs,model_account_report_bs,base.group_system,1,1,1,1
+access_account_report_bs,account.report.bs,model_account_report_bs,account.group_account_manager,1,1,1,1
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index b27392628f0..e2b048dcedd 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -4,6 +4,4 @@
 "access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
 "access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
-"access_account_voucher_system","account.voucher system","model_account_voucher","base.group_system",1,0,0,0
-"access_account_voucher_line_system","account.voucher.line.system","model_account_voucher_line","base.group_system",1,0,0,0
 "access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 43de651e554..36a1b60096c 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -2,8 +2,8 @@
 <openerp>
 <data>
     <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" 
-                groups="base.group_system,group_auction_manager,group_auction_user"/>
-    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="base.group_system,group_auction_manager"/>
+                groups="group_auction_manager,group_auction_user"/>
+    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="group_auction_manager"/>
     <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
     <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
 
@@ -82,7 +82,7 @@
     </record>
 
     <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" 
-                id="menu_auction_object_cat" groups="base.group_system,group_auction_manager"/>
+                id="menu_auction_object_cat" groups="group_auction_manager"/>
 
    <!--  Auction Management/Auction Dates/New Auction Dates  -->
 
@@ -765,7 +765,7 @@
     <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
     <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
-    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="base.group_system,group_auction_manager"/>
+    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/>
 
     <act_window name="Deposit slip"
         context="{'search_default_partner_id': [active_id]}"
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 56ed41e2ca5..12ef99043b0 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -111,7 +111,7 @@
             sequence="1"
             id="menu_board_auction_open"  icon="terp-graph" parent="menu_board_auction"/>
         
-        <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
+        <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" action="open_board_auction"/>
 
     </data>
 </openerp>
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 31f3182fa04..5458e6c2ac3 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -18,15 +18,6 @@
 "access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
 "access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
-"access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
-"access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
-"access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
-"access_auction_bid_system","auction.bid system","model_auction_bid","base.group_system",1,0,0,0
-"access_auction_artists_system","auction.artists system","model_auction_artists","base.group_system",1,1,1,1
-"access_auction_lot_category_system","auction.lot.category system","model_auction_lot_category","base.group_system",1,1,1,1
-"access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
-"access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
-"access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0
 "access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
 "access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
 "access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index ac367182f26..877cf622ad4 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -1,7 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_audittrail_rule_group_system","audittrail rule system","model_audittrail_rule","base.group_system",1,1,1,1
-"access_audittrail_log_group_system","audittrail log system","model_audittrail_log","base.group_system",1,1,1,1
-"access_audittrail_logline_group_system","audittrail log line system","model_audittrail_log_line","base.group_system",1,1,1,1
 "access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
 "access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
 "access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0
diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv
index c3a69f93e4c..4d2e612b384 100644
--- a/addons/base_action_rule/security/ir.model.access.csv
+++ b/addons/base_action_rule/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0
-"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1
\ No newline at end of file
+"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index ba1c165a351..9f27e79d5a5 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -157,12 +157,12 @@
          </record>
 
         <!-- Calenadar's menu -->
-          <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="6" groups="base.group_system,base.group_sale_manager" />
+        <menuitem id="base.menu_calendar_configuration" name="Calendar"
+            parent="base.menu_base_config" sequence="6" groups="base.group_sale_manager" />
 
         <!-- Invitation menu -->
 
-           <menuitem id="menu_attendee_invitations"
+         <menuitem id="menu_attendee_invitations"
             parent="base.menu_calendar_configuration"
             groups="base.group_extended"
             sequence="10" action="action_view_attendee_form" />
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 72368d1413a..79dadadbcd0 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -159,6 +159,5 @@
             sequence="1"
             id="menu_board_crm" icon="terp-graph"
             groups="base.group_sale_salesman"/>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 95b0f318bac..fa576bca24f 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,16 +2,17 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_sale_manager,base.group_sale_salesman"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" 
+            groups="base.group_sale_manager,base.group_sale_salesman"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_base_config" sequence="1" groups="base.group_extended,base.group_system"/>
+            parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
 
         <menuitem id="base.menu_sale_config_sales" name="Sales"
-            parent="base.menu_base_config" sequence="0" groups="base.group_system,base.group_extended"/>
+            parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/>
 
         <menuitem id="menu_crm_config_phonecall" name="Phone Call"
-            parent="base.menu_base_config" sequence="5" groups="base.group_extended,base.group_system"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
             parent="base.menu_base_partner" sequence="11" />
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 5f695b5e5c1..9abdaed00c5 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -7,7 +7,6 @@
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
 "access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
 "access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_system","crm.phonecall.system","model_crm_phonecall","base.group_system",1,0,0,0
 "access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
 "access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
@@ -18,7 +17,6 @@
 "access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
 "access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
 "access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_system",1,1,1,1
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
@@ -36,30 +34,11 @@
 "access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
 "access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
 "access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
-"mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","base.group_system",1,1,1,1
 "mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1
 "mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
-"access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
-"access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
 "access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
-"access_crm_case_resource_type_system","crm.case.resource.type system","model_crm_case_resource_type","base.group_system",1,1,1,1
-"access_crm_case_section_system","crm.case.section system","model_crm_case_section","base.group_system",1,1,1,1
-"access_crm_lead_report_system","crm.lead.report system","model_crm_lead_report","base.group_system",1,1,1,1
-"access_base_res_country_system","base.res.country system","base.model_res_country","base.group_system",1,1,1,1
-"access_base_res_country_state_system","base.res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
 "access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
-"access_base_action_rule_system","base.action.rule system","model_base_action_rule","base.group_system",1,1,1,1
-"access_crm_segmentation_system","crm.segmentation system","model_crm_segmentation","base.group_system",1,1,1,1
-"access_crm_segmentation_line_system","crm.segmentation.line system","model_crm_segmentation_line","base.group_system",1,1,1,1
-"access_base_calendar_res_alarm_system","base.calendar.res.alarm system","base_calendar.model_res_alarm","base.group_system",1,1,1,1
-"access_res_partner_address_system","res.partner.address system","base.model_res_partner_address","base.group_system",1,0,0,0
 "access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
-"access_base_res_partner_canal_system","base.res.partner.canal system","base.model_res_partner_canal","base.group_system",1,1,1,1
-"access_res_partner_category_system","res.partner.category system","base.model_res_partner_category","base.group_system",1,1,1,1
-"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
-"access_crm_lead_system","crm.lead.system","model_crm_lead","base.group_system",1,0,0,0
-"access_crm_meeting_system","crm.meeting.system","model_crm_meeting","base.group_system",1,0,0,0
-"access_calendar_attendee_system","calendar.attendee.system","model_calendar_attendee","base.group_system",1,0,0,0
 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
 "access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 45b18d3baab..975e8d33bec 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="menu_config_claim" name="Claim"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             parent="base.menu_base_config" sequence="6" />
 
         <!-- Claims categories  -->
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index e2563f7541a..ac2752f58b2 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -2,4 +2,3 @@
 "access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,1,1,1
 "access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
 "access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
-"access_crm_claim_system","crm.claim.system","model_crm_claim","base.group_system",1,0,0,0
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index 53d593589d4..703c899c096 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -3,4 +3,3 @@
 "access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
 "access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
 "access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
-"access_crm_fundraising_system","crm.fundraising.system","model_crm_fundraising","base.group_system",1,0,0,0
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index 79cac379f91..2a0d8785122 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -2,4 +2,3 @@
 "access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,1,1,1
 "access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,0
 "access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
-"access_crm_helpdesk_system","crm.helpdesk.system","model_crm_helpdesk","base.group_system",1,0,0,0
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index f60a6041c9f..6ba022b2535 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,7 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question","base.group_system",1,1,1,1
-"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","base.group_system",1,1,1,1
-"access_crm_profiling_answer_system","crm_profiling.answer system","model_crm_profiling_answer","base.group_system",1,1,1,1
 "access_crm_profiling_answer_user","crm_profiling.answer user","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
 "access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
 "access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
diff --git a/addons/decimal_precision/security/ir.model.access.csv b/addons/decimal_precision/security/ir.model.access.csv
index f01ff24e34f..d53a5fef141 100644
--- a/addons/decimal_precision/security/ir.model.access.csv
+++ b/addons/decimal_precision/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_decimal_precision","decimal.precision","model_decimal_precision",base.group_system,1,1,1,1
+"access_decimal_precision_config","decimal.precision configuration","model_decimal_precision",base.group_system,1,1,1,1
+"access_decimal_precision_all","decimal.precision","model_decimal_precision",,1,0,0,0
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 1c9d2263440..17f4e1b9ddf 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -37,7 +37,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">Create and manage the delivery method(s) you want your sales to be processed with. Each delivery method can be assigned to a pricelist which computes the price of the delivery according to the products sold or delivered.</field>
         </record>
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_system"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_extended"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 409fba3becd..52e60995519 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -6,6 +6,3 @@
 "access_delivery_grid_manager","delivery.grid","model_delivery_grid","base.group_sale_manager",1,1,1,1
 "access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","base.group_sale_manager",1,1,1,1
 "access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
-"access_delivery_carrier_stock_system","delivery.carrier stock_system","model_delivery_carrier","base.group_system",1,1,1,1
-"access_delivery_grid_system","delivery.grid.system","model_delivery_grid","base.group_system",1,1,1,1
-"access_delivery_grid_line_system","delivery.grid.line.system","model_delivery_grid_line","base.group_system",1,1,1,1
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 0c30d7d478f..97108cb9e33 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
+            groups="marketing.group_marketing_user"/>
         <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index 7e6c1f4b560..0055c4e1c40 100755
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="0">
 
-        <record id="base.res_groups_email_template_admin" model="res.groups">
+        <record id="marketing.group_marketing_user" model="res.groups">
             <field name="name">Marketing / User</field>
         </record>
 
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index fd5cf2d0f09..79135b0de4d 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template_account","email_template.account","model_email_template_account","base.res_groups_email_template_admin",1,0,0,0
-"access_email_template","email.template","model_email_template","base.res_groups_email_template_admin",1,0,0,0
-"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account","email_template.account","model_email_template_account","marketing.group_marketing_user",1,0,0,0
+"access_email_template","email.template","model_email_template","marketing.group_marketing_user",1,0,0,0
+"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_user",1,1,1,1
 "access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
 "access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 3acebb9d767..d62e4336202 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -80,7 +80,6 @@
             sequence="1"
             id="menu_board_associations_manager"
             icon="terp-graph"/>
-         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" action="open_board_associations_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 83d52d5ab12..d8cc84a0547 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -141,7 +141,7 @@
             <field name="act_window_id" ref="action_report_event_registration"/>
        </record>
 
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_system,base.group_marketing_manager"/>
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_marketing_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index bcd172ce8c7..4415b11a8e4 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -6,7 +6,7 @@
         <field name="name">Marketing / Manager</field>
     </record>
 
-    <record id="base.res_groups_email_template_admin" model="res.groups">
+    <record id="marketing.group_marketing_user" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
 
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index c93c2baa65e..9ee5ae7ec80 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","base.res_groups_email_template_admin",1,0,0,0
+"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
 "access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","base.res_groups_email_template_admin",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","base.res_groups_email_template_admin",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","base.res_groups_email_template_admin",1,1,1,1
+"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
+"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
 "access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
 "access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
 "access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
@@ -11,10 +11,5 @@
 "access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
 "access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
 "access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
-"access_event_event_system","event.event system","model_event_event","base.group_system",1,0,0,0
-"access_event_registration_system","event.registration system","model_event_registration","base.group_system",1,0,0,0
-"access_report_event_registration_system","report.event.registration system","model_report_event_registration","base.group_system",1,1,1,1
-"access_account_account_invoice_system","account.account.invoice","account.model_account_invoice","base.group_system",1,0,0,0
-"access_event_type_sytem","event.type system","model_event_type","base.group_system",1,1,1,1
 "access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.res_groups_email_template_admin",1,0,0,0
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 2bcc7738397..8e1a442e025 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -28,7 +28,6 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_hr_form"/>
         </record>
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem
             id="menu_hr_deshboard"
             name="Human Resources"
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ce501c6951a..9e807d43cab 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,8 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
-        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
+            groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index e79f581dce0..4b64a1bdf19 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
@@ -16,14 +16,14 @@
             <field name="domain">[('state','in',('confirm', 'accepted')),('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
-        
+
         <record id="board_hr_expense_form" model="ir.ui.view">
             <field name="name">board.hr.expense.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1" position="inside"> 
+                <xpath expr="/form/hpaned/child1" position="inside">
                      <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
                 </xpath>
             </field>
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index 67bb2a58769..c0a24e551ff 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -4,257 +4,257 @@
     xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
     <xsl:import href="hr_custom_default.xsl"/>
-	<xsl:import href="hr_custom_rml.xsl"/>
+    <xsl:import href="hr_custom_rml.xsl"/>
 
-	<xsl:template match="/">
-		<xsl:call-template name="rml" />
-	</xsl:template>
+    <xsl:template match="/">
+        <xsl:call-template name="rml" />
+    </xsl:template>
 
-	<xsl:template name="stylesheet">
-				<paraStyle name="normal" fontName="Helvetica" fontSize="6" alignment="left" />
-				<paraStyle name="normal-title" fontName="Helvetica" fontSize="10" alignment="center"/>
-				<paraStyle name="digits" fontName="Helvetica" fontSize="6" alignment="left"/>
-				<paraStyle name="title" fontName="Helvetica" fontSize="18" alignment="center" />
-				<paraStyle name="dept" fontName="Helvetica-Bold" fontSize="8" alignment="left" />
-				<paraStyle name="employee" fontName="Helvetica-Bold" fontSize="6" textColor="black" />
-				<paraStyle name="leaveid" fontName="Helvetica" fontSize="6" alignment="center" />
-				<paraStyle name="print-date" fontName="Helvetica" fontSize="11" alignment="right" />
-				<paraStyle name="sum" fontName="Helvetica-BoldOblique" fontSize="6" alignment="left" />
-				<paraStyle name="company" textColor="purple" fontName="Helvetica-Bold" fontSize="11" alignment="left"/>
-				<blockTableStyle id="header">
-    			  	 <blockAlignment value="LEFT" start="0,0" stop="-1,-1"/>
-    			  	 <blockFont name="Helvetica" size="8" start="0,0" stop="-1,-1"/>
-     				 <blockValign value="TOP"/>
-   				</blockTableStyle>
-				<blockTableStyle id="products">
-					 <blockAlignment value="CENTER" start="1,0" stop="-1,-1"/>
-					 <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
-					 <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
-					 <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
-					 <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
-					 <blockFont name="Helvetica-Bold" size="8" start="0,-1" stop="-1,-1"/>
-					 <blockValign value="TOP"/>
-				</blockTableStyle>
-				<blockTableStyle id="legend">
-					<blockAlignment value="CENTER" start="0,0" stop="-1,-1" />
-					<blockFont name="Helvetica" size="7" start="0,0" stop="-1,-1"/>
-					<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
-					<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
-					<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
-					<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
-					<blockBackground colorName="#FFFFFF" start="0,0" stop="-1,-1"/>
-					<xsl:for-each select="/report/legend">
-						<blockBackground>
-							<xsl:attribute name="colorName">
-							<xsl:value-of select="attribute::color" />
-							</xsl:attribute>
-							<xsl:attribute name="start">
-								<xsl:text>0,</xsl:text>
-								<xsl:value-of select="attribute::row" />
-							</xsl:attribute>
-							<xsl:attribute name="stop">
-								<xsl:text>0,</xsl:text>
-								<xsl:value-of select="attribute::row" />
-							</xsl:attribute>
-						</blockBackground>
-					</xsl:for-each>
-					<blockValign value="TOP"/>
-				</blockTableStyle>
-				<blockTableStyle id="month">
-					<blockAlignment value="CENTER" start="1,0" stop="-1,-1" />
-					<blockFont name="Helvetica" size="5" start="0,0" stop="-1,-1"/>
-					<blockFont name="Helvetica-BoldOblique" size="4.5" start="-1,0" stop="-1,-1"/>
-					<blockBackground colorName="#FFFFFF" start="1,0" stop="-2,1"/>
-					<xsl:for-each select="/report/days/dayy[@name='Sat' or @name='Sun']">
-						<xsl:variable name="col" select="attribute::cell" />
-						<blockBackground>
-							<xsl:attribute name="colorName">lightgrey</xsl:attribute>
-							<xsl:attribute name="start">
-								<xsl:value-of select="$col" />
-								<xsl:text>,0</xsl:text>
-							</xsl:attribute>
-							<xsl:attribute name="stop">
-								<xsl:value-of select="$col" />
-								<xsl:text>,-1</xsl:text>
-							</xsl:attribute>
-						</blockBackground>
-					</xsl:for-each>
-					<xsl:for-each select="/report/info">
-						<xsl:variable name="val" select="attribute::val" />
-						<xsl:variable name="col" select="attribute::number" />
-						<xsl:variable name="row" select="attribute::id" />
-						<xsl:for-each select="/report/legend">
-							<xsl:variable name="val_id" select="attribute::id" />
-							<xsl:variable name="color" select="attribute::color" />
-							<xsl:if test="$val_id = $val ">
-								<blockBackground>
-									<xsl:attribute name="colorName"><xsl:value-of select="$color" /></xsl:attribute>
-									<xsl:attribute name="start">
-										<xsl:value-of select="$col" />
-										<xsl:text>,</xsl:text>
-										<xsl:value-of select="$row + 1" />
-									</xsl:attribute>
-									<xsl:attribute name="stop">
-										<xsl:value-of select="$col" />
-										<xsl:text>,</xsl:text>
-										<xsl:value-of select="$row + 1" />
-									</xsl:attribute>
-								</blockBackground>
-							</xsl:if>
-						</xsl:for-each>
-					</xsl:for-each>
-					<xsl:for-each select="report/employee">
-						<xsl:variable name="dept" select="attribute::id" />
-						<xsl:variable name="row" select="attribute::row" />
-						<xsl:if test="$dept = 1">
-							<blockBackground>
-								<xsl:attribute name="colorName">lightgrey</xsl:attribute>
-								<xsl:attribute name="start">
-									<xsl:text>0,</xsl:text>
-									<xsl:value-of select="$row +1" />
-								</xsl:attribute>
-								<xsl:attribute name="stop">
-									<xsl:text>0,</xsl:text>
-									<xsl:value-of select="$row +1" />
-								</xsl:attribute>
-							</blockBackground>
-						</xsl:if>
-					</xsl:for-each>
-					<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
-					<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
-					<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
-					<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
-					<blockValign value="TOP"/>
-				</blockTableStyle>
-	</xsl:template>
+    <xsl:template name="stylesheet">
+                <paraStyle name="normal" fontName="Helvetica" fontSize="6" alignment="left" />
+                <paraStyle name="normal-title" fontName="Helvetica" fontSize="10" alignment="center"/>
+                <paraStyle name="digits" fontName="Helvetica" fontSize="6" alignment="left"/>
+                <paraStyle name="title" fontName="Helvetica" fontSize="18" alignment="center" />
+                <paraStyle name="dept" fontName="Helvetica-Bold" fontSize="8" alignment="left" />
+                <paraStyle name="employee" fontName="Helvetica-Bold" fontSize="6" textColor="black" />
+                <paraStyle name="leaveid" fontName="Helvetica" fontSize="6" alignment="center" />
+                <paraStyle name="print-date" fontName="Helvetica" fontSize="11" alignment="right" />
+                <paraStyle name="sum" fontName="Helvetica-BoldOblique" fontSize="6" alignment="left" />
+                <paraStyle name="company" textColor="purple" fontName="Helvetica-Bold" fontSize="11" alignment="left"/>
+                <blockTableStyle id="header">
+                       <blockAlignment value="LEFT" start="0,0" stop="-1,-1"/>
+                       <blockFont name="Helvetica" size="8" start="0,0" stop="-1,-1"/>
+                      <blockValign value="TOP"/>
+                   </blockTableStyle>
+                <blockTableStyle id="products">
+                     <blockAlignment value="CENTER" start="1,0" stop="-1,-1"/>
+                     <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+                     <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+                     <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+                     <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+                     <blockFont name="Helvetica-Bold" size="8" start="0,-1" stop="-1,-1"/>
+                     <blockValign value="TOP"/>
+                </blockTableStyle>
+                <blockTableStyle id="legend">
+                    <blockAlignment value="CENTER" start="0,0" stop="-1,-1" />
+                    <blockFont name="Helvetica" size="7" start="0,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+                    <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+                    <blockBackground colorName="#FFFFFF" start="0,0" stop="-1,-1"/>
+                    <xsl:for-each select="/report/legend">
+                        <blockBackground>
+                            <xsl:attribute name="colorName">
+                            <xsl:value-of select="attribute::color" />
+                            </xsl:attribute>
+                            <xsl:attribute name="start">
+                                <xsl:text>0,</xsl:text>
+                                <xsl:value-of select="attribute::row" />
+                            </xsl:attribute>
+                            <xsl:attribute name="stop">
+                                <xsl:text>0,</xsl:text>
+                                <xsl:value-of select="attribute::row" />
+                            </xsl:attribute>
+                        </blockBackground>
+                    </xsl:for-each>
+                    <blockValign value="TOP"/>
+                </blockTableStyle>
+                <blockTableStyle id="month">
+                    <blockAlignment value="CENTER" start="1,0" stop="-1,-1" />
+                    <blockFont name="Helvetica" size="5" start="0,0" stop="-1,-1"/>
+                    <blockFont name="Helvetica-BoldOblique" size="4.5" start="-1,0" stop="-1,-1"/>
+                    <blockBackground colorName="#FFFFFF" start="1,0" stop="-2,1"/>
+                    <xsl:for-each select="/report/days/dayy[@name='Sat' or @name='Sun']">
+                        <xsl:variable name="col" select="attribute::cell" />
+                        <blockBackground>
+                            <xsl:attribute name="colorName">lightgrey</xsl:attribute>
+                            <xsl:attribute name="start">
+                                <xsl:value-of select="$col" />
+                                <xsl:text>,0</xsl:text>
+                            </xsl:attribute>
+                            <xsl:attribute name="stop">
+                                <xsl:value-of select="$col" />
+                                <xsl:text>,-1</xsl:text>
+                            </xsl:attribute>
+                        </blockBackground>
+                    </xsl:for-each>
+                    <xsl:for-each select="/report/info">
+                        <xsl:variable name="val" select="attribute::val" />
+                        <xsl:variable name="col" select="attribute::number" />
+                        <xsl:variable name="row" select="attribute::id" />
+                        <xsl:for-each select="/report/legend">
+                            <xsl:variable name="val_id" select="attribute::id" />
+                            <xsl:variable name="color" select="attribute::color" />
+                            <xsl:if test="$val_id = $val ">
+                                <blockBackground>
+                                    <xsl:attribute name="colorName"><xsl:value-of select="$color" /></xsl:attribute>
+                                    <xsl:attribute name="start">
+                                        <xsl:value-of select="$col" />
+                                        <xsl:text>,</xsl:text>
+                                        <xsl:value-of select="$row + 1" />
+                                    </xsl:attribute>
+                                    <xsl:attribute name="stop">
+                                        <xsl:value-of select="$col" />
+                                        <xsl:text>,</xsl:text>
+                                        <xsl:value-of select="$row + 1" />
+                                    </xsl:attribute>
+                                </blockBackground>
+                            </xsl:if>
+                        </xsl:for-each>
+                    </xsl:for-each>
+                    <xsl:for-each select="report/employee">
+                        <xsl:variable name="dept" select="attribute::id" />
+                        <xsl:variable name="row" select="attribute::row" />
+                        <xsl:if test="$dept = 1">
+                            <blockBackground>
+                                <xsl:attribute name="colorName">lightgrey</xsl:attribute>
+                                <xsl:attribute name="start">
+                                    <xsl:text>0,</xsl:text>
+                                    <xsl:value-of select="$row +1" />
+                                </xsl:attribute>
+                                <xsl:attribute name="stop">
+                                    <xsl:text>0,</xsl:text>
+                                    <xsl:value-of select="$row +1" />
+                                </xsl:attribute>
+                            </blockBackground>
+                        </xsl:if>
+                    </xsl:for-each>
+                    <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+                    <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+                    <blockValign value="TOP"/>
+                </blockTableStyle>
+    </xsl:template>
 
-	<xsl:template name="story">
-	<xsl:variable name="cols_header">
-			<xsl:text>13.7cm,13.7cm</xsl:text>
-	</xsl:variable>
-	<blockTable>
-			<xsl:attribute name="style">header</xsl:attribute>
-			<xsl:attribute name="colWidths"><xsl:value-of select="$cols_header"/></xsl:attribute>
-			<tr>
-				<xsl:for-each select="report/res">
-					<td>
-					<para>
-					</para>
-					</td>
-					<td>
-					<para>
-					</para>
-					</td>
-				</xsl:for-each>
-			</tr>
-		</blockTable>
-		<spacer length="1.0cm" />
-		<para style="title" t="1">Off-Days' Summary</para>
-		<spacer length="0.5cm" />
-		<para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
-		<spacer length="1.0cm" />
-		<xsl:variable name="cols_legend">
-			<xsl:text>0.7cm,5.0cm</xsl:text>
-		</xsl:variable>
-		<blockTable>
-			<xsl:attribute name="style">products</xsl:attribute>
-			<xsl:attribute name="colWidths"><xsl:value-of select="report/cols_months"/></xsl:attribute>
-			<tr>
-			 	<td>Month</td>
-				<xsl:for-each select="report/months">
-					<td>
-						<xsl:value-of select="attribute::name" />
-					</td>
-				</xsl:for-each>
-				<td> </td>
-			</tr>
-		</blockTable>
-
-		<blockTable>
-			<xsl:attribute name="style">month</xsl:attribute>
-			<xsl:attribute name="colWidths"><xsl:value-of select="report/cols" /></xsl:attribute>
-			<tr>
-				<td> </td>
-				<xsl:for-each select="report/days/dayy">
-					<td>
-						<xsl:value-of select="attribute::name" />
-					</td>
-				</xsl:for-each>
-				<td> </td>
-			</tr>
-			<tr>
-				<td><para>
-						<xsl:attribute name="style">employee</xsl:attribute>
-								Departments &amp; Employees
-					</para>
-				</td>
-				<xsl:for-each select="report/days/dayy">
-					<td><para><xsl:attribute name="style">digits</xsl:attribute>
-						<xsl:value-of select="attribute::number" /></para>
-					</td>
-				</xsl:for-each>
-				<td>Sum</td>
+    <xsl:template name="story">
+    <xsl:variable name="cols_header">
+            <xsl:text>13.7cm,13.7cm</xsl:text>
+    </xsl:variable>
+    <blockTable>
+            <xsl:attribute name="style">header</xsl:attribute>
+            <xsl:attribute name="colWidths"><xsl:value-of select="$cols_header"/></xsl:attribute>
+            <tr>
+                <xsl:for-each select="report/res">
+                    <td>
+                    <para>
+                    </para>
+                    </td>
+                    <td>
+                    <para>
+                    </para>
+                    </td>
+                </xsl:for-each>
             </tr>
-			<xsl:apply-templates select="report/employee"/>
-			<xsl:for-each select="report/employee">
-				<xsl:variable name="id" select="attribute::id"/>
-				<xsl:variable name="rw" select="attribute::row"/>
-				<xsl:variable name="sum" select="attribute::sum"/>
-				<tr>
-					<td t="1">
-						<para>
-							<xsl:choose>
-   								 <xsl:when test="$id = 1">
-      							 	<xsl:attribute name="style">dept</xsl:attribute>
-      							 </xsl:when>
-								<xsl:otherwise>
-      								<xsl:attribute name="style">normal</xsl:attribute>
-   								</xsl:otherwise>
-							</xsl:choose>
-							<xsl:value-of select="attribute::name"/>
-						</para>
-					</td>
-					<xsl:for-each select="//report/days/dayy">
-						<xsl:variable name="cell" select="attribute::cell" />
-						<td>
-						<para><xsl:attribute name="style">digits</xsl:attribute>
-						<xsl:value-of select="//employee[@row=$rw]/time-element[@index=$cell]"/>
-						</para>
+        </blockTable>
+        <spacer length="1.0cm" />
+        <para style="title" t="1">Off-Days' Summary</para>
+        <spacer length="0.5cm" />
+        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
+        <spacer length="1.0cm" />
+        <xsl:variable name="cols_legend">
+            <xsl:text>0.7cm,5.0cm</xsl:text>
+        </xsl:variable>
+        <blockTable>
+            <xsl:attribute name="style">products</xsl:attribute>
+            <xsl:attribute name="colWidths"><xsl:value-of select="report/cols_months"/></xsl:attribute>
+            <tr>
+                 <td>Month</td>
+                <xsl:for-each select="report/months">
+                    <td>
+                        <xsl:value-of select="attribute::name" />
+                    </td>
+                </xsl:for-each>
+                <td> </td>
+            </tr>
+        </blockTable>
 
-						</td>
-					</xsl:for-each>
-					<td><para>
-						<xsl:attribute name="style">sum</xsl:attribute><xsl:value-of select="attribute::sum"/></para></td>
-				</tr>
-			</xsl:for-each>
+        <blockTable>
+            <xsl:attribute name="style">month</xsl:attribute>
+            <xsl:attribute name="colWidths"><xsl:value-of select="report/cols" /></xsl:attribute>
+            <tr>
+                <td> </td>
+                <xsl:for-each select="report/days/dayy">
+                    <td>
+                        <xsl:value-of select="attribute::name" />
+                    </td>
+                </xsl:for-each>
+                <td> </td>
+            </tr>
+            <tr>
+                <td><para>
+                        <xsl:attribute name="style">employee</xsl:attribute>
+                                Departments and Employees
+                    </para>
+                </td>
+                <xsl:for-each select="report/days/dayy">
+                    <td><para><xsl:attribute name="style">digits</xsl:attribute>
+                        <xsl:value-of select="attribute::number" /></para>
+                    </td>
+                </xsl:for-each>
+                <td>Sum</td>
+            </tr>
+            <xsl:apply-templates select="report/employee"/>
+            <xsl:for-each select="report/employee">
+                <xsl:variable name="id" select="attribute::id"/>
+                <xsl:variable name="rw" select="attribute::row"/>
+                <xsl:variable name="sum" select="attribute::sum"/>
+                <tr>
+                    <td t="1">
+                        <para>
+                            <xsl:choose>
+                                    <xsl:when test="$id = 1">
+                                       <xsl:attribute name="style">dept</xsl:attribute>
+                                   </xsl:when>
+                                <xsl:otherwise>
+                                      <xsl:attribute name="style">normal</xsl:attribute>
+                                   </xsl:otherwise>
+                            </xsl:choose>
+                            <xsl:value-of select="attribute::name"/>
+                        </para>
+                    </td>
+                    <xsl:for-each select="//report/days/dayy">
+                        <xsl:variable name="cell" select="attribute::cell" />
+                        <td>
+                        <para><xsl:attribute name="style">digits</xsl:attribute>
+                        <xsl:value-of select="//employee[@row=$rw]/time-element[@index=$cell]"/>
+                        </para>
 
-		</blockTable>
-		<spacer length="1cm" />
-		<condPageBreak height="1in" />
-		<blockTable>
-			<xsl:attribute name="style">legend</xsl:attribute>
-			<xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
-			<tr>
-					<td>Color</td>
-					<td>Holiday Type</td>
+                        </td>
+                    </xsl:for-each>
+                    <td><para>
+                        <xsl:attribute name="style">sum</xsl:attribute><xsl:value-of select="attribute::sum"/></para></td>
+                </tr>
+            </xsl:for-each>
 
-			</tr>
-			<xsl:for-each select="report/legend">
-			<tr>
-					<td>
-							<para>
-							<xsl:attribute name="style">digits</xsl:attribute>
-								<xsl:value-of select="attribute::id"/>
-							</para>
-					</td>
-					<td>
-							<para>
-							<xsl:attribute name="style">normal</xsl:attribute>
-								<xsl:value-of select="attribute::name"/>
-							</para>
-					</td>
+        </blockTable>
+        <spacer length="1cm" />
+        <condPageBreak height="1in" />
+        <blockTable>
+            <xsl:attribute name="style">legend</xsl:attribute>
+            <xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
+            <tr>
+                    <td>Color</td>
+                    <td>Holiday Type</td>
+
+            </tr>
+            <xsl:for-each select="report/legend">
+            <tr>
+                    <td>
+                            <para>
+                            <xsl:attribute name="style">digits</xsl:attribute>
+                                <xsl:value-of select="attribute::id"/>
+                            </para>
+                    </td>
+                    <td>
+                            <para>
+                            <xsl:attribute name="style">normal</xsl:attribute>
+                                <xsl:value-of select="attribute::name"/>
+                            </para>
+                    </td>
             </tr>
             </xsl:for-each>
-		</blockTable>
-	</xsl:template>
+        </blockTable>
+    </xsl:template>
 </xsl:stylesheet>
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 7416ff8b0ab..0cf34e36de4 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -38,7 +38,7 @@
           </xpath>
         </field>
     </record>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
     <menuitem
         action="hr.open_board_hr_manager"
         icon="terp-graph"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index f5e74724c25..a38cf0185df 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -49,39 +49,39 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-            	<group>
-            	    <filter icon="terp-go-year" string="Year"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-	                    help="Recruitment performed in current year"/>
-	                <filter icon="terp-go-month" string="Month"
-	                    name="month"
-	                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in current month"/>
-		            <filter icon="terp-go-month"
-	                    string="    Month-1    "
-	                    separator="1"
-	                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment during last month"/>
-	                <separator orientation="vertical"/>
-	                <filter string="New"
-                    	icon="terp-document-new"
-                    	domain="[('state','=','draft')]"
-                    	help = "Draft recruitment"/>
-	                <filter string="In progress"
-	                	icon="terp-check"
-	                	domain="[('state', '=' ,'open')]"
-	                	help = "In progress recruitment"/>
-                   	<filter string="Pending"
-                   		icon="terp-gtk-media-pause"
-                   		domain="[('state','=','pending')]"
-                   		help = "Pending recruitment"/>
+                <group>
+                    <filter icon="terp-go-year" string="Year"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        help="Recruitment performed in current year"/>
+                    <filter icon="terp-go-month" string="Month"
+                        name="month"
+                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Recruitment performed in current month"/>
+                    <filter icon="terp-go-month"
+                        string="    Month-1    "
+                        separator="1"
+                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Recruitment during last month"/>
+                    <separator orientation="vertical"/>
+                    <filter string="New"
+                        icon="terp-document-new"
+                        domain="[('state','=','draft')]"
+                        help = "Draft recruitment"/>
+                    <filter string="In progress"
+                        icon="terp-check"
+                        domain="[('state', '=' ,'open')]"
+                        help = "In progress recruitment"/>
+                       <filter string="Pending"
+                           icon="terp-gtk-media-pause"
+                           domain="[('state','=','pending')]"
+                           help = "Pending recruitment"/>
                     <filter string="Hired"
-                   		icon="terp-camera_test"
-                   		domain="[('state','=','done')]"
-                   		help = "Hired employees"/>
-  					<separator orientation="vertical"/>
-  					<field name="job_id"/>
-					<field name="department_id" widget="selection"/>
+                           icon="terp-camera_test"
+                           domain="[('state','=','done')]"
+                           help = "Hired employees"/>
+                      <separator orientation="vertical"/>
+                      <field name="job_id"/>
+                    <field name="department_id" widget="selection"/>
                     <field name="user_id" string="Responsible">
                         <filter icon="terp-personal"
                             string="My Recruitment"
@@ -108,13 +108,13 @@
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
-            	   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
+                   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+                   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+                   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
 
 
@@ -130,7 +130,7 @@
         <field name="context">{'search_default_month':1,'search_default_department':1,'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" groups="base.group_hr_manager,base.group_hr_user"/>
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
     <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/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 9edd7689484..69ee91d52dc 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 2eda88c4481..740b9b3a2c5 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <record id="base.res_groups_email_template_admin" model="res.groups">
+    <record id="marketing.group_marketing_user" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
 </data>
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index ae5cad3d706..082cafd7054 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,13 +1,13 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,1,1
 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
-"access_email_template_user","email.template","model_email_template","base.res_groups_email_template_admin",1,1,1,1
-"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,1,1
+"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,1,1
 "access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
 "access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
 "access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
diff --git a/addons/marketing_campaign/security/marketing_campaign_security.xml b/addons/marketing_campaign/security/marketing_campaign_security.xml
index bb933fdcdc3..4cb71457c3a 100644
--- a/addons/marketing_campaign/security/marketing_campaign_security.xml
+++ b/addons/marketing_campaign/security/marketing_campaign_security.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="base.res_groups_email_template_admin" model="res.groups">
+        <record id="marketing.group_marketing_user" model="res.groups">
             <field name="name">Marketing / User</field>
         </record>
 
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index c36ac668b45..a181e5ba41d 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -42,8 +42,5 @@
             id="menu_board_manufacturing"
             parent="menus_dash_mrp"
             sequence="1" groups="mrp.group_mrp_manager,mrp.group_mrp_user"/>
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"
-            action="open_board_manufacturing"/>
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7f7c01b044e..c946777b219 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
+            groups="group_mrp_user,group_mrp_manager" sequence="8"/>
 
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
@@ -11,7 +11,7 @@
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
-                  groups="mrp.group_mrp_manager,base.group_system"
+                  groups="mrp.group_mrp_manager"
                   sequence="5" />
 
         <!--
@@ -43,7 +43,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="base.group_system"
+            groups="base.group_extended"
             sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
@@ -111,11 +111,10 @@
             action="mrp_property_action"
             id="menu_mrp_property_action"
             parent="menu_mrp_property"
-            groups="base.group_extended,base.group_system" />
+            groups="base.group_extended" />
         <menuitem
             action="mrp_property_group_action"
             id="menu_mrp_property_group_action"
-            groups="base.group_system"
             parent="menu_mrp_property"/>
 
         <!--
@@ -186,9 +185,9 @@
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                    <group col='15' colspan='4'>
-	                    <field name="code"/>
-	                    <field name="name"/>
-	                    <field name="resource_type"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="resource_type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
@@ -259,10 +258,10 @@
                     <field name="location_id"/>
                     <field name="active" groups="base.group_extended"/>
                     <notebook colspan="4">
-	                    <page string="Work Center Operations">
-	                       <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
-	                    </page>
-	                    <page string="Notes">
+                        <page string="Work Center Operations">
+                           <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
+                        </page>
+                        <page string="Notes">
                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
@@ -434,7 +433,7 @@
             action="mrp_bom_form_action"
             id="menu_mrp_bom_form_action"
             parent="menu_mrp_bom"
-            groups="mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
+            groups="mrp.group_mrp_user,mrp.group_mrp_manager"
             sequence="10"/>
         <menuitem
             action="mrp_bom_form_action2"
@@ -761,7 +760,7 @@
             <field name="context">{'search_default_Current':1}</field>
             <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
         </record>
-        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
 
         <record id="mrp_production_action_planning" model="ir.actions.act_window">
             <field name="name">Manufacturing Orders Planning</field>
@@ -884,10 +883,10 @@
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
                 <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
-					<group colspan="4"  groups="base.group_extended">
-					<separator colspan="4" string="Properties" />
-					<field colspan="4" name="property_ids" nolabel="1"/>
-	                 </group>
+                    <group colspan="4"  groups="base.group_extended">
+                    <separator colspan="4" string="Properties" />
+                    <field colspan="4" name="property_ids" nolabel="1"/>
+                     </group>
                 </xpath>
                </data>
             </field>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index e63ced14997..586f82f1b53 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -62,33 +62,6 @@
 "access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
 "access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
 "access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
-"access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
-"access_product_uom_system","product.uom user.system","product.model_product_uom","base.group_system",1,0,0,0
-"access_product_supplierinfo_system","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
-"access_res_partner_address_system","res.partner.address.system","base.model_res_partner_address","base.group_system",1,0,0,0
-"access_stock_tracking_system","stock.tracking.system","stock.model_stock_tracking","base.group_system",1,0,0,0
-"access_res_partner_system","res.partner.system","base.model_res_partner","base.group_system",1,0,0,0
-"access_product_puom_categ_system","product.uom.categ.system","product.model_product_uom_categ","base.group_system",1,0,0,0
-"access_resource_resource_system","resource.resource.system","resource.model_resource_resource","base.group_system",1,0,0,0
-"access_board_board_system","mrp.board.board.system","board.model_board_board","base.group_system",1,0,0,0
-"access_mrp_production_system","mrp.production.system","model_mrp_production","base.group_system",1,0,0,0
-"access_procurement_system","procurement.order.system","model_procurement_order","base.group_system",1,0,0,0
-"access_workcenter_system","mrp.production.workcenter.line.system","model_mrp_production_workcenter_line","base.group_system",1,0,0,0
-"access_stock_move_mrp_system","stock.move mrp_manager.system","stock.model_stock_move","base.group_system",1,0,0,0
-"access_mrp_production_product_line_system","mrp.production.product.line manager.system","model_mrp_production_product_line","base.group_system",1,0,0,0
-"access_mrp_production_order_system","mrp.production.order.system","model_mrp_production_order","base.group_system",1,0,0,0
-"access_report_workcenter_load_system","report.workcenter.load.system","model_report_workcenter_load","base.group_system",1,0,0,0
-"access_report_mrp_inout_system","report.mrp.inout.system","model_report_mrp_inout","base.group_system",1,0,0,0
-"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
-"access_mrp_routing_system","mrp.routing.system","model_mrp_routing","base.group_system",1,0,0,0
-"access_mrp_routing_workcenter_system","mrp.routing.workcenter.system","model_mrp_routing_workcenter","base.group_system",1,0,0,0
-"access_mrp_bom_system","mrp.bom.system","model_mrp_bom","base.group_system",1,0,0,0
-"access_mrp_bom_revision_system","mrp.bom.revision.system","model_mrp_bom_revision","base.group_system",1,0,0,0
-"access_mrp_property_system","mrp.property.system","procurement.model_mrp_property","base.group_system",1,1,1,1
-"access_mrp_property_group_system","mrp.property.group.system","procurement.model_mrp_property_group","base.group_system",1,1,1,1
-"access_mrp_routing_system","mrp.routing.system","model_mrp_routing","base.group_system",1,1,1,1
-"access_mrp_workcenter_system","mrp.workcenter.system","model_mrp_workcenter","base.group_system",1,0,0,0
-"access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
 "access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
 "access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index cd093fa6ff1..307827265f2 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_mrp_subproduct_user","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_user",1,1,1,1
 "access_mrp_subproduct_manager","mrp.subproduct manager","model_mrp_subproduct","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_subproduct_system","mrp.subproduct system","model_mrp_subproduct","base.group_system",1,0,0,0
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 7453682f566..241ce4c53fe 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem name="Point of Sale" id="menu_point_root" sequence="21"
             icon="terp-partner"
-            groups="group_pos_manager,group_pos_user,base.group_system"/>
+            groups="group_pos_manager,group_pos_user"/>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
@@ -150,7 +150,7 @@
         </record>
 
         <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
-        <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user,base.group_system"/>
+        <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
         <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
@@ -706,7 +706,7 @@
         </record>
 
         <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config_product" sequence="25" groups="base.group_system,group_pos_manager"/>
+            id="menu_point_config_product" sequence="25" groups="group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
             <field name="name">Products</field>
@@ -732,7 +732,7 @@
                     parent="menu_point_config_product"
                     action="action_product_input"
                     id="products_for_input_operations"
-                    groups="base.group_system,group_pos_manager"/>
+                    groups="group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_output">
             <field name="name">Products</field>
@@ -758,7 +758,7 @@
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"
-                    groups="base.group_system,group_pos_manager"/>
+                    groups="group_pos_manager"/>
 
         <menuitem
             name="Input Operations" parent="menu_point_of_sale"
@@ -796,7 +796,7 @@
         </record>
 
         <!--  Miscelleanous Operations/Reporting -->
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager,base.group_system"/>
+        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager"/>
         <!-- Invoice -->
 
         <record model="ir.actions.act_window" id="action_pos_invoice">
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 70a98128c2a..db62c9c8361 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -21,11 +21,9 @@
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","group_pos_user",1,0,0,0
 "access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_user",1,1,1,1
-"access_report_pos_order_system","report.pos.order.system","model_report_pos_order","base.group_system",1,1,1,1
 "access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_manager",1,1,1,1
 "access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","group_pos_user",1,1,1,0
 "access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,1,1,1
-"access_account_bank_statement_system","account.bank.statement system","account.model_account_bank_statement","base.group_system",1,0,0,0
 "access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
 "access_account_invoice_pos","account.invoice pos user","account.model_account_invoice","group_pos_user",1,1,1,0
 "access_account_invoice_pos_manager","account.invoice pos manager","account.model_account_invoice","group_pos_manager",1,0,0,0
@@ -35,10 +33,8 @@
 "access_account_invoice_tax_pos_manager","account.invoice.tax pos manager","account.model_account_invoice_tax","group_pos_manager",1,0,0,0
 "access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
 "access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
-"access_account_period_pos_system","account.period pos system","account.model_account_period","base.group_system",1,0,0,0
 "access_account_fiscalyear_pos_user","account.fiscalyear user","account.model_account_fiscalyear","group_pos_user",1,1,1,0
 "access_account_fiscalyear_pos_manager","account.fiscalyear manager","account.model_account_fiscalyear","group_pos_manager",1,0,0,0
-"access_account_fiscalyear_pos_system","account.fiscalyear user","account.model_account_fiscalyear","base.group_system",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","group_pos_user",1,1,1,0
 "access_account_cashbox_line_manager","account.cashbox.line manager","account.model_account_cashbox_line","group_pos_manager",1,1,1,1
 "access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
@@ -50,31 +46,20 @@
 "access_account_move","account.move","account.model_account_move","group_pos_manager",1,0,0,0
 "access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
 "access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
-"access_account_journal_system","account.journal system","account.model_account_journal","base.group_system",1,0,0,0
 "access_account_journal_period_user","account.journal.period user","account.model_account_journal_period","group_pos_user",1,1,1,1
 "access_account_journal_period_manager","account.journal.period manager","account.model_account_journal_period","group_pos_manager",1,0,0,0
 "access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
 "access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
-"access_account_journal_view_system","account.journal.view system","account.model_account_journal_view","base.group_system",1,0,0,0
 "access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","group_pos_user",1,1,1,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","group_pos_user",1,1,1,0
 "access_account_journal_column","account.journal.column","account.model_account_journal_column","group_pos_user",1,1,1,0
 "access_account_journal_column_manager","account.journal.column manager","account.model_account_journal_column","group_pos_manager",1,0,0,0
-"access_account_journal_column_system","account.journal.column system","account.model_account_journal_column","base.group_system",1,0,0,0
 "access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
-"access_product_product_pos","product.product.pos","product.model_product_product","base.group_system",1,0,0,0
-"access_product_template_pos","product.template pos","product.model_product_template","base.group_system",1,1,1,1
 "access_ir_property_pos_manager","ir.property manager","base.model_ir_property","group_pos_manager",1,1,1,1
-"access_pos_order_system","pos.order system","model_pos_order","base.group_system",1,0,0,0
-"access_pos_order_line_system","pos.order.line system","model_pos_order_line","base.group_system",1,0,0,0
 "access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
 "access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
-"access_report_transaction_pos_system","report.transaction.pos system","model_report_transaction_pos","base.group_system",1,1,1,1
-"access_account_bank_statement_line_system","account.bank.statement.line system","account.model_account_bank_statement_line","base.group_system",1,0,0,0
-"access_product_product_supplierinfo","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
 "access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
 "access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
-"access_product_product_packaging_system","product.packaging system","product.model_product_packaging","base.group_system",1,0,0,0
 "access_product_product_packaging_user","product.packaging user","product.model_product_packaging","group_pos_user",1,0,0,0
 "access_product_product_packaging_manager","product.packaging manager","product.model_product_packaging","group_pos_manager",1,0,0,0
 "access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear manager","account.model_account_sequence_fiscalyear","group_pos_manager",1,0,0,0
diff --git a/addons/process/security/ir.model.access.csv b/addons/process/security/ir.model.access.csv
index 064f0454d02..7356880f47a 100644
--- a/addons/process/security/ir.model.access.csv
+++ b/addons/process/security/ir.model.access.csv
@@ -4,8 +4,3 @@
 "access_process_transition","process.transition","model_process_transition","base.group_user",1,0,0,0
 "access_process_transition_action","process.transition.action","model_process_transition_action","base.group_user",1,0,0,0
 "access_process_condition","process.condition","model_process_condition","base.group_user",1,0,0,0
-"access_process_process_manager","process.process manager","model_process_process","base.group_system",1,1,1,1
-"access_process_node_manager","process.node manager","model_process_node","base.group_system",1,1,1,1
-"access_process_transition_manager","process.transition manager","model_process_transition","base.group_system",1,1,1,1
-"access_process_transition_action_manager","process.transition.action manager","model_process_transition_action","base.group_system",1,1,1,1
-"access_process_condition_manager","process.condition manager","model_process_condition","base.group_system",1,1,1,1
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index b1dadfb3ee0..5bf81a079c6 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -2,7 +2,6 @@
 "access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
 "access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
-"access_stock_warehouse_orderpoint_user","stock.warehouse.orderpoint user","model_stock_warehouse_orderpoint","base.group_system",1,0,0,0
 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
 "access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ef19596d743..d61517d96e9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -196,8 +196,8 @@
             <field name="help">You must define a Product for everything you buy or sell. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information of your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman,base.group_system"/>
-        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,group_product_manager"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman"/>
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,group_product_manager"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 7b8da0dd675..2e4e598fdfe 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -30,14 +30,4 @@
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
 "access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property","product.group_product_manager",1,1,1,1
 "access_product_group_res_partner","res_partner group_product_manager","base.model_res_partner","product.group_product_manager",1,1,1,1
-"access_product_price_type","product.price.type ","model_product_price_type","base.group_system",1,1,1,1
-"access_product_pricelist_type","product.pricelist.type ","model_product_pricelist_type","base.group_system",1,1,1,1
-"access_product_pricelist","product.pricelist ","model_product_pricelist","base.group_system",1,1,1,1
-"access_product_pricelist_version","product.pricelist.version ","model_product_pricelist_version","base.group_system",1,1,1,1
-"access_product_pricelist_item","product.pricelist.item ","model_product_pricelist_item","base.group_system",1,1,1,1
-"access_product_uom_categ","product.uom.categ","model_product_uom_categ","base.group_system",1,1,1,1
-"access_product_uom","product.uom","model_product_uom","base.group_system",1,1,1,1
-"access_product_ul_system","product.ul system","model_product_ul","base.group_system",1,1,1,1
-"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
-"access_product_category_system","product.category.system","model_product_category","base.group_system",1,1,1,1
 "access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 7ebd5f34588..cde2d514560 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
             </field>
         </record>
 
-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager,base.group_system"/>
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager"/>
 
 </data>
 </openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 93a446131eb..8664538f86f 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -137,10 +137,5 @@
             parent="next_id_86"
             sequence="1"/>
 
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10" action="open_board_project"
-            groups="group_project_manager,group_project_user,base.group_system"/>
-
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index df317859e6e..f41018b886d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,10 +5,10 @@
         <menuitem
             icon="terp-project" id="base.menu_main_pm"
             name="Project" sequence="10"
-            groups="group_project_manager,group_project_user,base.group_system,group_project_finance_user"/>
+            groups="group_project_manager,group_project_user,group_project_finance_user"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="base.group_system,group_project_finance_user"/>
+        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="group_project_finance_user"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -497,7 +497,7 @@
             <field name="help">Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="group_project_finance_user"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index dfd61087ea1..a00918bfcd8 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -149,7 +149,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="group_project_finance_user"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index d842574f5ce..f01d05b82ba 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -18,14 +18,7 @@
 "access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0
 "access_task_on_partner","project.task on partners","model_project_task","base.group_user",1,0,0,0
 "access_project_on_partner","project.project on partners","model_project_project","base.group_user",1,0,0,0
-"access_project_task_system","project.task system","model_project_task","base.group_system",1,0,0,0
-"access_project_project_system","project.project system","model_project_project","base.group_system",1,1,1,1
-"access_project_task_work_system","project.task.work system","model_project_task_work","base.group_system",1,0,0,0
-"access_project_task_type_system","project.task.type system","model_project_task_type","base.group_system",1,1,1,1
-"access_report_project_task_user_system","report.project.task.user system","model_report_project_task_user","base.group_system",1,0,0,0
 "access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,0,0,0
-"access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0
 "access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
 "access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
 "access_project_project_project_financial_user","project.project.project.financial.user","model_project_project","group_project_finance_user",1,0,0,0
@@ -35,4 +28,4 @@
 "access_project_board_project_financial_user","board.board.project.financial.user","board.model_board_board","group_project_finance_user",1,0,0,0
 "access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0
 "access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0
-"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
\ No newline at end of file
+"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 07a5fb5011c..318cb365271 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -31,7 +31,7 @@
         <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc.</field>
     </record>
 
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system,project.group_project_finance_user"
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,project.group_project_finance_user"
                 parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 0986ea1570f..42a4790b745 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -5,7 +5,5 @@
 "access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
 "access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
 "access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
-"access_project_gtd_context_system","project.gtd.context system","model_project_gtd_context","base.group_system",1,1,1,1
-"access_project_gtd_timebox_system","project.gtd.timebox system","model_project_gtd_timebox","base.group_system",1,1,1,1
 "access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0
-"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
+"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0f80136f3bb..af99e9efe16 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system,project.group_project_finance_user"/>
+        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="project.group_project_finance_user"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index b113853cbd2..f52df8356a7 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -8,9 +8,6 @@
 "access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
 "access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
 "access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
-"access_project_issue_system","project.issue system","model_project_issue","base.group_system",1,0,0,0
-"access_project_issue_report_system","project.issue.report system","model_project_issue_report","base.group_system",1,0,0,0
-"access_crm_case_section_system","crm.case.section system","crm.model_crm_case_section","base.group_system",1,1,1,1
 "access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0
 "access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
 "access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0
@@ -21,4 +18,4 @@
 "access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
 "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
-"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
\ No newline at end of file
+"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 25bcbe03ccd..15c23202cea 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -3,8 +3,6 @@
 "access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
 "access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
 "access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
-"access_hr_analytic_timesheet_system","hr_analytic_timesheet system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,0,0,0
-"access_hr_timesheet_sheet_sheet_project_system","hr_timesheet_sheet.sheet system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
 "access_hr_analytic_timesheet_project_financial_user","account.analytic.line.timesheet.project.financial.user","account.model_account_analytic_line","project.group_project_finance_user",1,1,1,0
 "access_account_analytic_journal_project_financial_user","account.analytic.journal.project.financial.user","account.model_account_analytic_journal","project.group_project_finance_user",1,1,1,0
 "access_account_fiscalyear_project_financial_user","account.fiscalyear.project.financial.user","account.model_account_fiscalyear","project.group_project_finance_user",1,1,1,0
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 025457de18a..ac6f884f3a4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -382,7 +382,7 @@
             groups="base.group_extended,project.group_project_finance_user"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 08297cee95d..3d91ca956ce 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -3,8 +3,6 @@
 "access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
 "access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
 "access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,0,0,0
-"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
-"access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
 "access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
@@ -13,4 +11,4 @@
 "access_resource_resource_financial_user","resource.resource.financial.user","model_resource_resource","project.group_project_finance_user",1,0,0,0
 "access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0
 "access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0
-"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
\ No newline at end of file
+"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 5c8d4cc5af9..bd0b5c359b2 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -219,7 +219,7 @@
             parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
 
         <!--
             Planning statistics
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index 2c6c92db8ff..c42263370f3 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -8,8 +8,7 @@
 "access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
 "access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_system","report_account_analytic.planning system","model_report_account_analytic_planning","base.group_system",1,0,0,0
 "access_report_account_analytic_planning_financial_user","report_account_analytic.planning.financial.user","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0
 "access_report_account_analytic_planning_stat_financial_user","report_account_analytic.planning.stat.financial.user","model_report_account_analytic_planning_stat","project.group_project_finance_user",1,0,0,0
 "access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
+"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 38599644751..0a4746e185a 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -7,9 +7,6 @@
 "access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
 "access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
 "access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
-"access_scrum_sprint_system","project_scrum.sprint system","model_project_scrum_sprint","base.group_system",1,0,0,0
-"access_scrum_product_backlog_system","project_scrum.product.backlog system","model_project_scrum_product_backlog","base.group_system",1,0,0,0
-"access_scrum_meeting_system","project_scrum.meeting system","model_project_scrum_meeting","base.group_system",1,0,0,0
 "access_project_scrum_backlog_financial_user","project_scrum.product.backlog.financial.user","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0
 "access_project_scrum_sprint_financial_user","project_scrum.sprint.financial.user","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0
-"access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
+"access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 8f10009fa12..54e35956248 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -2,7 +2,5 @@
 "access_report_timesheet_task_user_manager","report.timesheet.task.user.manager","model_report_timesheet_task_user","project.group_project_manager",1,1,1,1
 "access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
 "access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
-"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system","hr.timesheet.sheet.sheet.system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,1,1,1
 "access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0
 "access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index ffcd14213f2..28394102922 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -156,7 +156,6 @@
             id="menu_board_purchase"
             parent="menu_purchase_deshboard"
             sequence="4"/>
-        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" groups="base.group_system,group_purchase_manager,group_purchase_user,base.group_extended" action="open_board_purchase"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f56d41a4692..f825a11cac5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" groups="base.group_system,group_purchase_manager,group_purchase_user,base.group_extended"/>
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
+           groups="group_purchase_manager,group_purchase_user"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1" />
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 14cc9523951..274b6973ea8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-            
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
-            groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
+            groups="base.group_sale_salesman,base.group_sale_manager"/>
+
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 3675ccf32ae..426d30b52fe 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -2,7 +2,6 @@
 "access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,0,0,0
 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
-"access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
 "access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
 "access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
 "access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,0
@@ -23,7 +22,6 @@
 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
 "access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
 "access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0
-"access_res_partner_sale_system","res.partner.sale.system","base.model_res_partner","base.group_system",1,0,0,0
 "access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
 "access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
 "access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
@@ -36,18 +34,8 @@
 "access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
 "access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,0
 "access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0
-"access_res_country_system","res.country system","base.model_res_country","base.group_system",1,1,1,1
-"access_res_country_state_system","res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
-"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
-"access_sale_order_system","sale.order.system","model_sale_order","base.group_system",1,0,0,0
-"access_sale_order_line_system","sale.order.line.system","model_sale_order_line","base.group_system",1,0,0,0
-"access_product_product_system","product.product.system","product.model_product_product","base.group_system",1,0,0,0
-"access_stock_picking_system","stock.picking.system","stock.model_stock_picking","base.group_system",1,0,0,0
-"access_sale_report_system","sale.report.system","model_sale_report","base.group_system",1,0,0,0
-"access_ir_attachment_system","ir.attachment.system","base.model_ir_attachment","base.group_system",1,0,0,0
 "access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0
 "access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_res_partner_bank_type_system","res.partner.bank.type.system","base.model_res_partner_bank_type","base.group_system",1,0,0,0
 "access_stock_warehouse_manager","stock.warehouse.manager","stock.model_stock_warehouse","base.group_sale_manager",1,0,0,0
 "access_product_uom_manager","product.uom.manager","product.model_product_uom","base.group_sale_manager",1,0,0,0
 "access_product_supplierinfo_manager","product.supplierinfo.manager","product.model_product_supplierinfo","base.group_sale_manager",1,0,0,0
@@ -60,6 +48,5 @@
 "access_res_partner_bank_type_field_user","res.partner.bank.type.field.user","base.model_res_partner_bank_type_field","base.group_sale_salesman",1,0,0,0
 "access_product_uom_user","product.uom.user","product.model_product_uom","base.group_sale_salesman",1,0,0,0
 "access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_field_system","res.partner.bank.type.field.system","base.model_res_partner_bank_type_field","base.group_system",1,0,0,0
 "access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 1567c5662bb..4485769cd62 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,7 +1,7 @@
 <openerp>
    <data>
         <menuitem id="base.menu_base_config" name="Configuration" parent="base.menu_base_partner" sequence="30"
-            groups="base.group_sale_salesman,base.group_system,base.group_sale_manager"/>
+            groups="base.group_sale_salesman,base.group_sale_manager"/>
         <menuitem id="menu_sale_journal_config" name="Sale Journals"
             parent="base.menu_base_config" sequence="5" groups="base.group_sale_salesman"/>
 
@@ -431,7 +431,7 @@
             <field name="search_view_id" ref="view_picking_journal_search"/>
         </record>
 
-        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal" groups="base.group_system"/>
+        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/>
 
         <record model="ir.actions.act_window" id="action_invoice_type_tree">
             <field name="name">Picking by invoice_method</field>
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index 645ee5bd534..dcee2bd1f4e 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -10,9 +10,4 @@
 "access_sale_journal_picking_journal_stock_worker","sale_journal.picking.journal stock worker","model_sale_journal_picking_journal","stock.group_stock_user",1,0,0,0
 "access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
 "access_sale_journal_sale_journal_report_manager","sale_journal_sale_journal_report_manager","model_sale_journal_report","base.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_report_system","sale_journal_sale_journal_report_system","model_sale_journal_report","base.group_system",1,0,0,0
 "access_sale_journal_picking_report","sale_journal_picking_report","model_sale_journal_picking_report","stock.group_stock_manager",1,1,1,1
-"access_sale_journal_picking_journal","sale_journal_picking_journal","model_sale_journal_picking_journal","base.group_system",1,1,1,1
-"access_stock_picking_journal_system","stock_picking_journal_system","stock.model_stock_picking","base.group_system",1,1,1,1
-"access_sale_journal_invoice_type_system","sale_journal.invoice.type.system","model_sale_journal_invoice_type","base.group_system",1,1,1,1
-"access_sale_journal_sale_journal_system","sale_journal.sale.journal.system","model_sale_journal_sale_journal","base.group_system",1,1,1,1
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index ac8acb2922f..fd68f0a2eb5 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -6,7 +6,7 @@
         </record>
 
 
-		<record id="action_incoming_product_board" model="ir.actions.act_window">
+        <record id="action_incoming_product_board" model="ir.actions.act_window">
             <field name="name">Incoming Product</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
@@ -16,33 +16,33 @@
             <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
-		<record id="action_outgoing_product_board" model="ir.actions.act_window">
+        <record id="action_outgoing_product_board" model="ir.actions.act_window">
             <field name="name">Outgoing Product</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
-			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+            <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
-		<record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
-			<field name="res_model">report.stock.move</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree</field>
-			<field name="domain">[('type','=','in')]</field>
-			<field name="view_id" ref="stock.view_stock_graph_board"></field>
-			<field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+        <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
+            <field name="res_model">report.stock.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','in')]</field>
+            <field name="view_id" ref="stock.view_stock_graph_board"></field>
+            <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
-		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
-			<field name="res_model">report.stock.move</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree</field>
-			<field name="domain">[('type','=','out')]</field>
-			<field name="view_id" ref="stock.view_stock_graph_board"></field>
-			<field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+        <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
+            <field name="res_model">report.stock.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','out')]</field>
+            <field name="view_id" ref="stock.view_stock_graph_board"></field>
+            <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
-		<record id="board_warehouse_form" model="ir.ui.view">
+        <record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
@@ -50,8 +50,8 @@
                 <form string="Warehouse board">
                     <hpaned position="200">
                         <child1>
-					    	<action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
-					    	<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
+                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
+                            <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
                         </child1>
 
                         <child2>
@@ -71,9 +71,9 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-		<menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
+        <menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
+        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 892c298d5d5..507f475a13e 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -243,7 +243,7 @@
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
     </record>
-    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_system,base.group_user"/>
+    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_user"/>
 
 
 </data>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index e879a03e9e1..4d9c44edd79 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -9,40 +9,26 @@
 "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
 "access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
 "access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
-"access_stock_tracking_system","stock.tracking systen","model_stock_tracking","base.group_system",1,0,0,0
 "access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
 "access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,0,0,0
-"access_stock_picking_system","stock.picking system","model_stock_picking","base.group_system",1,0,0,0
 "access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
-"access_stock_production_lot_system","stock.production.lot system","model_stock_production_lot","base.group_system",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","stock.group_stock_user",1,1,1,1
 "access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1
 "access_stock_move_manager","stock.move manager","model_stock_move","stock.group_stock_manager",1,0,0,0
 "access_stock_move_user","stock.move user","model_stock_move","stock.group_stock_user",1,1,1,1
-"access_stock_move_system","stock.move system","model_stock_move","base.group_system",1,0,0,0
 "access_stock_inventory_user","stock.inventory user","model_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_system","stock.inventory system","model_stock_inventory","base.group_system",1,0,0,0
 "access_stock_inventory_manager","stock.inventory manager","model_stock_inventory","stock.group_stock_manager",1,0,0,0
 "access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
 "access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
-"access_stock_inventory_line_system","stock.inventory.line system","model_stock_inventory_line","base.group_system",1,0,0,0
 "access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
 "access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
 "access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
 "access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
-"access_stock_lines_date_system","report.stock.lines.date system","model_report_stock_lines_date","base.group_system",1,0,0,0
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
 "access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
-"access_report_stock_move_system","report.stock.move system","model_report_stock_move","base.group_system",1,0,0,0
 "access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
 "access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
 "access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
-"access_report_stock_inventory_system","report.stock.inventory system","model_report_stock_inventory","base.group_system",1,0,0,0
-"access_stock_warehouse_system","stock.warehouse.system","model_stock_warehouse","base.group_system",1,1,1,1
-"access_stock_location_system","stock.location.system","model_stock_location","base.group_system",1,1,1,1
-"access_stock_journal_system","stock.journal.system","model_stock_journal","base.group_system",1,1,1,1
-"access_product_product_stock","product_product_stock","product.model_product_product","base.group_system",1,0,0,0
-"access_product_template_stock_system","product.template stock system","product.model_product_template","base.group_system",1,0,0,0
 "access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,1,1,1
 "access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1
 "access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 60be468d17e..717486413c6 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -9,10 +9,6 @@
         <field name="name">Warehouse / User</field>
     </record>
 
-    <record model='ir.ui.menu' id='menu_stock_root'>
-        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user'),ref('base.group_system')])]"/>
-    </record>
-
 <!-- multi -->
 
     <record model="ir.rule" id="stock_picking_rule">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e3d1bf80b25..9008b862cf2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -7,8 +7,8 @@
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
-        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager,base.group_system"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager,base.group_system"/>
+        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
@@ -512,7 +512,7 @@
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
             <field name="help">Define your locations in order to reflect to your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partners location (customers, suppliers) and virtual locations which are the counter-part of the stock operations like the manufacturing orders consummations, the inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location into the Stock location. Each report can be performed on physicals, partners or virtual locations.</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system,group_stock_manager"/>
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="group_stock_manager"/>
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -574,7 +574,7 @@
             <field name="view_id" ref="view_warehouse_tree"/>
             <field name="help">Create and manage your warehouses and assign them a location from here</field>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager,base.group_system"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager"/>
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index d4d543e25c4..d83c6d2f4d8 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,8 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning_system","stock.planning system","model_stock_planning","base.group_system",1,0,0,0
 "access_stock_planning_manager","stock.planning manager","model_stock_planning","stock.group_stock_manager",1,0,0,0
 "access_stock_planning_user","stock.planning user","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_period_","stock.period","model_stock_period","base.group_system",1,1,1,1
 "access_stock_sale_forecast_user","stock.sale.forecast user","model_stock_sale_forecast","base.group_sale_salesman",1,1,1,1
 "access_stock_sale_forecast_manager","stock.sale.forecast manager","model_stock_sale_forecast","base.group_sale_manager",1,0,0,0
-"access_stock_sale_forecast_system","stock.sale.forecast system","model_stock_sale_forecast","base.group_system",1,0,0,0
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 704703cb13a..8d8c3cd3790 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem id="menu_stock_period_main"
                   name="Stock and Sales Periods"
-                  parent="base.menu_base_config" groups="base.group_system" sequence="20"/>
+                  parent="base.menu_base_config" sequence="20"/>
 
         <!-- Periods tree and form section -->
 
@@ -182,7 +182,7 @@
         <!-- Forecast section -->
         
         <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
-                parent="base.menu_base_partner" sequence="6" groups="base.group_extended,base.group_system"/>
+                parent="base.menu_base_partner" sequence="6" groups="base.group_extended"/>
 
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 9730031f630..8afd0435a41 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,7 +6,7 @@
 
        <menuitem name="Configuration"
            id="knowledge.menu_document_configuration"
-           parent="knowledge.menu_document" sequence="50" groups="base.group_system" />
+           parent="knowledge.menu_document" sequence="50"/>
 
        <menuitem name="Wiki" id="menu_wiki_configuration"
            parent="knowledge.menu_document_configuration" sequence="2" />

From f78f3a612c01b230ed746a283d33cd009b4f36c4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 16 Oct 2010 18:55:29 +0200
Subject: [PATCH 272/294] fix

bzr revid: fp@tinyerp.com-20101016165529-wyze4cm75c7dp52m
---
 addons/email_template/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 6aa4899feb6..9469104bd27 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -26,7 +26,7 @@
     "author" : "Sharoon Thomas, Openlabs",
     "website" : "http://openerp.com",
     "category" : "Added functionality",
-    "depends" : ['base'],
+    "depends" : ['marketing'],
     "description": """
     Email Template is extraction of Power Email basically just to send the emails.
     """,

From 6c04db324f382ff3509f2c306b12852c1d8b271d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 00:12:35 +0200
Subject: [PATCH 273/294] fix

bzr revid: fp@tinyerp.com-20101016221235-pypfyqie30a3b9bo
---
 addons/email_template/security/email_template_security.xml    | 4 ----
 addons/event/__openerp__.py                                   | 2 +-
 .../security/marketing_campaign_security.xml                  | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index 0055c4e1c40..e3f3401217c 100755
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="0">
 
-        <record id="marketing.group_marketing_user" model="res.groups">
-            <field name="name">Marketing / User</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 4e65009f422..9f479a2d941 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@
                 Events / Reporting
 """,
     'author': 'OpenERP SA',
-    'depends': ['crm', 'base_contact', 'account'],
+    'depends': ['crm', 'base_contact', 'account', 'marketing'],
     'init_xml': [],
     'update_xml': [
         'security/event_security.xml',
diff --git a/addons/marketing_campaign/security/marketing_campaign_security.xml b/addons/marketing_campaign/security/marketing_campaign_security.xml
index 4cb71457c3a..14710cf8f37 100644
--- a/addons/marketing_campaign/security/marketing_campaign_security.xml
+++ b/addons/marketing_campaign/security/marketing_campaign_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data>
 
-        <record id="marketing.group_marketing_user" model="res.groups">
-            <field name="name">Marketing / User</field>
-        </record>
-
     </data>
 </openerp>

From 7db404095e1651869797c32b6d7ebf3ed2d0b32f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 01:13:43 +0200
Subject: [PATCH 274/294] useability

bzr revid: fp@tinyerp.com-20101016231343-s1inb6jdnss0gme1
---
 addons/product/product.py   | 8 ++------
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 3e4d48e5c74..91a823d1a98 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -283,12 +283,8 @@ class product_template(osv.osv):
         return res and res[1] or False
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
-        if uom_id and uom_po_id:
-            uom_obj=self.pool.get('product.uom')
-            uom=uom_obj.browse(cursor,user,[uom_id])[0]
-            uom_po=uom_obj.browse(cursor,user,[uom_po_id])[0]
-            if uom.category_id.id != uom_po.category_id.id:
-                return {'value': {'uom_po_id': uom_id}}
+        if uom_id:
+            return {'value': {'uom_po_id': uom_id}}
         return False
 
     _defaults = {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9008b862cf2..8c3bc3ddcec 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" groups="group_stock_manager,group_stock_user" sequence="5"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,group_stock_user,base.group_extended"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>

From 8d662b4992b9dedce1c93dffc620001fecb661c4 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 17 Oct 2010 04:54:00 +0000
Subject: [PATCH 275/294] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101017045400-jjnv7ydqseuecyuq
---
 addons/account/i18n/mn.po              |  28 +-
 addons/account_anglo_saxon/i18n/mn.po  |   6 +-
 addons/account_cancel/i18n/mn.po       |   6 +-
 addons/account_payment/i18n/ru.po      |   4 +-
 addons/audittrail/i18n/ru.po           |   4 +-
 addons/base_contact/i18n/sr.po         |   6 +-
 addons/base_iban/i18n/sr.po            |   6 +-
 addons/base_module_quality/i18n/it.po  |   8 +-
 addons/base_module_quality/i18n/sr.po  |   6 +-
 addons/base_module_record/i18n/sr.po   |   6 +-
 addons/base_report_creator/i18n/sr.po  |   6 +-
 addons/base_report_designer/i18n/sr.po |   6 +-
 addons/claim_from_delivery/i18n/sr.po  |  60 +++
 addons/crm_profiling/i18n/sr.po        |   6 +-
 addons/decimal_precision/i18n/ru.po    |   4 +-
 addons/decimal_precision/i18n/sr.po    |  88 ++++
 addons/delivery/i18n/ru.po             |   4 +-
 addons/document/i18n/sr.po             | 653 +++++++++++++++++++++++++
 addons/document_ics/i18n/sr.po         | 334 +++++++++++++
 addons/document_webdav/i18n/sr.po      |  31 ++
 addons/email_template/i18n/sr.po       |   6 +-
 addons/event/i18n/sr.po                | 646 ++++++++++++++++++++++++
 addons/event_project/i18n/it.po        |   8 +-
 addons/event_project/i18n/sr.po        |  88 ++++
 addons/fetchmail/i18n/sr.po            | 274 +++++++++++
 addons/google_map/i18n/sr.po           |  51 ++
 addons/hr_evaluation/i18n/ru.po        |   4 +-
 addons/mrp_operations/i18n/sr.po       |   6 +-
 addons/mrp_repair/i18n/sr.po           |   6 +-
 addons/mrp_subproduct/i18n/sr.po       |   6 +-
 addons/product/i18n/sr.po              |   6 +-
 addons/purchase/i18n/ru.po             |   6 +-
 addons/sale/i18n/mn.po                 |  63 ++-
 addons/sale/i18n/ru.po                 |  14 +-
 addons/stock_no_autopicking/i18n/it.po |   8 +-
 35 files changed, 2350 insertions(+), 114 deletions(-)
 create mode 100644 addons/claim_from_delivery/i18n/sr.po
 create mode 100644 addons/decimal_precision/i18n/sr.po
 create mode 100644 addons/document/i18n/sr.po
 create mode 100644 addons/document_ics/i18n/sr.po
 create mode 100644 addons/document_webdav/i18n/sr.po
 create mode 100644 addons/event/i18n/sr.po
 create mode 100644 addons/event_project/i18n/sr.po
 create mode 100644 addons/fetchmail/i18n/sr.po
 create mode 100644 addons/google_map/i18n/sr.po

diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 4c9ccd539ba..6c82bfecfd2 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-16 04:44+0000\n"
-"Last-Translator: Гоби <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 07:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3498,7 +3498,9 @@ msgstr "Өдрийн огноо"
 msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
-msgstr "Өөр валютаар ил�рхийл��н дүн байна"
+msgstr ""
+"Х�р�в �н� гүйлг�� гадаад валютаар хийгд��н бол гүйлг��ний дүнг гадаад "
+"валютаар ил�рхийлн�."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3599,7 +3601,7 @@ msgstr "Шин� нийлүүл�гчийн буцаалт"
 #. module: account
 #: view:account.model:0
 msgid "Entry Model"
-msgstr "Гүйлг��ний модель"
+msgstr "Гүйлг��ний загвар"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3764,7 +3766,7 @@ msgstr "Биел�х огноо"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "захиалгын бичилт"
+msgstr "Гүйлг��ний т�мд�гл�л"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -4126,6 +4128,8 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
+"Журналын бичилт нь холбогдох харилцагчийн хувьд маргаантай г�ж үзв�л �н� "
+"нүдийг �онгох х�р�гт�й"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4478,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд"
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr "Бүртг�л загвар шугам"
+msgstr "Гүйлг��ний загварын мөр"
 
 #. module: account
 #: view:account.tax.template:0
@@ -5276,9 +5280,7 @@ msgstr "Томьёолол"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
-"Тухайн дан�ны валютаа� өөр валютаар бичилт хийх үед х�р�гл�гд�х валютын "
-"төрөл."
+msgstr "Гадаад валютын гүйлг�� бол валютыг �онгоно."
 
 #. module: account
 #: view:account.invoice:0
@@ -5368,7 +5370,7 @@ msgstr "PRO-FORMA"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Х���гчил��н журналын бичилт"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5899,7 +5901,7 @@ msgstr "Бичилт тулгах"
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Бичилт"
+msgstr "�жил гүйлг��"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -6044,7 +6046,7 @@ msgstr "Х�р�гл�гч уг дан�ны гүйлг��г банкны ху
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr ""
+msgstr "Гүйлг��ний огноо тооцоолол"
 
 #. module: account
 #: view:board.board:0
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
index 5c016a4b0ea..2fd75bcc245 100644
--- a/addons/account_anglo_saxon/i18n/mn.po
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-10-15 11:31+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
index 29ccc3a3db9..0750c13f415 100644
--- a/addons/account_cancel/i18n/mn.po
+++ b/addons/account_cancel/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-10-15 11:33+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 08:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_cancel
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index 04dc80f93c7..0ab2bcf63ff 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 11:34+0000\n"
+"PO-Revision-Date: 2010-10-16 09:33+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index cf6d78603e0..30a63c8c88d 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 12:05+0000\n"
+"PO-Revision-Date: 2010-10-16 09:06+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
index 9a727107d05..b8dc4170bdf 100644
--- a/addons/base_contact/i18n/sr.po
+++ b/addons/base_contact/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 11:50+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index a7322e54490..cd0a36c5208 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 11:58+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 6f151909339..72b5fbe607d 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 08:17+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -38,7 +38,7 @@ msgstr "Modulo base di qualità"
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Valuta Modulo"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 8459f9c8d98..83992eb2640 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 12:04+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 11:23+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 227308f8233..40a3beef7c4 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 12:24+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 10:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index 661e7d96bb0..d8c008b6b9e 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 12:52+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:40+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index 380fd397706..74bacc3daa9 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 13:03+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:24+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/claim_from_delivery/i18n/sr.po b/addons/claim_from_delivery/i18n/sr.po
new file mode 100644
index 00000000000..602957aa82a
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/sr.po
@@ -0,0 +1,60 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 12:02+0000\n"
+"PO-Revision-Date: 2010-10-16 08:05+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Zahtev"
+
+#. module: claim_from_delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: claim_from_delivery
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Kreiraj Zahtev iz Naloga Isporuke\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Zahtev od Isporuke"
+
+#. module: claim_from_delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: claim_from_delivery
+#: model:ir.model,name:claim_from_delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna Lista"
+
+#. module: claim_from_delivery
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Partner"
diff --git a/addons/crm_profiling/i18n/sr.po b/addons/crm_profiling/i18n/sr.po
index a9e8c5a0a5d..3f30558a333 100644
--- a/addons/crm_profiling/i18n/sr.po
+++ b/addons/crm_profiling/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 11:26+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/decimal_precision/i18n/ru.po b/addons/decimal_precision/i18n/ru.po
index 9540d916491..f9d9d6a3f5b 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-10-15 12:07+0000\n"
+"PO-Revision-Date: 2010-10-16 10:39+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/decimal_precision/i18n/sr.po b/addons/decimal_precision/i18n/sr.po
new file mode 100644
index 00000000000..df13c1328b8
--- /dev/null
+++ b/addons/decimal_precision/i18n/sr.po
@@ -0,0 +1,88 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 05:24+0000\n"
+"PO-Revision-Date: 2010-10-16 17:13+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Brojevi"
+
+#. module: decimal_precision
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: decimal_precision
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: decimal_precision
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Decimalna Preiznost"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Definicija Decimalne Preciznosti"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Ovaj modul vam omogucava za zaokruzujete cene na potrebne vrednosti za "
+"nekoliko nacina\n"
+"koriscenja: Racunanje, prodaja, nabavka ...\n"
+"\n"
+"Preciznost definisete za celo preduzece.\n"
+
+#. module: decimal_precision
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Koriscenje"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Podesavanje Decimalne Preciznosti"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index dafebaa043b..1049fb707fe 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 12:51+0000\n"
+"PO-Revision-Date: 2010-10-16 09:49+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po
new file mode 100644
index 00000000000..5ee380e0785
--- /dev/null
+++ b/addons/document/i18n/sr.po
@@ -0,0 +1,653 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 18:19+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document
+#: field:document.directory,create_date:0
+msgid "Date Created"
+msgstr "Datum kreiranja"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Å ifra resursa"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Uklju�i naziv zapisa"
+
+#. module: document
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "ID modela"
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Greška! Ne možete kreirati rekurzivne direktorijume."
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_configuration
+msgid "Document Configuration"
+msgstr "Podesavanja Dokumenta"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Preview"
+msgstr "Pregled"
+
+#. module: document
+#: field:ir.attachment,store_method:0
+msgid "Storing Method"
+msgstr "Metoda cuvanja"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr "Auto Podesavanje Direktorijuma"
+
+#. module: document
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr "Veli�ina Datoteke"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file start by the record "
+"name."
+msgstr ""
+"Uklju�ite ovu opciju ako želite da naziv datoteke po�inje s nazivom zapisa"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Other Resources"
+msgstr "Drugi resursi"
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Roditeljski Model"
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Document Management System."
+msgstr "Sistem za Upravljanje Dokumentima"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Dodatak"
+
+#. module: document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "Stati�ki Direktorijum"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tip sadržaja Direktoriuma"
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+"Koristite domen ako želite postaviti automatski filter nad vidljivim "
+"resursima"
+
+#. module: document
+#: help:document.directory,ressource_tree:0
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
+msgstr ""
+"Odaberite ovu opciju ako želite koristiti istu strukturu stabla kao odabrani "
+"objekat sistema."
+
+#. module: document
+#: field:document.directory,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directorie's Structure"
+msgstr "Struktura Direktorijuma"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Item"
+msgstr "Roditeljska Stavka"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "File Information"
+msgstr "Informacije o Fajlu"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:ir.attachment:0
+msgid "Files"
+msgstr "Fajlovi"
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "Sacuvano IMe Fajla"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Korisnik poslednje promene"
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Configure"
+msgstr "Podesi"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struktura Stabla"
+
+#. module: document
+#: field:ir.attachment,title:0
+msgid "Resource Title"
+msgstr "Naslov resursa"
+
+#. module: document
+#: model:ir.actions.todo,note:document.config_auto_directory
+msgid ""
+"This wizard will configure the URL of the server of the document management "
+"system."
+msgstr ""
+"Ovaj ćecarobnjak podesiti URL server sistema za upravljanje dokumentima."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Sadržaj Direktorijuma"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Don't put a parent directory if you select a parent model."
+msgstr ""
+"Ako ovdje postavite objekt, predložak ove mape će biti prikazan ispod svih "
+"takvih objekata. Nemojte postaviti mapu roditelja ako odabirete model "
+"roditelja."
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document
+msgid "Document Management"
+msgstr "Upravljanje Dokumentima"
+
+#. module: document
+#: selection:ir.attachment,store_method:0
+msgid "Link"
+msgstr "Veza"
+
+#. module: document
+#: view:document.directory:0
+msgid "Directory Type"
+msgstr "Tip Direktorijuma"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:ir.attachment,group_ids:0
+msgid "Groups"
+msgstr "Grupe"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Izveštaj"
+
+#. module: document
+#: help:document.configuration.wizard,host:0
+msgid ""
+"Put here the server address or IP. Keep localhost if you don't know what to "
+"write."
+msgstr ""
+"Ovdje upišite adresu servera ili IP adresu. Ostavite localhost ako ne znate "
+"Å¡ta da napisete."
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid ""
+"This wizard will automatically configure the document management system "
+"according to modules installed on your system."
+msgstr ""
+"Ovaj Carobnjak će automatski postaviti sistem za upravljanje dokumentima "
+"ovisno o modulima koji su instalirani na vašem sistemu."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Data"
+msgstr "Podaci"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Indeksirani sadržaj"
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Definicija"
+
+#. module: document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"    * FTP Interface\n"
+"    * User Authentication\n"
+"    * Document Indexation\n"
+msgstr ""
+"Ovo je kompletni sistem za upravljanje dokumentima:\n"
+"* FTP interfejs\n"
+"* Autentifikacija korisnika\n"
+"* Indeksiranje dokumenata\n"
+
+#. module: document
+#: field:document.directory,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Ekstenzija"
+
+#. module: document
+#: selection:ir.attachment,store_method:0
+msgid "Database"
+msgstr "Baza Podataka"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Virtualne datoteke"
+
+#. module: document
+#: view:document.directory:0
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Direktorijumi"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Sekv."
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Integrisani sistem za upravljanje dokumentima"
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:ir.attachment,parent_id:0
+msgid "Directory"
+msgstr "Direktorijum"
+
+#. module: document
+#: field:document.directory,user_id:0
+#: field:ir.attachment,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration_wizard
+msgid "document.configuration.wizard"
+msgstr "document.configuration.wizard"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Pridruženo"
+
+#. module: document
+#: selection:ir.attachment,store_method:0
+msgid "Filesystem"
+msgstr "Fajl sistem"
+
+#. module: document
+#: field:document.directory,file_type:0
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Tip Sadrzaja"
+
+#. module: document
+#: view:document.directory:0
+#: view:ir.attachment:0
+msgid "Security"
+msgstr "Bezbednost"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_browse
+msgid "Browse Files Using FTP"
+msgstr "Pregledaj datoteke koristeći FTP"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Directories Mapped to Objects"
+msgstr "Direktorijumi vezani uz objekte"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and Open ERP will create a mapping for each of these "
+"objects, using the given domain, when browsing through FTP."
+msgstr ""
+"Ovdje odaberite objekt i Open ERP će uspostaviti mapiranje za svaki od ovih "
+"objekata, koristeći zadani domen, prilikom predleda kroz FTP."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Others Info"
+msgstr "Ostale informacije"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Domen"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Datum Izmene"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Sufiks"
+
+#. module: document
+#: field:document.configuration.wizard,host:0
+msgid "Server Address"
+msgstr "Adresa Servera"
+
+#. module: document
+#: model:ir.actions.url,name:document.action_document_browse
+msgid "Browse Files"
+msgstr "Pretraži Fajlove"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Naziv sadržaja"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Direktorijum dokumenta"
+
+#. module: document
+#: field:document.directory,create_uid:0
+msgid "Creator"
+msgstr "Kreator"
+
+#. module: document
+#: view:document.directory:0
+msgid "Auto-Generated Files"
+msgstr "Auto-Generisani Fajlovi"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Search a File"
+msgstr ""
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Auto Configure"
+msgstr "Auto Podesavanje"
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: document
+#: field:ir.attachment,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "PDF izveštaj"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Tip Dokumenta"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Podređeni"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Sadržaj"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Falova za Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Zid Srama"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Detalji Fajlova po Partneru"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Svi meseci"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Moji Fajlovi"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Fajlovi po Korisniku"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Fajlova za Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Moji Fajlovi (svi Meseci)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Zadnje postavljeno Ime Fajla"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Izveštavanje"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Korisnici koji jedan celi mjesec nisu unijeli Dokument"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Fajlovi po Partneru"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Ovog meseca"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Svi Korisnikovi fajlovi"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Moji Fajlovi(Ovaj Mesec)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Detalji fajlova po Korisnicima"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# Fajlova"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Fajlovi po Korisnicima"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Upravljanje Dokumentima - Izveštavanje"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Fajlovi svih Korisnika (Svi meseci)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Detalji Fajlova po Direktorijumu"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Izmjenjen Datum"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Veli�ina fajlova po Mesecu"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Ime fajla"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Fajlovi po Mesecu"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Fajlovi po Tipu Izvora"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Svi Korisnicki Fajlovi ( Ovaj Mesec)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Zadnje postavljeno Vrijeme"
diff --git a/addons/document_ics/i18n/sr.po b/addons/document_ics/i18n/sr.po
new file mode 100644
index 00000000000..1ea7c46633f
--- /dev/null
+++ b/addons/document_ics/i18n/sr.po
@@ -0,0 +1,334 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 18:48+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_ics
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "uid"
+msgstr "uid"
+
+#. module: document_ics
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Greška! Ne možete kreirati rekurzivne direktorijume."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,jobs:0
+msgid "Jobs Hiring Process"
+msgstr "Proces zapošljavanja"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure Calendars for CRM Sections"
+msgstr "Konfigurisi kalendare za CRM Sekcije"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,helpdesk:0
+msgid "Helpdesk"
+msgstr "Helpdesk"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,field_id:0
+msgid "Open ERP Field"
+msgstr "Otvori ERP Polje"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Next"
+msgstr "Sledeće"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,content_id:0
+msgid "Content"
+msgstr "Sadržaj"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,meeting:0
+msgid "Calendar of Meetings"
+msgstr "Kalendar Sastanaka"
+
+#. module: document_ics
+#: model:crm.case.section,name:document_ics.section_meeting
+msgid "Shared Calendar Meetings"
+msgstr "Sastanci zajedni�kog kalendara"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "url"
+msgstr "url"
+
+#. module: document_ics
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,bugs:0
+msgid "Used by companies to track bugs and support requests on softwares"
+msgstr ""
+"Korišten od firmi za praćenje grešaka i zahteva za podrškom na programima"
+
+#. module: document_ics
+#: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
+msgid ""
+"This Configuration step use to create Calendars in document for all Case "
+"Sections"
+msgstr ""
+"Ovaj konfiguracioni korak se koristi za kreiranje kalendara u dokumentima ze "
+"sve tipove Sekcija"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtend"
+msgstr "dtend"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,jobs:0
+msgid ""
+"Help you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+"Pomaže vam da organizujete proces zapošljavanja: procena, sastanci, "
+"integracija elektronske pošte..."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "description"
+msgstr "opis"
+
+#. module: document_ics
+#: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
+msgid "Configure Calendars for Sections "
+msgstr "Konfigurise Kalendare za Sekcije "
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,opportunity:0
+msgid "Tracks identified business opportunities for your sales pipeline."
+msgstr "Prati prepoznate poslovne prilike za vašu prodajnu mrezu."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,fund:0
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr ""
+"Ovo može pomoći saradnicima u procesu prikupljanja i praćenja sredstava za "
+"finansiranje."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,helpdesk:0
+msgid "Manages an Helpdesk service."
+msgstr "Upravlja uslugom Helpdesk-a."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,fund:0
+msgid "Fund Raising Operations"
+msgstr "Operacije za skupljanje sredstava"
+
+#. module: document_ics
+#: field:document.directory.content,ics_object_id:0
+msgid "Object"
+msgstr "Objekat"
+
+#. module: document_ics
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive sections."
+msgstr "Greška ! Ne možete stvarati rekurzivne sekcije."
+
+#. module: document_ics
+#: model:ir.module.module,shortdesc:document_ics.module_meta_information
+msgid "Support for iCal based on Document Management System"
+msgstr "Podrška za iCal baziranom na sistemu za upravljanje dokumentima."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "location"
+msgstr "polozaj"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Calendar"
+msgstr "ICS Kalendar"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,name:0
+msgid "ICS Value"
+msgstr "ICS Vrednost"
+
+#. module: document_ics
+#: model:ir.module.module,description:document_ics.module_meta_information
+msgid "Allows to synchronise calendars with others applications."
+msgstr "omogucava vam da sinhronisete kalendar sa ostalim aplikacijama"
+
+#. module: document_ics
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,lead:0
+msgid ""
+"Allows you to track and manage prospects which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
+msgstr ""
+"Omogućava vam da pratite i upravljate prilikama koje uklju�uju predprodajne "
+"zahteve ili kontakte, prvi kontakt s pitanjima korisnika."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,meeting:0
+msgid "Manages the calendar of meetings of the users."
+msgstr "Upravlja kalendarom sastanaka korisnika"
+
+#. module: document_ics
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr "Domen"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,claims:0
+msgid ""
+"Manages the supplier and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
+"Upravlja pritužbama dobavlja�a i kupaca, uklju�ujući korektivne ili "
+"preventivne akcije."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "last-modified"
+msgstr "poslednja-promjena"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Mapping"
+msgstr "ICS mapiranje"
+
+#. module: document_ics
+#: view:crm.case:0
+msgid "Duration(In Hour)"
+msgstr "Trajanje (u satima)"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,document_ics:0
+msgid "Shared Calendar"
+msgstr "Deljeni Kalendar"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,claims:0
+msgid "Claims"
+msgstr "Pritužbe"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,phonecall:0
+msgid ""
+"Help you to encode the result of a phone call or to planify a list of phone "
+"calls to process."
+msgstr ""
+"Pomaže vam pri unosu rezultata telefonskih poziva ili pri planiranju popisa "
+"poziva za obradu."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstart"
+msgstr "dtstart"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,phonecall:0
+msgid "Phone Calls"
+msgstr "Telefonski Pozivi"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,bugs:0
+msgid "Bug Tracking"
+msgstr "Praćenje Grešaka"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "categories"
+msgstr "kategorije"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,lead:0
+msgid "Prospect"
+msgstr "Prilika"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Create Pre-Configured Calendars"
+msgstr "Kreiraj predkonfigurisani Kalendar"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "created"
+msgstr "Kreiran"
+
+#. module: document_ics
+#: field:crm.case,code:0
+msgid "Calendar Code"
+msgstr "Å ifra kalendara"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "summary"
+msgstr "Sumarno"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_ics_crm_wizard
+msgid "document.ics.crm.wizard"
+msgstr "document.ics.crm.wizard"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "prisutan"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_directory_ics_fields
+msgid "document.directory.ics.fields"
+msgstr "document.directory.ics.fields"
+
+#. module: document_ics
+#: field:document.directory.content,ics_field_ids:0
+msgid "Fields Mapping"
+msgstr "Mapiranje polja"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,opportunity:0
+msgid "Business Opportunities"
+msgstr "Poslovne Prilike"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstamp"
+msgstr "dtstamp"
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
new file mode 100644
index 00000000000..492769892a3
--- /dev/null
+++ b/addons/document_webdav/i18n/sr.po
@@ -0,0 +1,31 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-16 08:02+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Ovo je kompletan sistem Dokument Menadzmenta\n"
+"\t* WebDav Interfejs\n"
+"\t* Autentifikacija korisnika\n"
+"\t* Indeksacija Dokumenata\n"
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index dc07a3a7172..9d2d73ceafa 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:34+0000\n"
-"PO-Revision-Date: 2010-10-15 14:52+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
diff --git a/addons/event/i18n/sr.po b/addons/event/i18n/sr.po
new file mode 100644
index 00000000000..12e194dc2a8
--- /dev/null
+++ b/addons/event/i18n/sr.po
@@ -0,0 +1,646 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 19:57+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:report.event.registration,date_end:0
+msgid "Ending date"
+msgstr "Datum zavrsetka"
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr "Registracioni Minimum"
+
+#. module: event
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr ""
+
+#. module: event
+#: model:crm.case.section,name:event.event_0_crm_case_section
+msgid "Concert of Bon Jovi"
+msgstr "Bon Jovi Koncert"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Konfirmacioni Email"
+
+#. module: event
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive sections."
+msgstr "Greška ! Ne možete stvarati rekurzivne sekcije."
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration
+msgid "Event Registration"
+msgstr "Registracioni Dogadjaj"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.event_reg_invoice
+msgid "Make Invoice"
+msgstr "Kreiraj ra�un"
+
+#. module: event
+#: field:report.event.type.registration,draft_state:0
+msgid "Draft Registrations"
+msgstr "Registracije u Pripremi"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr "Sogadjaj pri registraciji"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,end:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr "Auto potvrdjivanje Email-a"
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "Karta za Operu"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
+msgid "Invoice Rejected"
+msgstr "Racun Odbijen"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirm Event"
+msgstr "Potvrdi Dogadjaj"
+
+#. module: event
+#: model:crm.case.section,name:event.event_1_crm_case_section
+msgid "Opera of Verdi"
+msgstr "Verdijeva Opera"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid "Draft Registration"
+msgstr "Registracija u pripremi"
+
+#. module: event
+#: wizard_view:event.reg_make_invoice,init:0
+msgid "Create Invoices"
+msgstr "Kreiraj Racune"
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in :\n"
+"                Events / Reporting\n"
+msgstr ""
+"Organizacija i Upravljanje Dogadjajima\n"
+"\n"
+"    Ovaj vam modul omogucuje\n"
+"        *da upravljate dogadjajima i njihovim registracijama\n"
+"        *da koristite Emailove za automatsku potvrdu i slanje upozorenja za "
+"bilo koju registraciju nekog dogadjaja\n"
+"        *\n"
+"      Upamtite da:\n"
+"     -Mozete da definisete nove tipove dogadjaja u\n"
+"                                                             "
+"Dogadjaji/Podesavanja/Tipovi Dogadjaja\n"
+"    -Mozete da pristupite predefinisanim izvestajima o broju registracija po "
+"dogadjaju ili cak po kategorijama u:\n"
+"                                                            "
+"Dogadjaji/Izvestavanje\n"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Dodatne Informacije"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration"
+msgstr "Registracija"
+
+#. module: event
+#: field:event.type,name:0
+#: model:ir.model,name:event.model_event_type
+msgid "Event type"
+msgstr "Tip dogadjaja"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:report.event.registration,name:0
+msgid "Event"
+msgstr "Događaj"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "Registration Confirmation"
+msgstr "Potvrda Registracije"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: event
+#: field:event.event,register_current:0
+#: model:ir.actions.act_window,name:event.action_registration_confirm
+#: model:ir.ui.menu,name:event.menu_action_registration_confirm
+msgid "Confirmed Registrations"
+msgstr "Potvrdjene Registracije"
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr "Auto Registracija Mailom"
+
+#. module: event
+#: view:event.registration:0
+msgid "Badge"
+msgstr "Znacka"
+
+#. module: event
+#: field:event.event,section_id:0
+msgid "Case section"
+msgstr "Tip Sekcije"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr "Da bude Fakturisano"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_event
+msgid "All Events"
+msgstr "Svi Dogadjaji"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_report_event
+msgid "Reporting"
+msgstr "Izveštavanje"
+
+#. module: event
+#: view:event.registration:0
+msgid "Cancel Registration"
+msgstr "Otkazi Registraciju"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_event_categories
+msgid "Events by Categories"
+msgstr "Dogadjaji po Kategorijama"
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "The event limit is reached. What do you want to do?"
+msgstr "Limit Dogadjaja je postignut. Sta zelis da uradis?"
+
+#. module: event
+#: field:report.event.type.registration,confirm_state:0
+msgid "Confirm Registrations"
+msgstr "potvrdi Registraciju"
+
+#. module: event
+#: view:event.registration:0
+msgid "References"
+msgstr "Reference"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type_registration
+#: model:ir.ui.menu,name:event.menu_report_event_type_registration
+#: view:report.event.type.registration:0
+msgid "Registration By Event Types"
+msgstr "Registracije po Tipu Dogadjaja"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_config
+msgid "Configuration"
+msgstr "Podešavanje"
+
+#. module: event
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,confirm:0
+msgid "Confirm Anyway"
+msgstr "Sve jedno Potvrdi"
+
+#. module: event
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Greška: JU (jedinice usluga)  i JM moraju da budu u razli�itim kategorijama"
+
+#. module: event
+#: view:event.event:0
+msgid "Parent Category"
+msgstr "Roditeljska Kategorija"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration Invoiced"
+msgstr "Registracija fakturisana"
+
+#. module: event
+#: field:report.event.type.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "Broj Dogadjaja"
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "Otkazi Dogadjaj"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
+msgid "Error Messages"
+msgstr "Poruke o greskama"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "E-Postanska"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "Karta za koncert"
+
+#. module: event
+#: field:event.event,register_prospect:0
+#: model:ir.actions.act_window,name:event.action_registration_draft
+#: model:ir.ui.menu,name:event.menu_action_registration_draft
+msgid "Unconfirmed Registrations"
+msgstr "Nepotvrdjene Registracije"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "Partner Fakturisan"
+
+#. module: event
+#: view:event.registration:0
+msgid "Communication history"
+msgstr "Istorija Komunikacija"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Canceled"
+msgstr "Отказано"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "Dogadjaj Zavrsen"
+
+#. module: event
+#: field:event.registration,badge_name:0
+msgid "Badge Name"
+msgstr "Naziv Znacke"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+msgid "Events On Registrations"
+msgstr "Dogadjaji pri Registraciji"
+
+#. module: event
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_created:0
+msgid "Invoice Created"
+msgstr "Racun Kreiran"
+
+#. module: event
+#: view:event.event:0
+msgid "Statistics"
+msgstr "Statistike"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: event
+#: view:event.event:0
+msgid "Event description"
+msgstr "Opis Dogadjaja"
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_type_registration
+msgid "Event type on registration"
+msgstr "Tip Dogadjaja pri registraciji"
+
+#. module: event
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: event
+#: field:event.registration,event_id:0
+msgid "Event Related"
+msgstr "Vezani Dogadjaj"
+
+#. module: event
+#: model:crm.case.section,name:event.case_section_event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+msgid "Events"
+msgstr "Događaji"
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "Broj Registracija"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+msgid "Status"
+msgstr "Status"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_categories
+msgid "Events by section"
+msgstr "Dogadjaji po Sekciji"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_registration
+msgid "All Registrations"
+msgstr "Sve Registracije"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+"Cekiraj ovu Kucicu ako zelite da koristite automatski mailing pri novoj "
+"registraciji"
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: model:ir.actions.wizard,name:event.event_confirm_registration
+#: field:report.event.registration,confirm_state:0
+msgid "Confirm Registration"
+msgstr "Posalji na Pripremu"
+
+#. module: event
+#: view:event.registration:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr "Tipovi Dogadjaja"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr "Kontakt partnera"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr "Auto-Mail za potvrdu"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "General"
+msgstr "Opšte"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send Reminder"
+msgstr "Posalji Podsetnik"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: event
+#: field:event.event,date_begin:0
+#: field:report.event.registration,date_begin:0
+msgid "Beginning date"
+msgstr "Datum pocetka"
+
+#. module: event
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr "Ra�un"
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_registration
+msgid "Events on registrations"
+msgstr "Dogadjaji pri Registraciji"
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,open:0
+msgid "Open"
+msgstr "Otvori"
+
+#. module: event
+#: field:event.registration,badge_title:0
+msgid "Badge Title"
+msgstr "Naslov Znacke"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_new_event_form
+#: model:ir.ui.menu,name:event.menu_event_new_event
+msgid "New event"
+msgstr "Novi Dogadjaj"
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Jedini�na cijena"
+
+#. module: event
+#: model:crm.case.section,name:event.event_2_crm_case_section
+msgid "Conference on ERP Buisness"
+msgstr "Konferencija o ERP Biznisu"
+
+#. module: event
+#: field:event.registration,badge_partner:0
+msgid "Badge Partner"
+msgstr "Partner Znacke"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_confirm
+#: model:ir.ui.menu,name:event.menu_event_event_confirm
+msgid "Confirmed Events"
+msgstr "Potvrdi Dogadjaje"
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr "Maksimum Registracija"
+
+#. module: event
+#: field:event.event,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr "Ovaj ce Email biti poslan kada se neko bude prijavio za dogadjaj"
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr "Karta za konferenciju"
+
+#. module: event
+#: field:event.registration,case_id:0
+msgid "Case"
+msgstr "Slucaj"
+
+#. module: event
+#: view:event.event:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+"Cekiraj ovu kucicu ako zelis da koristis automatsko slanje E-podsetnika"
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+"Ovaj ce Email biti poslan kada se dogadjaj potvrdi ili kada se neko upise na "
+"potvrdjeni dogadjaj. Ovo je takodje Email koji ce biti poslat da podseti "
+"nekog o dogadjaju."
+
+#. module: event
+#: field:event.event,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: event
+#: field:event.registration,invoice_label:0
+msgid "Label Invoice"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Payments"
+msgstr "Isplate"
+
+#. module: event
+#: view:event.type:0
+#: field:report.event.type.registration,name:0
+msgid "Event Type"
+msgstr "Vrsta događaja"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.actions.wizard,name:event.wizard_event_registration
+msgid "Registrations"
+msgstr "Registracije"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_draft
+#: model:ir.ui.menu,name:event.menu_event_event_draft
+msgid "Draft Events"
+msgstr "Dodgadjaji iz Pripreme"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_main
+msgid "Events Organisation"
+msgstr "Organizacija Dogadjaja"
+
+#. module: event
+#: view:event.registration:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
+msgid "List Register Partners"
+msgstr "Spisak Registrovanih Partnera"
+
+#. module: event
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: Neispravan EAN kod"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr "Auto Registracioni Email"
diff --git a/addons/event_project/i18n/it.po b/addons/event_project/i18n/it.po
index 9d5270feb86..1b89667805f 100644
--- a/addons/event_project/i18n/it.po
+++ b/addons/event_project/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 08:28+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
@@ -48,7 +48,7 @@ msgstr "Attività Rimanenti"
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event - Project"
-msgstr ""
+msgstr "Evento - Progetto"
 
 #. module: event_project
 #: field:event.event,project_id:0
diff --git a/addons/event_project/i18n/sr.po b/addons/event_project/i18n/sr.po
new file mode 100644
index 00000000000..70465d3c266
--- /dev/null
+++ b/addons/event_project/i18n/sr.po
@@ -0,0 +1,88 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 20:04+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: event_project
+#: model:ir.actions.wizard,name:event_project.wizard_event_task
+msgid "Tasks"
+msgstr "Zadaci"
+
+#. module: event_project
+#: wizard_button:event.project,init,done:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: event_project
+#: model:ir.module.module,description:event_project.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+"    This module allow you to create retro planning for managing your "
+"events.\n"
+msgstr ""
+"Organizacija i Upravljanje Dogadjajima.\n"
+"\n"
+"    Ovaj modul vam omogucava da kreirate retro planiranje za upravljanje "
+"vasim dogadjajima.\n"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Remaining Tasks"
+msgstr "Preostali Zadaci"
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event - Project"
+msgstr "Projekat-Dogadjaj"
+
+#. module: event_project
+#: field:event.event,project_id:0
+#: wizard_field:event.project,init,project_id:0
+#: model:ir.actions.wizard,name:event_project.event_wiz
+msgid "Project"
+msgstr "Projekat"
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Projekat Zadataka"
+
+#. module: event_project
+#: wizard_button:event.project,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Kreiraj Retro-Planiranje"
+
+#. module: event_project
+#: wizard_view:event.project,init:0
+msgid "Event"
+msgstr "Događaj"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks management"
+msgstr "Upravljanje Zadacima"
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
new file mode 100644
index 00000000000..115ed3155f9
--- /dev/null
+++ b/addons/fetchmail/i18n/sr.po
@@ -0,0 +1,274 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 13:33+0000\n"
+"PO-Revision-Date: 2010-10-16 20:18+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: fetchmail
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da po�inje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: fetchmail
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree_imap
+#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree_imap
+msgid "IMAP Servers"
+msgstr "IMAP Serveri"
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Reply Email"
+msgstr "Odgovori na Email"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Prioritet Servera"
+
+#. module: fetchmail
+#: field:email.server,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: fetchmail
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Nije potvrdjeno"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Serveri"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Email Server"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Dodajes Attachmente ( dodatke) ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Postavi u pripremu"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Korisni�ko ime"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Cekanje na Potvrdu"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: fetchmail
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni Argumenti"
+
+#. module: fetchmail
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Auto Odgovor?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Poruka Email prolaza"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree
+msgid "POP Servers"
+msgstr "POP Serveri"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Email Servisi"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree
+#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree_pop
+#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree_pop
+msgid "Received Email History"
+msgstr "Istorija Primljenih E-mailova"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Obradi Parametar"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,type:0
+msgid "IMAP Server"
+msgstr "MAP Server"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Server"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Email Istorija"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,type:0
+msgid "Server Type"
+msgstr "Tup Servera"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Informacije o Prijavi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Podaci o Serveru"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,type:0
+msgid "POP Server"
+msgstr "POP Server"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+"Fetchmail: \n"
+"    *Hvata emailove sa pop/imap servera\n"
+"    *Podrzava SSL\n"
+"    *Integrise se sa svim modulima\n"
+"    *Automatski prima Emailove\n"
+"    *Na bazi Email-a pravi snimanja ( Dodaje, Dopunjava)\n"
+"    "
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Vaznost izmedju 0 i 10,  izaberi i definisi redosled Procesuiranja"
+
+#. module: fetchmail
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Email Server"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Hvata Emailove"
diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po
new file mode 100644
index 00000000000..9cf75fa2c19
--- /dev/null
+++ b/addons/google_map/i18n/sr.po
@@ -0,0 +1,51 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 08:00+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Ppkreni Google Map"
+
+#. module: google_map
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr "Ulica2 "
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid ""
+"The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+"Ovaj Modul ubacuje sliku google map u partnerovoj adresi\n"
+"tako da mozemo direktno da otvorimo google map iz tog\n"
+"prozora."
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "mapa"
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index b8b98c309e4..343cc77f37c 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 12:18+0000\n"
-"PO-Revision-Date: 2010-10-15 13:06+0000\n"
+"PO-Revision-Date: 2010-10-16 08:48+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
index fa858dff025..bf173288c9d 100644
--- a/addons/mrp_operations/i18n/sr.po
+++ b/addons/mrp_operations/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 10:57+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
index 7986e0b074f..743247668bc 100644
--- a/addons/mrp_repair/i18n/sr.po
+++ b/addons/mrp_repair/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 10:31+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 08:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_subproduct/i18n/sr.po
index 57cb0e7ab91..a0427bb3356 100644
--- a/addons/mrp_subproduct/i18n/sr.po
+++ b/addons/mrp_subproduct/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 10:26+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 291a5383976..8cc0f2990fa 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 11:15+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 08:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index ab3c213f91d..6fbade8ce73 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-30 06:38+0000\n"
+"PO-Revision-Date: 2010-10-16 14:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -373,7 +373,7 @@ msgstr "Планируема� дата"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
-msgstr "Утверждено по�тавщком"
+msgstr "Утверждено по�тавщиком"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 006f67fca37..7ed2bf0c80c 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:07+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-16 11:51+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -58,6 +58,8 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"Х�р�в та бүгдийг н�г�н з�р�г багтаахад хангалтгүй агуулахтай бол х���гчил��н "
+"барааг хүл��ж авдаг уу ��в�л авдгүй юу?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -84,7 +86,7 @@ msgstr "Таны н�х�мжл�л амжилттай үү�л�� !"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "�втомат м�д�гд�л"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -281,6 +283,11 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Борлуулалтын захиалга нь автоматаар н�х�мжл�лийн баталгааг үү�г�д�г. "
+"Захиал�ан болон хүрг�ж өг�өн тоо х�мж�� нь адилхан биш байх боломжтой. Х�р�в "
+"н�х�мжл�л гаргах бол захиалагд�ан ��в�л т��в�рл�гд��н тоо х�мж��н д��р "
+"�уурилан гаргах х�р�гт�й. Х�р�в бүт��гд�хүүн үйлчилг�� бол т��в�рл�гд��н тоо "
+"х�мж�� нь холбоотой дааллгавар д��р зарцуул�ан цаг болно."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -386,6 +393,8 @@ msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
 msgstr ""
+"Т��в�рл�лтийн удирдамж нь  = 'Хүрг�лтийн дараах автомат н�х�мжл�л ' г���н "
+"�онголттой үед хүрг�лтийн дараа автоматаар үү��х болно."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -524,7 +533,7 @@ msgstr "��х�мжл�лийг бүл�гл�х"
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "Бүх ханш"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -540,18 +549,18 @@ msgstr "�оорог н�х�мжл�л н�гтлангаар х�нагдах
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr ""
+msgstr "Борлуулалтын захаилга н�х�мжл�гд��н байх"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Procurement for each line"
-msgstr ""
+msgstr "Мөр бүр��р татан авалт хийх"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree10
 #: model:ir.ui.menu,name:sale.menu_action_order_tree10
 msgid "My Quotations"
-msgstr ""
+msgstr "Миний ханш"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
@@ -566,17 +575,17 @@ msgstr "Захиалгын шугам"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr ""
+msgstr "Савлах за�амал удирдамж"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Manages the delivery and invoicing progress"
-msgstr ""
+msgstr "Хүрг�лт болон н�х�мжл�х үйл ажиллагааг удирдах"
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr ""
+msgstr "Т��в�рл�лтийн за�амал арга"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -625,7 +634,7 @@ msgstr "��х�мжил��н"
 #. module: sale
 #: model:ir.actions.wizard,name:sale.advance_payment
 msgid "Advance Invoice"
-msgstr ""
+msgstr "Урьдчил�ан н�х�мжл�л"
 
 #. module: sale
 #: field:sale.order,state:0
@@ -636,7 +645,7 @@ msgstr "Төлөв"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
 msgid "Uninvoiced Lines"
-msgstr ""
+msgstr "��х�мжл�лгүй мөр"
 
 #. module: sale
 #: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
@@ -669,7 +678,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree7
 #: model:ir.ui.menu,name:sale.menu_action_order_tree7
 msgid "My sales in shipping exception"
-msgstr ""
+msgstr "Миний борлуулалтын алдаатай т��в�рл�лт"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -705,7 +714,7 @@ msgstr "За�варла�ан нийлүүл�лт"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "Т��в�рл�х болон н�х�мжл�х заавар"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
@@ -716,7 +725,7 @@ msgstr "Борлуулалт нийлүүл�лт"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr ""
+msgstr "Борлуулалтын захиалгын Ложи�тик тохиргоо"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -751,7 +760,7 @@ msgstr "Урьдчил�ан н�х�мжл�л үү�г�х"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid "One procurement for each product."
-msgstr ""
+msgstr "Бүт��гд�хүүн бүр д��р н�г татан авалт"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -785,7 +794,7 @@ msgstr "Үн� бүүралт"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance Product"
-msgstr ""
+msgstr "Төл�өн бүт��гд�хүүн"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -856,7 +865,7 @@ msgstr "Зөвхөн хүрг�х захиалга"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales order lines"
-msgstr ""
+msgstr "Борлуулалтын захиалгын мөр"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
@@ -866,7 +875,7 @@ msgstr "Дараалал"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Sales"
-msgstr ""
+msgstr "Борлуулалт"
 
 #. module: sale
 #: view:sale.order:0
@@ -968,12 +977,12 @@ msgstr ""
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
 msgid "Confirm sale order and Create invoice."
-msgstr ""
+msgstr "Борлуулалтын захиалгыг батлах болон н�х�мжл�л үү�г�х"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Packing List & Delivery Order"
-msgstr ""
+msgstr "Савлагааны жаг�аалт ба Хүрг�лтийн захаилга"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1005,7 +1014,7 @@ msgstr ""
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Set Default"
-msgstr ""
+msgstr "Үнд��н утга болгох"
 
 #. module: sale
 #: view:sale.order:0
@@ -1087,13 +1096,13 @@ msgstr "Эрх шилжүүл�хийг цуцлах"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from the Packing"
-msgstr ""
+msgstr "Савлагааны н�х�мжл�л"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr ""
+msgstr "��х�мжл�л үү�г�х"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
@@ -1135,7 +1144,7 @@ msgstr "��х�мжл�х арга"
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr ""
+msgstr "Шин� ханш"
 
 #. module: sale
 #: view:sale.order:0
@@ -1156,7 +1165,7 @@ msgstr "Барааны зарах н�гж"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Үйл �вцын заавар"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 556ed670eaf..5e2db5aff01 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-30 06:52+0000\n"
+"PO-Revision-Date: 2010-10-16 11:15+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -762,7 +762,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid "One procurement for each product."
-msgstr ""
+msgstr "Одна закупка дл� каждого товара."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -773,12 +773,12 @@ msgstr "Заказы"
 #. module: sale
 #: field:product.product,pricelist_sale:0
 msgid "Sale Pricelists"
-msgstr ""
+msgstr "Каталоги продаж"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Пр�ма� до�тавка"
 
 #. module: sale
 #: view:sale.order:0
@@ -831,7 +831,7 @@ msgstr "Заказы в проце��е выполнени�"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr ""
+msgstr "�азначить"
 
 #. module: sale
 #: view:sale.order:0
@@ -905,7 +905,7 @@ msgstr "Цена за ед."
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "�алогова� позици�"
 
 #. module: sale
 #: rml:sale.order:0
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index bc0cc16eef2..96669fda8c6 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 09:22+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-16 08:12+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -24,7 +24,7 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr ""
+msgstr "Scelta Automatica"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0

From ad15fa33857184189b03ba69295f135318de1608 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sun, 17 Oct 2010 07:13:19 +0200
Subject: [PATCH 276/294] [IMP] share: much more complete implementation of
 share wizard, pending some improvements + web widget creation

bzr revid: odo@openerp.com-20101017051319-p4xi0epaqmgvwdmr
---
 addons/share/__init__.py                  |   3 +-
 addons/share/__openerp__.py               |  30 +-
 addons/share/{share.py => res_users.py}   |   9 +-
 addons/share/res_users_view.xml           |  44 ++
 addons/share/security/ir.model.access.csv |   2 +
 addons/share/security/share_security.xml  |   8 +
 addons/share/share_view.xml               |   4 +-
 addons/share/wizard/__init__.py           |   1 +
 addons/share/wizard/share_wizard.py       | 808 +++++++++++-----------
 addons/share/wizard/share_wizard_view.xml | 167 +++--
 10 files changed, 566 insertions(+), 510 deletions(-)
 rename addons/share/{share.py => res_users.py} (74%)
 create mode 100644 addons/share/res_users_view.xml
 create mode 100644 addons/share/security/ir.model.access.csv
 create mode 100644 addons/share/security/share_security.xml

diff --git a/addons/share/__init__.py b/addons/share/__init__.py
index eff88be137d..9c0c7bf7da2 100644
--- a/addons/share/__init__.py
+++ b/addons/share/__init__.py
@@ -18,5 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import share
+
+import res_users
 import wizard
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 9dc2a6658d8..4f2eafb4e52 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -21,24 +21,34 @@
 
 
 {
-    "name" : "Share Management",
+    "name" : "Sharing Tools",
     "version" : "1.1",
     "depends" : ["base"],
     "author" : "OpenERP SA",
     "category": 'Generic Modules',
-    "description": """The goal is to implement a generic sharing mechanism, where user of OpenERP
-can share data from OpenERP to their colleagues, customers, or friends.
-The system will work by creating new users and groups on the fly, and by
-combining the appropriate access rights and ir.rules to ensure that the /shared
-users/ will only have access to the correct data.
+    "description": """
+
+    This module adds generic sharing tools to your current OpenERP database,
+    and specifically a 'share' button that is available in the Web client to
+    share any kind of OpenERP data with colleagues, customers, friends, etc.
+
+    The system will work by creating new users and groups on the fly, and by
+    combining the appropriate access rights and ir.rules to ensure that the
+    shared users only have access to the data that has been shared with them.
+
+    This is extremely useful for collaborative work, knowledge sharing, 
+    synchronization with other companies, etc.
+
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
+        'security/share_security.xml',
+        'security/ir.model.access.csv',
         'share_view.xml',
+        'res_users_view.xml',
         'wizard/share_wizard_view.xml'
-    ],    
+    ],
     'installable': True,
-    'active': False,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/share.py b/addons/share/res_users.py
similarity index 74%
rename from addons/share/share.py
rename to addons/share/res_users.py
index 6e3c4932a1e..81683066220 100644
--- a/addons/share/share.py
+++ b/addons/share/res_users.py
@@ -18,12 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv, orm
+from osv import fields, osv
+
 class res_groups(osv.osv):
     _name = "res.groups"
     _inherit = 'res.groups'
     _columns = {
-        'share': fields.boolean('Share')
+        'share': fields.boolean('Share Group', groups='share.group_share', readonly=True, 
+                    help="Group created to set access rights for sharing data with some users.")
      }
 res_groups()
 
@@ -31,6 +33,7 @@ class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
     _columns = {
-        'share': fields.boolean('Share')
+        'share': fields.boolean('Share User', groups='share.group_share', readonly=True, 
+                    help="External user with limited access, created only for the purpose of sharing data.")
      }
 res_users()
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
new file mode 100644
index 00000000000..09733e81a01
--- /dev/null
+++ b/addons/share/res_users_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="res_users_search_sharing">
+            <field name="name">res.users.search.share</field>
+            <field name="model">res.users</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_users_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="/search/field[@name='company_ids']" position="after">
+                    <field name="share">
+                        <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
+                            domain="[('share','=',False)]"/>
+                    </field>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="base.action_res_users">
+            <field name="context">{'search_default_no_share': 1}</field>
+        </record>
+
+        <record model="ir.ui.view" id="res_groups_search_sharing">
+            <field name="name">res.groups.search.share</field>
+            <field name="model">res.groups</field>
+            <field name="type">search</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <search string="Groups">
+                    <field name="name"/>
+                    <field name="share">
+                        <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
+                            domain="[('share','=',False)]"/>
+                    </field>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="base.action_res_groups">
+            <field name="context">{'search_default_no_share': 1}</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/share/security/ir.model.access.csv b/addons/share/security/ir.model.access.csv
new file mode 100644
index 00000000000..a8f37d300c6
--- /dev/null
+++ b/addons/share/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_share_wizard_user","access_share_wizard_user","model_share_wizard","share.group_share_user",1,1,1,1
\ No newline at end of file
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
new file mode 100644
index 00000000000..0b2e8c4c1fd
--- /dev/null
+++ b/addons/share/security/share_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="group_share_user" model="res.groups">
+            <field name="name">Sharing / User</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
index 24736b3d53a..863da6ea747 100644
--- a/addons/share/share_view.xml
+++ b/addons/share/share_view.xml
@@ -6,7 +6,7 @@
             <field name="model">res.groups</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
-            <field name="arch" type="xml">                
+            <field name="arch" type="xml">
                 <field name="name" position="after">
                     <field name="share"/>
                 </field>
@@ -17,7 +17,7 @@
             <field name="model">res.users</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">                
+            <field name="arch" type="xml">
                 <field name="password" position="after">
                     <field name="share"/>
                 </field>
diff --git a/addons/share/wizard/__init__.py b/addons/share/wizard/__init__.py
index b906abf5e56..2034dfe2fc6 100644
--- a/addons/share/wizard/__init__.py
+++ b/addons/share/wizard/__init__.py
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import share_wizard
+
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index add9c4f9352..2d1fd252ecf 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -18,480 +18,448 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import tools
+import logging
+import random
+import time
+
+import tools
+from osv import osv, fields
+from osv.expression import expression
+from tools.translate import _
+from tools.safe_eval import safe_eval
+
+FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
+READ_ONLY_ACCESS = ('perm_read',)
+
+
+RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48, 58) + range(97, 123) + range(65, 91)]
+RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i
+RANDOM_PASS_CHARACTERS.remove('I') #uppercase i, easily mistaken as one or lowercase L
+RANDOM_PASS_CHARACTERS.remove('O') #uppercase o, mistaken with zero
+RANDOM_PASS_CHARACTERS.remove('o') #lowercase o, mistaken with zero
+RANDOM_PASS_CHARACTERS.remove('0') #zero, mistaken with o-letter
+RANDOM_PASS_CHARACTERS.remove('1') #one, mistaken with lowercase-L or capital i
+def generate_random_pass():
+    pass_chars = RANDOM_PASS_CHARACTERS[:]
+    random.shuffle(pass_chars)
+    return ''.join(pass_chars[0:10])
 
-def _generate_random_number():
-   import random
-   RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48,58) + range(97,123) + range(65,91)]
-   RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i
-   RANDOM_PASS_CHARACTERS.remove('I') #uppercase i, easily mistaken as one or lowercase l
-   RANDOM_PASS_CHARACTERS.remove('O') #uppercase o, mistaken with zero
-   RANDOM_PASS_CHARACTERS.remove('o') #lowercase o, mistaken with zero
-   RANDOM_PASS_CHARACTERS.remove('0') #zero, mistaken with o-letter
-   def generate_random_pass():
-       pass_chars = RANDOM_PASS_CHARACTERS[:]
-       random.shuffle(pass_chars)
-       return ''.join(pass_chars[0:10])
-   return generate_random_pass()
 
 class share_create(osv.osv_memory):
-    _name = 'share.create'
-    _description = 'Create share'
-
-    def _access(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
-        res = {}
-        action_id = context.get('action_id', False)
-        access_obj = self.pool.get('ir.model.access')
-        action_obj = self.pool.get('ir.actions.act_window')
-        model_obj = self.pool.get('ir.model')
-        user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid)
-        access_ids = []
-        if action_id:
-            action = action_obj.browse(cr, uid, action_id, context=context)
-            active_model_ids = model_obj.search(cr, uid, [('model','=',action.res_model)])
-            active_model_id = active_model_ids and active_model_ids[0] or False
-            access_ids = access_obj.search(cr, uid, [
-                    ('group_id','in',map(lambda x:x.id, current_user.groups_id)),
-                    ('model_id','',active_model_id)])
-        for rec_id in ids:
-            write_access = False
-            read_access = False
-            for access in access_obj.browse(cr, uid, access_ids, context=context):
-                if access.perm_write:
-                    write_access = True
-                if access.perm_read:
-                    read_access = True
-            res[rec_id]['write_access'] = write_access
-            res[rec_id]['read_access'] = read_access          
-        return res
+    __logger = logging.getLogger('share.wizard')
+    _name = 'share.wizard'
+    _description = 'Share Wizard'
 
     _columns = {
-        'action_id': fields.many2one('ir.actions.act_window', 'Action', required=True),
-        'domain': fields.char('Domain', size=64),
-        'user_type': fields.selection( [ ('existing','Existing'),('new','New')],'User Type'),
-        'user_ids': fields.many2many('res.users', 'share_user_rel', 'share_id','user_id', 'Share Users'),
-        'new_user': fields.text("New user"),
-        'access_mode': fields.selection([('readwrite','READ & WRITE'),('readonly','READ ONLY')],'Access Mode'),
-        'write_access': fields.function(_access, method=True, string='Write Access',type='boolean', multi='write_access'),
-        'read_access': fields.function(_access, method=True, string='Write Access',type='boolean', multi='read_access'),
+        'action_id': fields.many2one('ir.actions.act_window', 'Action to share', required=True,
+                help="The action that opens the screen containing the data you wish to share."),
+        'domain': fields.char('Domain', size=256, help="Optional domain for further data filtering"),
+        'user_type': fields.selection([('existing','Existing external users'),('new','New users (emails required)')],'Users to share with',
+                help="Select the type of user(s) you would like to share data with."),
+        'user_ids': fields.one2many('share.wizard.user', 'share_wizard_id', 'Users'),
+        'new_users': fields.text("New users"),
+        'access_mode': fields.selection([('readwrite','Read & Write'),('readonly','Read-only')],'Access Mode'),
+        'result_line_ids': fields.one2many('share.wizard.result.line', 'share_wizard_id', 'Summary'),
+        'share_root_url': fields.char('Generic Share Access URL', size=512, tooltip='Main access page for users that are granted shared access')
     }
     _defaults = {
-        'user_type' : 'existing',
-        'domain': '[]',
+        'user_type' : lambda self, cr, uid, *a: 'existing' if self.pool.get('res.users').search(cr, uid, [('share', '=', True)]) else 'new',
+        'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
+        'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url', 
+                                _('Please specify "share_root_url" in server configuration or in context')),
+        'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
         'access_mode': 'readonly'
-
     }
 
-    def default_get(self, cr, uid, fields, context=None):
-        """
-             To get default values for the object.
-        """
-
-        res = super(share_create, self).default_get(cr, uid, fields, context=context)
-        if not context:
-            context={}
-        action_id = context.get('action_id', False)
-        domain = context.get('domain', '[]')
-
-
-        if 'action_id' in fields:
-            res['action_id'] = action_id
-        if 'domain' in fields:
-            res['domain'] = domain
-        return res
-
-    def do_step_1(self, cr, uid, ids, context=None):
-        """
-        This action to excute step 1
-
-        """
-        if not context:
-            context = {}
-
-        data_obj = self.pool.get('ir.model.data')
-
-        step1_form_view = data_obj._get_id(cr, uid, 'share', 'share_step1_form')
-
-        if step1_form_view:
-            step1_form_view_id = data_obj.browse(cr, uid, step1_form_view, context=context).res_id
-
-        step1_id = False
-        for this in self.browse(cr, uid, ids, context=context):
-            vals ={
-                'domain': this.domain,
-                'action_id': this.action_id and this.action_id.id or False,
-            }
-            step1_id = this.id
-
-        context.update(vals)
-        value = {
-            'name': _('Step:2 Sharing Wizard'),
+    def go_step_1(self, cr, uid, ids, context=None):
+        dummy, step1_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step1_form')
+        return {
+            'name': _('Sharing Wizard - Step 1'),
             'view_type': 'form',
             'view_mode': 'form',
-            'res_model': 'share.create',
+            'res_model': 'share.wizard',
             'view_id': False,
-            'res_id': step1_id,
+            'res_id': ids[0],
             'views': [(step1_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
-            'context': context,
             'target': 'new'
         }
-        return value
-
-
-    def do_step_2(self, cr, uid, ids, context=None):
-        """
-        This action to excute step 2
-
-        """
-        if not context:
-            context = {}
-
-        data_obj = self.pool.get('ir.model.data')
-
-        step2_form_view = data_obj._get_id(cr, uid, 'share', 'share_step2_form')
-
-        if step2_form_view:
-            step2_form_view_id = data_obj.browse(cr, uid, step2_form_view, context=context).res_id
-
-        step1_id = False
-        for this in self.browse(cr, uid, ids, context=context):
-            vals = {
-                'user_type': this.user_type,
-                'existing_user_ids': map(lambda x:x.id, this.user_ids),
-                'new_user': this.new_user,
-            }
-
-        context.update(vals)
-        value = {
-            'name': _('Step:3 Sharing Wizard'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'share.create',
-            'view_id': False,
-            'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
-            'type': 'ir.actions.act_window',
-            'context': context,
-            'target': 'new'
-        }
-        return value
-
-
-    def do_step_3(self, cr, uid, ids, context=None):
-        """
-        This action to excute step 3
-
-        """
-        if not context:
-            context = {}
-
-        for this in self.browse(cr, uid, ids, context=context):
-            vals = {
-                'access_mode': this.access_mode,
-            }
-
-        context.update(vals)
 
+    def _create_share_group(self, cr, uid, wizard_data, context=None):
         group_obj = self.pool.get('res.groups')
+        share_group_name = '%s: %s (%d-%s)' %('Sharing', wizard_data.action_id.res_model, uid, time.time())
+        # create share group without putting admin in it
+        return group_obj.create(cr, 1, {'name': share_group_name, 'share': True}, {'noadmin': True})
+
+    def _create_new_share_users(self, cr, uid, wizard_data, group_id, context=None):
         user_obj = self.pool.get('res.users')
-        fields_obj = self.pool.get('ir.model.fields')
-        model_access_obj = self.pool.get('ir.model.access')
-        model_obj = self.pool.get('ir.model')
-        rule_obj = self.pool.get('ir.rule')
-        action_obj = self.pool.get('ir.actions.act_window')
-
-        new_users = context.get('new_user', False)
-        action_id = context.get('action_id', False)
-        user_type = context.get('user_type', False)
-        access_mode = context.get('access_mode', False)
-        action = action_obj.browse(cr, uid, action_id, context=context)
-        active_model = action.res_model
-
-        active_id = False #TODO: Pass record id of res_model of action
-        existing_user_ids = context.get('existing_user_ids', False)
-        domain = eval(context.get('domain', '[]'))
-
-        # Create Share Group
-        share_group_name = '%s: %s' %('Sharing', active_model)
-        group_ids = group_obj.search(cr, uid, [('name','=',share_group_name)])
-        group_id = group_ids and group_ids[0] or False
-        if not group_id:
-            group_id = group_obj.create(cr, uid, {'name': share_group_name, 'share': True})
-        else:
-            group = group_obj.browse(cr, uid, group_id, context=context)
-            if not group.share:
-                raise osv.except_osv(_('Error'), _("Share Group is exits without sharing !"))
-
-        # Create new user
-
         current_user = user_obj.browse(cr, uid, uid)
         user_ids = []
-        if user_type == 'new' and new_users:
-            for new_user in new_users.split('\n'):
-                password = _generate_random_number()
-                user_id = user_obj.create(cr, uid, {
+        if wizard_data.user_type == 'new':
+            for new_user in wizard_data.new_users.split('\n'):
+                # attempt to show more user-friendly msg than default constraint error
+                existing = user_obj.search(cr, 1, [('login', '=', new_user)])
+                if existing:
+                    raise osv.except_osv(_('User already exists'),
+                                         _('This username (%s) already exists, perhaps data has already been shared with this person.\nYou may want to try selecting existing shared users instead.'))
+                user_id = user_obj.create(cr, 1, {
                         'login': new_user,
-                        'password': password,
+                        'password': generate_random_pass(),
                         'name': new_user,
                         'user_email': new_user,
                         'groups_id': [(6,0,[group_id])],
-                        'action_id': action_id,
                         'share': True,
                         'company_id': current_user.company_id and current_user.company_id.id
                 })
                 user_ids.append(user_id)
-            context['new_user_ids'] = user_ids
+        return user_ids
 
-        # Modify existing user
-        if user_type == 'existing':
-            user_obj.write(cr, uid, existing_user_ids , {
-                                   'groups_id': [(4,group_id)],
-                                   'action_id': action_id
-                            })
+    def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, new_users, context=None):
+        menu_obj = self.pool.get('ir.ui.menu')
+        user_obj = self.pool.get('res.users')
+        menu_action_id = user_obj._get_menu(cr, uid, context=context)
+        values = {
+            'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64],
+            'domain': wizard_data.domain,
+            'context': wizard_data.action_id.context,
+            'res_model': wizard_data.action_id.res_model,
+            'view_mode': wizard_data.action_id.view_mode,
+            'view_type': wizard_data.action_id.view_type,
+            'search_view_id': wizard_data.action_id.search_view_id.id,
+        }
+        for user_id in user_ids:
+            action_id = menu_obj.create_shortcut(cr, user_id, values)
+            if new_users:
+                user_obj.write(cr, 1, [user_id], {'action_id': action_id})
+            else:
+                user_obj.write(cr, 1, [user_id], {'action_id': menu_action_id})
 
+    def _get_recursive_relations(self, cr, uid, model, ttypes, relation_fields=None, suffix=None, context=None):
+        """Returns list of tuples representing recursive relationships of type ``ttypes`` starting from
+           model with ID ``model_id``.
 
-        #ACCESS RIGHTS / IR.RULES COMPUTATION
+           @param model: browsable model to start loading relationships from
+           @param ttypes: list of relationship types to follow (e.g: ['one2many','many2many'])
+           @param relation_fields: list of previously followed relationship tuples - to avoid duplicates
+                                   during recursion
+           @param suffix: optional suffix to append to the field path to reach the main object
+        """
+        if relation_fields is None:
+            relation_fields = []
+        local_rel_fields = []
+        models = [x[1].model for x in relation_fields]
+        model_obj = self.pool.get('ir.model')
+        model_osv = self.pool.get(model.model)
+        for field in model_osv._columns.values() + [x[2] for x in model_osv._inherit_fields]:
+            if field._type in ttypes and field._obj not in models:
+                relation_model_id = model_obj.search(cr, uid, [('model','=',field._obj)])[0]
+                if field._type == 'one2many':
+                    relation_field = '%s.%s'%(field._fields_id, suffix) if suffix else field._fields_id
+                else:
+                    relation_field = None # TODO: add some filtering for m2m and m2o - not always possible...
+                model_browse = model_obj.browse(cr, uid, relation_model_id, context=context)
+                local_rel_fields.append((relation_field, model_browse))
+                if relation_model_id != model.id and field._type in ['one2many', 'many2many']:
+                    local_rel_fields += self._get_recursive_relations(cr, uid, model_browse,
+                        [field._type], local_rel_fields, suffix=relation_field, context=context)
+        return local_rel_fields
 
-        active_model_ids = model_obj.search(cr, uid, [('model','=',active_model)])
-        active_model_id = active_model_ids and active_model_ids[0] or False
+    def _get_relationship_classes(self, cr, uid, model, context=None):
+        obj0 = [(None, model)]
+        obj1 = self._get_recursive_relations(cr, uid, model, ['one2many'], context=context)
+        obj2 = self._get_recursive_relations(cr, uid, model, ['one2many', 'many2many'], 
+            context=context)
+        obj3 = self._get_recursive_relations(cr, uid, model, ['many2one'], context=context)
+        for dummy, model in obj1:
+            obj3 += self._get_recursive_relations(cr, uid, model, ['many2one'], context=context)
+        return obj0, obj1, obj2, obj3
 
-        def _get_relation(model_id, ttypes, new_obj=[]):
-            obj = []
-            models = map(lambda x:x[1].model, new_obj)
-            field_ids = fields_obj.search(cr, uid, [('model_id','=',model_id),('ttype','in', ttypes)])
-            for field in fields_obj.browse(cr, uid, field_ids, context=context):
-                if field.relation not in models:
-                    relation_model_ids = model_obj.search(cr, uid, [('model','=',field.relation)])
-                    relation_model_id = relation_model_ids and relation_model_ids[0] or False
-                    relation_model = model_obj.browse(cr, uid, relation_model_id, context=context)
-                    obj.append((field.relation_field, relation_model))
-
-                    if relation_model_id != model_id and field.ttype in ['one2many', 'many2many']:
-                        obj += _get_relation(relation_model_id, [field.ttype], obj)
-
-            return obj
-
-        active_model = model_obj.browse(cr, uid, active_model_id, context=context)
-        obj0 = [(None, active_model)]
-        obj1 = _get_relation(active_model_id, ['one2many'])
-        obj2 = _get_relation(active_model_id, ['one2many', 'many2many'])
-        obj3 = _get_relation(active_model_id, ['many2one'])
-        for rel_field, model in obj1:
-            obj3 += _get_relation(model.id, ['many2one'])
+    def _get_access_map_for_groups_and_models(self, cr, uid, group_ids, model_ids, context=None):
+        model_access_obj = self.pool.get('ir.model.access')
+        user_right_ids = model_access_obj.search(cr, uid,
+            [('group_id', 'in', group_ids), ('model_id', 'in', model_ids)],
+            context=context)
+        user_access_matrix = {}
+        if user_right_ids:
+            for access_right in model_access_obj.browse(cr, uid, user_right_ids, context=context):
+                access_line = user_access_matrix.setdefault(access_right.model_id.model, set())
+                for perm in FULL_ACCESS:
+                    if getattr(access_right, perm, 0):
+                        access_line.add(perm)
+        return user_access_matrix
 
+    def _add_access_rights_for_share_group(self, cr, uid, group_id, mode,
+        fields_relations, context=None):
+        """Adds access rights to group_id on object models referenced in ``fields_relations``,
+           intersecting with access rights of current user to avoid granting too much rights
+        """
+        model_access_obj = self.pool.get('ir.model.access')
+        user_obj = self.pool.get('res.users')
+        target_model_ids = [x[1].id for x in fields_relations] 
+        perms_to_add = (mode == 'readonly') and READ_ONLY_ACCESS or FULL_ACCESS
         current_user = user_obj.browse(cr, uid, uid, context=context)
-        if access_mode == 'readonly':
-            res = []
-            # intersect with read access rights of user running the
-            # wizard, to avoid adding more access than current
-            for group in current_user.groups_id:
-                for access_control in group.model_access:
-                     if access_control.model_id.id in res:
-                        continue
-                     if access_control.perm_read:
-                        res.append(access_control.model_id.id)
-                        model_access_obj.create(cr, uid, {
-                        'name': 'Read Access of group %s on %s model'%(share_group_name, access_control.model_id.name),
-                        'model_id' : access_control.model_id.id,
-                        'group_id' : group_id,
-                        'perm_read' : True
-                        })
-            res = []
-            for rel_field, model in obj0+obj1+obj2+obj3:
-                if model.id in res:
-                    continue
-                res.append(model.id)
-                model_access_obj.create(cr, uid, {
-                    'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
-                    'model_id' : model.id,
-                    'group_id' : group_id,
-                    'perm_read' : True
-                })
-        if access_mode == 'readwrite':
-            res = []
-            for rel_field, model in obj0+obj1:
-                if model.id in res:
-                    continue
-                res.append(model.id)
-                model_access_obj.create(cr, uid, {
-                    'name': 'Write Access of group %s on %s model'%(share_group_name, model.name),
-                    'model_id' : model.id,
-                    'group_id' : group_id,
-                    'perm_read' : True,
-                    'perm_write' : True,
-                    'perm_unlink' : True,
-                    'perm_create' : True,
-                })
-            # intersect with access rights of user
-            # running the wizard, to avoid adding more access than current
 
-            for group in current_user.groups_id:
-                for access_control in group.model_access:
-                     if access_control.model_id.id in res:
-                        continue
-                     if access_control.perm_read:
-                        res.append(access_control.model_id.id)
-                        model_access_obj.create(cr, uid, {
-                            'name': 'Read Access of group %s on %s model'%(share_group_name, access_control.model_id.name),
-                            'model_id' : access_control.model_id.id,
-                            'group_id' : group_id,
-                            'perm_read' : True
-                        })
-            for rel_field, model in obj2+obj3:
-                if model.id in res:
-                    continue
-                res.append(model.id)
-                model_access_obj.create(cr, uid, {
-                            'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
-                            'model_id' : model.id,
-                            'group_id' : group_id,
-                            'perm_read' : True
-                        })
-        #
-        # And on OBJ0, OBJ1, OBJ2, OBJ3: add all rules from groups of the user
-        #  that is sharing in the many2many of the rules on the new group
-        #  (rule must be copied instead of adding it if it contains a reference to uid
-        #  or user.xxx so it can be replaced correctly)
+        current_user_access_map = self._get_access_map_for_groups_and_models(cr, uid,
+            [x.id for x in current_user.groups_id], target_model_ids, context=context)
+        group_access_map = self._get_access_map_for_groups_and_models(cr, uid,
+            [group_id], target_model_ids, context=context)
+        self.__logger.debug("Current user access matrix: %r", current_user_access_map)
+        self.__logger.debug("New group current access matrix: %r", group_access_map)
 
+        # Create required rights if allowed by current user rights and not
+        # already granted
+        for dummy, model in fields_relations:
+            values = {
+                'name': _('Copied access for sharing'),
+                'group_id': group_id,
+                'model_id': model.id,
+            }
+            current_user_access_line = current_user_access_map.get(model.model,set())
+            existing_group_access_line = group_access_map.get(model.model,set())
+            need_creation = False
+            for perm in perms_to_add:
+                if perm in current_user_access_line \
+                   and perm not in existing_group_access_line:
+                    values.update({perm:True})
+                    group_access_map.setdefault(model.model, set()).add(perm)
+                    need_creation = True
+            if need_creation:
+                model_access_obj.create(cr, 1, values)
+                self.__logger.debug("Creating access right for model %s with values: %r", model.model, values)
+
+    def _link_or_copy_current_user_rules(self, cr, uid, group_id, fields_relations, context=None):
+        user_obj = self.pool.get('res.users')
+        rule_obj = self.pool.get('ir.rule')
+        current_user = user_obj.browse(cr, uid, uid, context=context)
+        completed_models = set()
         for group in current_user.groups_id:
-            res = []
-            for rel_field, model in obj0+obj1+obj2+obj3:
-                if model.id in res:
+            for dummy, model in fields_relations:
+                if model.id in completed_models:
                     continue
-                res.append(model.id)
+                completed_models.add(model.id)
                 for rule in group.rule_groups:
                     if rule.model_id == model.id:
-                        rule_obj.copy(cr, uid, rule.id, default={
-                            'name': '%s-%s'%(share_group_name, model.model),
-                            'groups': [(6,0,[group_id])]
-                        }, context=context)
+                        if 'user.' in rule.domain_force:
+                            # Above pattern means there is likely a condition
+                            # specific to current user, so we must copy the rule using
+                            # the evaluated version of the domain.
+                            # And it's better to copy one time too much than too few
+                            rule_obj.copy(cr, 1, rule.id, default={
+                                'name': '%s (%s)' %(rule.name, _('(Copy for sharing)')),
+                                'groups': [(6,0,[group_id])],
+                                'domain_force': rule.domain, # evaluated version!
+                            })
+                            self.__logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                        else:
+                            # otherwise we can simply link the rule to keep it dynamic
+                            rule_obj.write(cr, 1, [rule.id], {
+                                    'groups': [(4,group_id)]
+                                })
+                            self.__logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
 
-        rule_obj.create(cr, uid, {
-                'name': '%s-%s'%(share_group_name, active_model.model),
-                'model_id': active_model.id,
-                'domain_force': domain,
-                'groups': [(6,0,[group_id])]
+    def _create_indirect_sharing_rules(self, cr, uid, wizard_data, group_id, fields_relations, context=None):
+        user_obj = self.pool.get('res.users')
+        current_user = user_obj.browse(cr, uid, uid, context=context)
+        rule_obj = self.pool.get('ir.rule')
+        try:
+            domain = safe_eval(wizard_data.domain)
+            if domain:
+                domain_expr = expression(domain)
+                for rel_field, model in fields_relations:
+                    related_domain = []
+                    for element in domain:
+                        if domain_expr._is_leaf(element):
+                            left, operator, right = element 
+                            left = '%s.%s'%(rel_field, left)
+                            element = left, operator, right
+                        related_domain.append(element)
+                    rule_obj.create(cr, 1, {
+                        'name': _('Indirect sharing filter created by user %s (%s) for group %s') % \
+                            (current_user.name, current_user.login, group_id),
+                        'model_id': model.id,
+                        'domain_force': str(related_domain),
+                        'groups': [(4,group_id)]
+                    })
+                    self.__logger.debug("Created indirect rule on model %s with domain: %s", model.model, repr(related_domain))
+        except Exception:
+            self.__logger.exception('Failed to create share access')
+            raise osv.except_osv(_('Sharing access could not be setup'),
+                                 _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
+
+    def _create_result_lines(self, cr, uid, wizard_data, context=None):
+        user_obj = self.pool.get('res.users')
+        result_obj = self.pool.get('share.wizard.result.line')
+        share_root_url = wizard_data.share_root_url
+        format_url = '%(login)' in share_root_url and '%(password)' in share_root_url
+        existing_passwd_str = _('*usual password*')
+        if wizard_data.user_type == 'new':
+            for email in wizard_data.new_users.split('\n'):
+                user_id = user_obj.search(cr, 1, [('login', '=', email)], context=context)
+                password = user_obj.read(cr, 1, user_id[0], ['password'])['password']
+                share_url = share_root_url % \
+                        {'login': email,
+                         'password': password} if format_url else share_root_url
+                result_obj.create(cr, uid, {
+                        'share_wizard_id': wizard_data.id,
+                        'login': email,
+                        'password': password,
+                        'share_url': share_url,
+                    }, context=context)
+        else:
+            # existing users
+            for user in wizard_data.user_ids:
+                share_url = share_root_url % \
+                        {'login': email, 
+                         'password': ''} if format_url else share_root_url
+                result_obj.create(cr, uid, {
+                        'share_wizard_id': wizard_data.id,
+                        'login': user.user_id.login,
+                        'password': existing_passwd_str,
+                        'share_url': share_url,
+                        'newly_created': False,
+                    }, context=context)
+
+    def go_step_2(self, cr, uid, ids, context=None):
+        wizard_data = self.browse(cr, uid, ids and ids[0], context=context)
+        assert wizard_data.action_id and wizard_data.access_mode and \
+                ((wizard_data.user_type == 'new' and wizard_data.new_users) or \
+                    (wizard_data.user_type == 'existing' and wizard_data.user_ids))
+
+        # Create shared group and users
+        group_id = self._create_share_group(cr, uid, wizard_data, context=context)
+        user_obj = self.pool.get('res.users')
+        current_user = user_obj.browse(cr, uid, uid, context=context)
+        if wizard_data.user_type == 'new':
+            user_ids = self._create_new_share_users(cr, uid, wizard_data, group_id, context=context)
+        else:
+            user_ids = [x.user_id.id for x in wizard_data.user_ids]
+            # reset home action to regular menu as user needs access to multiple items
+            user_obj.write(cr, 1, user_ids, {
+                                   'groups_id': [(4,group_id)],
+                            })
+        self._setup_action_and_shortcut(cr, uid, wizard_data, user_ids, 
+            (wizard_data.user_type == 'new'), context=context)
+
+
+        model_obj = self.pool.get('ir.model')
+        model_id = model_obj.search(cr, uid, [('model','=', wizard_data.action_id.res_model)])[0]
+        model = model_obj.browse(cr, uid, model_id, context=context)
+
+        # ACCESS RIGHTS
+        # We have several classes of objects that should receive different access rights:
+        # Let:
+        #   - [obj0] be the target model itself
+        #   - [obj1] be the target model and all other models recursively accessible from
+        #            obj0 via one2many relationships
+        #   - [obj2] be the target model and all other models recursively accessible from
+        #            obj0 via one2many and many2many relationships
+        #   - [obj3] be all models recursively accessible from obj1 via many2one relationships
+        obj0, obj1, obj2, obj3 = self._get_relationship_classes(cr, uid, model, context=context)
+        mode = wizard_data.access_mode
+
+        # Add access to [obj0] and [obj1] according to chosen mode   
+        self._add_access_rights_for_share_group(cr, uid, group_id, mode, obj0, context=context)
+        self._add_access_rights_for_share_group(cr, uid, group_id, mode, obj1, context=context)
+
+        # Add read-only access (always) to [obj2] and [obj3]
+        self._add_access_rights_for_share_group(cr, uid, group_id, 'readonly', obj2, context=context)
+        self._add_access_rights_for_share_group(cr, uid, group_id, 'readonly', obj3, context=context)
+
+
+        # IR.RULES
+        #   A. On [obj0]: 1 rule with domain of shared action
+        #   B. For each model in [obj1]: 1 rule in the form: 
+        #           many2one_rel.domain_of_obj0
+        #        where many2one_rel is the many2one used in the definition of the
+        #        one2many, and domain_of_obj0 is the sharing domain
+        #        For example if [obj0] is project.project with a domain of 
+        #                ['id', 'in', [1,2]]
+        #        then we will have project.task in [obj1] and we need to create this 
+        #        ir.rule on project.task:
+        #                ['project_id.id', 'in', [1,2]]
+        #   C. And on [obj0], [obj1], [obj2], [obj3]: add all rules from all groups of 
+        #     the user that is sharing 
+        #     (Warning: rules must be copied instead of linked if they contain a reference 
+        #     to uid, and it must be replaced correctly)
+        rule_obj = self.pool.get('ir.rule')
+        # A.
+        rule_obj.create(cr, 1, {
+            'name': _('Sharing filter created by user %s (%s) for group %s') % \
+                        (current_user.name, current_user.login, group_id),
+            'model_id': model.id,
+            'domain_force': wizard_data.domain,
+            'groups': [(4,group_id)]
             })
-        for rel_field, model in obj1:
-            obj1_domain = []
-            for opr1, opt, opr2 in domain:
-                new_opr1 = '%s.%s'%(rel_field, opr1)
-                obj1_domain.append((new_opr1, opt, opr2))
+        # B.
+        self._create_indirect_sharing_rules(cr, uid, wizard_data, group_id, obj1, context=context)
+        # C.
+        all_relations = obj0 + obj1 + obj2 + obj3
+        self._link_or_copy_current_user_rules(cr, uid, group_id, all_relations, context=context)
 
-            rule_obj.create(cr, uid, {
-                'name': '%s-%s'%(share_group_name, model.model),
-                'model_id': model.id,
-                'domain_force': obj1_domain,
-                'groups': [(6,0,[group_id])]
-            })
-        context['share_model'] = active_model.model
-        context['share_rec_id'] = active_id
+        # so far, so good -> populate summary results and return them
+        self._create_result_lines(cr, uid, wizard_data, context=context)
 
-
-        data_obj = self.pool.get('ir.model.data')
-
-        form_view = data_obj._get_id(cr, uid, 'share', 'share_result_form')
-        form_view_id = False
-        if form_view:
-            form_view_id = data_obj.browse(cr, uid, form_view, context=context).res_id
-
-
-        value = {
-            'name': _('Step:4 Share Users Detail'),
+        dummy, step2_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step2_form')
+        return {
+            'name': _('Sharing Wizard - Step 2'),
             'view_type': 'form',
             'view_mode': 'form',
-            'res_model': 'share.result',
+            'res_model': 'share.wizard',
             'view_id': False,
-            'views': [(form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+            'res_id': ids[0],
+            'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
-            'context': context,
             'target': 'new'
         }
-        return value
+
+    def send_emails(self, cr, uid, ids, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not user.user_email:
+            raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
+        for wizard_data in self.browse(cr, uid, ids, context=context):
+            for result_line in wizard_data.result_line_ids:
+                email_to = result_line.login
+                subject = _('%s has shared OpenERP %s information with you') % (user.name, wizard_data.action_id.name)
+                body = _("Dear,\n\n") + subject + "\n\n"
+                body += _("To access it, you can go to the following URL:\n    %s") % wizard_data.share_root_url
+                body += "\n\n"
+                if result_line.newly_created:
+                    body += _("You may use the following login and password to get access to this protected area:") + "\n"
+                    body += "%s: %s" % (_("Username"), result_line.login) + "\n"
+                    body += "%s: %s" % (_("Password"), result_line.password) + "\n"
+                else:
+                    body += _("This additional data has been automatically added to your current access.\n")
+                    body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
+    
+                if not tools.email_send(
+                                            user.user_email,
+                                            email_to,
+                                            subject,
+                                            body):
+                    self.__logger.warning('Failed to send sharing email from %s to %s', user.user_email, email_to)
+        return {'type': 'ir.actions.act_window_close'}
 share_create()
 
-
-class share_result(osv.osv_memory):
-    _name = "share.result"
+class share_user_ref(osv.osv_memory):
+    _name = 'share.wizard.user'
+    _rec_name = 'user_id'
     _columns = {
-        'users': fields.text("Users", readonly=True),
-     }
+        'user_id': fields.many2one('res.users', 'Users', required=True, domain=[('share', '=', True)]),
+        'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True), 
+    }
+share_user_ref()
 
-
-
-    def do_send_email(self, cr, uid, ids, context=None):
-        user_obj = self.pool.get('res.users')
-        if not context:
-            context={}
-        existing_user_ids = context.get('existing_user_ids', [])
-        new_user_ids = context.get('new_user_ids', [])
-        share_url = tools.config.get('share_root_url', False)
-        user = user_obj.browse(cr, uid, uid, context=context)
-        for share_user in user_obj.browse(cr, uid, new_user_ids+existing_user_ids, context=context):
-            email_to = share_user.user_email
-            subject = '%s wants to share private data with you' %(user.name)
-            body = """
-    Dear,
-
-             %s wants to share private data from OpenERP with you!
-    """%(user.name)
-            if share_url:
-                body += """
-             To view it, you can access the following URL:
-                   %s
-    """%(user.name, share_url)
-            if share_user.id in new_user_ids:
-                body += """
-             You may use the following login and password to get access to this
-             protected area:
-                   login: %s
-                   password: %s
-    """%(user.login, user.password)
-            elif share_user.id in existing_user_ids:
-                 body += """
-             You may use your existing login and password to get access to this
-             additional data. As a reminder, your login is %s.
-    """%(user.name)
-
-            flag = tools.email_send(
-                user.user_email,
-                email_to,
-                subject,
-                body
-            )
-        return flag
-
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-             To get default values for the object.
-        """
-
-        res = super(share_result, self).default_get(cr, uid, fields, context=context)
-        user_obj = self.pool.get('res.users')
-        if not context:
-            context={}
-        existing_user_ids = context.get('existing_user_ids', [])
-        new_user_ids = context.get('new_user_ids', [])
-        share_url = tools.config.get('share_root_url', False)
-        if 'users' in fields:
-            users = []
-            for user in user_obj.browse(cr, uid, new_user_ids):
-                txt = 'Login: %s Password: %s' %(user.login, user.password)
-                if share_url:
-                    txt += ' Share URL: %s' %(share_url)
-                users.append(txt)
-            for user in user_obj.browse(cr, uid, existing_user_ids):
-                txt = 'Login: %s' %(user.login)
-                if share_url:
-                    txt += ' Share URL: %s' %(share_url)
-                users.append(txt)
-            res['users'] = '\n'.join(users)
-        return res
-
-share_result()
+class share_result_line(osv.osv_memory):
+    _name = 'share.wizard.result.line'
+    _rec_name = 'login'
+    _columns = {
+        'login': fields.char('Username', size=64, required=True, readonly=True),
+        'password': fields.char('Password', size=64, readonly=True),
+        'share_url': fields.char('Share URL', size=512, required=True),
+        'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True),
+        'newly_created': fields.boolean('Newly created', readonly=True),
+    }
+    _defaults = {
+        'newly_created': True,
+    }
+share_result_line()
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 159583eecbb..e6cade91c84 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -1,106 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>       
+    <data>
 
-     	<record id="share_step0_form" model="ir.ui.view">
+        <record id="share_step0_form" model="ir.ui.view">
             <field name="name">share.step0.form</field>
-            <field name="model">share.create</field>
+            <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Share">
-              <separator colspan="4" string="Step 1: Chose the action and the additional domain"/>    			  
-			  <field name="action_id"/>
-              <field name="domain"/>
-			  <separator colspan="4"/>
-			   <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_step_1" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
-				</group>
-			</form>
+                <form string="Share wizard: step 0">
+                    <separator colspan="4"
+                        string="Please select the action that opens the screen containing the data you want to share."/>
+                    <field name="action_id" colspan="4"/>
+                    <separator colspan="4"
+                        string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
+                    <field name="domain"/>
+                    <separator colspan="4"/>
+                    <group colspan="4">
+                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_1" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
             </field>
         </record>
 
         <record id="share_step1_form" model="ir.ui.view">
             <field name="name">share.step1.form</field>
-            <field name="model">share.create</field>
+            <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Share">              
-			  <separator colspan="4" string="Step 2: Chose the User type"/>              
-			  <field name="user_type"/>
-              <newline/>
-              <group colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
-                  <separator colspan="4" string="Exising Users"/>
-                  <field colspan="4" nolabel="1" name="user_ids"  domain="[('share_user','=',True)]"/>
-              </group>
-              <group colspan="4" attrs="{'invisible':[('user_type','!=','new')]}">
-                <separator colspan="4" string="New Users"/>
-                <field colspan="4" nolabel="1" name="new_user"/>
-              </group>
-			  <separator colspan="4"/>
-			   <group col="3" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>                   
-					<button name="do_step_2" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
-				</group>
-			</form>
+                <form string="Share wizard: step 1">
+                    <separator colspan="4" string="Who would you want to share this data with?"/>
+                    <field name="user_type"/>
+                    <group colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
+                        <separator colspan="4" string="Existing External Users"/>
+                        <field colspan="4" nolabel="1" name="user_ids" mode="tree">
+                            <tree editable="bottom" string="">
+                                <field name="user_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group colspan="4" attrs="{'invisible':[('user_type','!=','new')]}">
+                        <separator colspan="4" string="New Users (please provide one e-mail address per line below)"/>
+                        <field colspan="4" nolabel="1" name="new_users"/>
+                    </group>
+                    <separator colspan="4" string="Select the desired shared access mode:"/>
+                    <group colspan="4">
+                        <field name="access_mode"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group colspan="4">
+                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_2" string="Finish" colspan="1" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
             </field>
         </record>
 
         <record id="share_step2_form" model="ir.ui.view">
             <field name="name">share.step2.form</field>
-            <field name="model">share.create</field>
+            <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Share">              
-			  <separator colspan="4" string="Step 3: Chose Access Mode"/>
-              <group colspan="4">              
-    			  <field name="access_mode"/>              
-              </group>              
-			  <separator colspan="4"/>
-			   <group col="3" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_step_3" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
-				</group>
-			</form>
+                <form string="Share wizard: step 2">
+                    <separator colspan="4" string="Congratulations, you have successfully setup a new shared access!"/>
+                    <label colspan="4" string="Here is a summary of the access points you have just created:"/>
+                    <field name="result_line_ids" nolabel="1" colspan="4" mode="tree">
+                        <tree string="Summary">
+                            <field name="login"/>
+                            <field name="password"/>
+                            <field name="share_url"/>
+                        </tree>
+                        <form string="Access info">
+                            <field name="login"/>
+                            <field name="password"/>
+                            <field name="share_url" colspan="4"/>
+                        </form>
+                    </field>
+                    <field colspan="4" name="share_root_url"/>
+                    <separator colspan="4"/>
+                    <group colspan="4">
+                        <button special="cancel" string="Close" icon='gtk-ok'/>
+                        <button name="send_emails" string="Send Email Notification(s)" colspan="1" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
             </field>
         </record>
 
-         
-
-       <record id="action_share_wizard" model="ir.actions.act_window">
-            <field name="name">Share Access Rules</field>
+        <!--  action for manual launch from menuitem. context may contain:
+                    - 'action_id' (id of action)
+                    - 'domain' (string expression for full domain to apply as sent to server, 
+                               with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
+                    - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+         -->
+        <record id="action_share_wizard" model="ir.actions.act_window">
+            <field name="name">Share Wizard</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">share.create</field>
+            <field name="res_model">share.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="share_step0_form"/>	        
+            <field name="view_id" ref="share_step0_form"/>
             <field name="target">new</field>
-    	</record>
-
-        <menuitem action="action_share_wizard" id="menu_action_share_wizard" parent="base.menu_security"/>
-        
-
-        <record id="share_result_form" model="ir.ui.view">
-            <field name="name">share.result.form</field>
-            <field name="model">share.result</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-			<form string="Share">
-              <separator colspan="4" string="Step 4: Share Users Detail"/>    			  
-			  <field name="users" colspan="4" nolabel="1"/>              
-			  <separator colspan="4"/>
-			   <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_send_email" string="Send Email" type="object" icon="gtk-apply"/>
-				</group>
-			</form>
-            </field>
         </record>
-        
 
-        
+        <!--  action for direct launch from client widget with context providing:
+                    - 'action_id' (id of action)
+                    - 'domain' (string expression for full domain to apply as sent to server, 
+                               with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
+                    - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+         -->
+        <record id="action_share_wizard_step1" model="ir.actions.act_window">
+            <field name="name">Share Wizard</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">share.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="share_step1_form"/>
+            <field name="target">new</field>
+        </record>
 
-                 
+        <!--  temporarily under Low-Level-Actions  -->
+        <menuitem action="action_share_wizard" id="menu_action_share_wizard" parent="base.next_id_4" groups="group_share_user" icon="terp-rating-rated"/>
 
-	</data>
+    </data>
 </openerp>

From f18c6eb0c220d0fcac2ff6af7b747626f6e8d619 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 13:59:01 +0200
Subject: [PATCH 277/294] [IMP] useability main flows and some bugfixes

bzr revid: fp@tinyerp.com-20101017115901-4y7a9sq42dckklx1
---
 addons/account/account_invoice_view.xml      | 17 ----
 addons/crm/crm_opportunity_view.xml          |  6 +-
 addons/delivery/delivery_view.xml            | 22 +++--
 addons/point_of_sale/pos_view.xml            |  2 +-
 addons/product/product_view.xml              | 51 +++++-----
 addons/sale/sale.py                          |  4 +-
 addons/sale/sale_view.xml                    |  2 +-
 addons/stock/product_view.xml                |  8 +-
 addons/stock/stock_view.xml                  | 99 +++++++++++---------
 addons/stock/wizard/stock_partial_picking.py | 24 +++--
 10 files changed, 120 insertions(+), 115 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 71c211bb2c3..28d2f5a06a6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -510,22 +510,5 @@
            res_model="account.invoice"
            src_model="account.journal"/>
 
-        <act_window
-            domain="[('account_id.reconcile', '=', True)]"
-            context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
-            id="act_account_invoice_account_move_unreconciled"
-	    groups="base.group_extended"
-            name="Items to Reconcile"
-            res_model="account.move.line"
-            src_model="account.invoice"/>
-
-        <act_window
-            context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
-            id="act_account_invoice_account_move_invoice_link"
-            name="Invoice Items"
-	    groups="base.group_extended"
-            res_model="account.move.line"
-            src_model="account.invoice"/>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5bb55a2320d..644d12cfc77 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -76,6 +76,9 @@
                                 <button name="case_cancel" string="Cancel"
                                     states="draft" type="object"
                                     icon="gtk-close" />
+                                <button name="case_mark_lost" string="Mark Lost"
+                                    states="open,pending" type="object"
+                                    icon="gtk-cancel" />
                                 <button name="case_reset" string="Reset to Draft"
                                     states="done,cancel" type="object"
                                     icon="gtk-convert" />
@@ -89,9 +92,6 @@
                                     states="open,pending" type="object"
                                     groups="base.group_extended"
                                     icon="gtk-go-up" />
-                                <button name="case_mark_lost" string="Mark Lost"
-                                    states="open,pending" type="object"
-                                    icon="gtk-cancel" />
                                 <button name="case_close" string="Mark Won"
                                     states="open,pending" type="object"
                                     icon="gtk-apply" />
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 17f4e1b9ddf..b7ec0fed61e 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -234,10 +234,13 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <field name="product_uom" position="after">
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </field>
+                <group colspan="2" col="2" position="after">
+                    <group colspan="2" col="2" groups="base.group_extended">
+                        <separator string="Weights" colspan="2"/>
+                        <field name="weight"/>
+                        <field name="weight_net"/>
+                    </group>
+                </group>
             </field>
         </record>
 
@@ -247,10 +250,13 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
             <field name="arch" type="xml">
-                <field name="product_uom" position="after">
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </field>
+                <group colspan="2" col="2" position="after">
+                    <group colspan="2" col="2" groups="base.group_extended">
+                        <separator string="Weights" colspan="2"/>
+                        <field name="weight"/>
+                        <field name="weight_net"/>
+                    </group>
+                </group>
             </field>
         </record>
 
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 241ce4c53fe..4d277d216c8 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -697,7 +697,7 @@
                               <group colspan="2" col="2" name="Prices">
                                   <separator string="Prices" colspan="2"/>
                                   <field name="lst_price"/>
-                                <field name="standard_price"/>
+                                  <field name="standard_price"/>
                              </group>
                         </page>
                    </notebook>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d61517d96e9..d0107c56ffe 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -17,7 +17,7 @@
                    <separator orientation="vertical"/>
                    <field name="default_code"/>
                    <field name="name"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
+                   <field name="categ_id" widget="selection" operator="child_of" groups="base.group_extended"/>
                    <newline/>
                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
@@ -53,7 +53,7 @@
                     <field name="lst_price"/>
                     <field name="standard_price"/>
                     <field name="price" invisible="not context.get('pricelist',False)"/>
-                    <field name="state"/>
+                    <field name="state" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -90,6 +90,16 @@
                                 <field name="procure_method" groups="base.group_extended"/>
                                 <field name="supply_method"/>
                             </group>
+                            <group colspan="2" col="2">
+                                <separator string="Base Prices" colspan="2"/>
+                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                <field name="list_price"/>
+                                <newline/>
+                                <field name="price_margin" groups="product.group_product_variant"/>
+                                <field name="price_extra" groups="product.group_product_variant"/>
+                                <newline/>
+                                <field groups="base.group_extended" name="cost_method"/>
+                            </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Weigths" colspan="2"/>
@@ -98,11 +108,11 @@
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                             </group>
 
-                            <group colspan="2" col="2" name="status">
+                            <group colspan="2" col="2" name="status" groups="base.group_extended">
                                 <separator string="Status" colspan="2"/>
-                                <field name="categ_id" select="1"/>
+                                <field name="categ_id"/>
                                 <field name="state"/>
-                                <field groups="base.group_extended" name="product_manager"/>
+                                <field name="product_manager"/>
                             </group>
 
                             <group colspan="2" col="2" name="uom">
@@ -140,16 +150,7 @@
                             </group>
 
                         </page>
-                        <page string="Prices &amp; Suppliers">
-                            <separator string="Base Prices" colspan="4"/>
-                            <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                            <field name="list_price"/>
-                            <newline/>
-                            <field name="price_margin" groups="product.group_product_variant"/>
-                            <field name="price_extra" groups="product.group_product_variant"/>
-                            <newline/>
-                            <field groups="base.group_extended" name="cost_method"/>
-                            <newline/>
+                        <page string="Suppliers">
                             <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
@@ -530,7 +531,7 @@
                     <field name="name"/>
                     <field name="categ_id"/>
                     <field name="type"/>
-                    <field name="state"/>
+                    <field name="state" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -559,6 +560,13 @@
                                 <field name="supply_method"/>
                             </group>
 
+                            <group colspan="2" col="2">
+                                <separator string="Base Prices" colspan="2"/>
+                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                <field name="list_price"/>
+                                <field groups="base.group_extended" name="cost_method"/>
+                            </group>
+
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Weigths" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
@@ -566,11 +574,11 @@
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                             </group>
 
-                            <group colspan="2" col="2" name="status">
+                            <group colspan="2" col="2" name="status" groups="base.group_extended">
                                 <separator string="Status" colspan="2"/>
                                 <field name="categ_id" select="1"/>
                                 <field name="state"/>
-                                <field groups="base.group_extended" name="product_manager"/>
+                                <field name="product_manager"/>
                             </group>
 
                             <group colspan="2" col="2" name="uom">
@@ -605,12 +613,7 @@
                             </group>
 
                         </page>
-                        <page string="Prices &amp; Suppliers">
-                            <separator string="Base Prices" colspan="4"/>
-                            <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                            <field name="list_price"/>
-                            <field groups="base.group_extended" name="cost_method"/>
-                            <newline/>
+                        <page string="Suppliers">
                             <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 91f7a6c3088..409be07a765 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -486,9 +486,9 @@ class sale_order(osv.osv):
             'context': "{'type':'out_invoice'}",
             'type': 'ir.actions.act_window',
             'nodestroy' :True,
-            'target': 'new',
+            'target': 'current',
             'res_id': inv_ids and inv_ids[0] or False,
-                  }
+        }
 
         return result
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 274b6973ea8..08fdd8cafcd 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -207,7 +207,7 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-gtk-go-back-rtl" type="object"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 60fab009d0e..35715a9e1fb 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,9 +60,11 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <group col="4" colspan="2">
-                        <field name="standard_price" readonly="1"/>
-                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                    <label string="Cost Price:" align="1.0"/>
+                    <group col="2" colspan="1">
+                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="Update"
+                            type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
                     </group>
                 </field>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8c3bc3ddcec..0b2ecea565f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1341,35 +1341,38 @@
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Stock Moves">
-                    <group colspan="2" col="4">
-                        <separator colspan="4" string="Move Information"/>
-                        <field name="name" colspan="4"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
+                    <group colspan="4" col="7">
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
+                        <newline/>
+                        <field name="location_id" context="{'full':True}"/>
+                        <field name="location_dest_id" context="{'full':True}"/>
+                        <field name="address_id" context="{'contact_display':'partner'}"/>
+
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator colspan="2" string="Move Information"/>
+                        <field name="name" string="Reason"/>
                         <field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
                         <field name="product_uos" groups="product.product_uos" colspan="4"/>
                     </group>
 
                     <group colspan="2" col="2">
-                        <separator string="Locations &amp; Picking" colspan="2" />
-                        <field name="location_id" widget="selection"/>
-                        <field name="location_dest_id" widget="selection"/>
+                        <separator string="Picking" colspan="2" />
                         <field name="picking_id"/>
-                        <field name="address_id" context="{'contact_display':'partner'}"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
 
                     <group colspan="2" col="2">
-                        <separator string="Dates &amp; Priority" colspan="2" />
-                        <field name="create_date"/>
-                        <field name="date"/>
+                        <separator string="Dates" colspan="2" />
+                        <field name="create_date" groups="base.group_extended"/>
+                        <field name="date" groups="base.group_extended"/>
                         <field name="date_expected"/>
-                        <field name="priority"/>
                     </group>
 
                     <group colspan="2" col="4" groups="base.group_extended">
@@ -1392,10 +1395,10 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_done" states="assigned" string="Process" type="object" icon="gtk-jump-to"/>
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
             </field>
@@ -1529,36 +1532,39 @@
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Moves">
-                    <group colspan="2" col="4">
-                        <separator colspan="4" string="Move Information"/>
-                        <field name="name" colspan="4"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)" colspan="4"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
+                <form string="Receive Products">
+                    <group colspan="4" col="7">
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <field name="product_uom" widget="selection" colspan="4"/>
+                        <newline/>
+                        <field name="location_id" context="{'full':True}"/>
+                        <field name="location_dest_id" context="{'full':True}"/>
+                        <field name="address_id" context="{'contact_display':'partner'}"/>
+
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator colspan="2" string="Move Information"/>
+                        <field name="name" string="Reason"/>
                         <field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
-                        <field name="product_uos" widget="selection" groups="product.product_uos" colspan="4"/>
+                        <field name="product_uos" groups="product.product_uos" colspan="4"/>
                     </group>
 
                     <group colspan="2" col="2">
-                        <separator string="Locations &amp; Picking" colspan="2" />
-                        <field name="location_id" widget="selection"/>
-                        <field name="location_dest_id" widget="selection"/>
+                        <separator string="Picking" colspan="2" />
                         <field name="picking_id"/>
-                        <field name="address_id" context="{'contact_display':'partner'}"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
 
                     <group colspan="2" col="2">
-                        <separator string="Dates &amp; Priority" colspan="2" />
-                        <field name="create_date"/>
-                        <field name="date"/>
+                        <separator string="Dates" colspan="2" />
+                        <field name="create_date" groups="base.group_extended"/>
+                        <field name="date" groups="base.group_extended"/>
                         <field name="date_expected"/>
-                        <field name="priority"/>
                     </group>
 
                     <group colspan="2" col="4" groups="base.group_extended">
@@ -1567,7 +1573,7 @@
                         <button name="%(split_into)d" string="New pack" type="action"
                               groups="base.group_extended"
                               icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed,done"/>
+                              states="draft,assigned,confirmed,done" colspan="1"/>
                         <field name="prodlot_id" groups="base.group_extended"
                             context="{'location_id':location_id, 'product_id':product_id}"
                             domain="[('product_id','=?',product_id)]"
@@ -1575,16 +1581,17 @@
                         <button name="%(track_line)d"
                               groups="base.group_extended"
                               states="draft,waiting,confirmed,assigned,done"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
+
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="5" colspan="2">
-                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
-                        <button name="action_done" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                        <button name="%(action_partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
+                        <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
             </field>
@@ -1662,16 +1669,16 @@
         </record>
 
         <record id="action_reception_picking_move" model="ir.actions.act_window">
-            <field name="name">Incoming Products</field>
+            <field name="name">Receive Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context">{"search_default_receive":1}</field>
+            <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock'))"/>
             <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
-            <field name="help">The Incoming Products lists all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
+            <field name="help">You will find here the list of all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
@@ -1797,16 +1804,16 @@
         </record>
 
         <record id="action_out_picking_move" model="ir.actions.act_window">
-            <field name="name">Outgoing Products</field>
+            <field name="name">Deliver Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context">{"search_default_receive":1}</field>
+            <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
             <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
-            <field name="help">The Outgoing Products lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
+            <field name="help">The 'Deliver Products' menu lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_out_picking_tree">
@@ -1818,7 +1825,7 @@
         <record model="ir.actions.act_window.view" id="action_move_out_picking_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="view_move_form_reception_picking"/>
+            <field name="view_id" ref="view_move_form"/>
             <field name="act_window_id" ref="action_out_picking_move"/>
         </record>
 
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 1b746f230b5..6f84e5ec12c 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -60,13 +60,10 @@ class stock_partial_picking(osv.osv_memory):
         result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         pick_obj = self.pool.get('stock.picking')
         picking_ids = context.get('active_ids', False)
-        _moves_arch_lst = """<form string="Deliver Products">
-                        <separator colspan="4" string="Delivery Information"/>
-                        <group colspan="4" col="4">
-                        <field name="date"/>
-                        </group>
-                        <separator colspan="4" string="Move Detail"/>
-                        """
+        _moves_arch_lst = """<form string="%s">
+                        <field name="date" invisible="1"/>
+                        <separator colspan="4" string="%s"/>
+                        """ % (_('Process Document'), _('Products'))
         _moves_fields = result['fields']
         if picking_ids and view_type in ['form']:
             for pick in pick_obj.browse(cr, uid, picking_ids, context):
@@ -101,13 +98,20 @@ class stock_partial_picking(osv.osv_memory):
                         }
                     })
 
+                    invisible = "1"
+                    if pick.type=='in' and m.product_id.track_incoming:
+                        invisible=""
+                    if pick.type=='out' and m.product_id.track_outgoing:
+                        invisible=""
+
+                        
                     _moves_arch_lst += """
                         <group colspan="4" col="10">
                         <field name="move%s_product_id" nolabel="1"/>
-                        <field name="move%s_product_qty" string="Qty" />
+                        <field name="move%s_product_qty"/>
                         <field name="move%s_product_uom" nolabel="1" />
-                        <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" groups="base.group_extended" />
-                    """%(m.id, m.id, m.id, m.id,m.id)
+                        <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" invisible="%s" />
+                    """%(m.id, m.id, m.id, m.id,m.id, invisible)
 
                     if (need_product_cost and m.product_id.cost_method == 'average'):
                         _moves_fields.update({

From 2b248e655c48a3748baa5940747cd535589df656 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 15:09:11 +0200
Subject: [PATCH 278/294] useability

bzr revid: fp@tinyerp.com-20101017130911-dnffkeld59c4vah2
---
 addons/account/account.py                     |  2 +-
 addons/account/installer.py                   |  6 +--
 addons/delivery/delivery_data.xml             | 49 +++++++++++++++++
 addons/delivery/delivery_demo.xml             | 54 +------------------
 addons/sale/sale_view.xml                     |  2 +-
 addons/sale/stock_view.xml                    |  2 +
 .../sale/wizard/sale_make_invoice_advance.py  |  4 +-
 .../sale/wizard/sale_make_invoice_advance.xml | 26 ++++-----
 8 files changed, 72 insertions(+), 73 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5de913c45a7..bdd6b37b988 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1605,7 +1605,7 @@ class account_tax_code(osv.osv):
         if isinstance(ids, (int, long)):
             ids = [ids]
         reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
-        return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
+        return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
                 for x in reads]
 
     def _default_company(self, cr, uid, context={}):
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b85b2dc21e2..b689697d7a8 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -604,8 +604,7 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'TAX%s%%'%(s_tax*100),
-                                            'description':'TAX%s%%'%(s_tax*100),
+                                           {'name':'TAX %s%%'%(s_tax*100),
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,
@@ -640,8 +639,7 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'TAX%s%%'%(p_tax*100),
-                                             'description':'TAX%s%%'%(p_tax*100),
+                                            {'name':'TAX %s%%'%(p_tax*100),
                                              'amount':p_tax,
                                              'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index 97e841ead45..ff0c90ad193 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -5,5 +5,54 @@
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
         </record>
+
+        <!-- Create a transporter -->
+        
+        <record id="delivery_partner" model="res.partner">
+            <field name="name">The Poste</field>
+        </record>
+        <record id="delivery_partner_address" model="res.partner.address">
+            <field name="type">default</field>
+            <field name="partner_id" ref="delivery_partner"/>
+        </record>
+        
+        <!-- Create a partner -->
+        
+        <record id="delivery_product" model="product.product">
+            <field name="name">Delivery by Poste</field>
+            <field name="type">service</field>
+            <field model="product.category" name="categ_id" search="[]"/>
+        </record>
+
+        <!-- Carrier -->
+        
+        <record id="delivery_carrier" model="delivery.carrier">
+            <field name="name">The Poste</field>
+            <field name="partner_id" ref="delivery_partner"/>
+            <field name="product_id" ref="delivery_product"/>
+        </record>
+        
+        <!-- Carrier Grids -->
+        
+        <record id="delivery_grid" model="delivery.grid">
+            <field name="name">The Poste - Pricelist</field>
+            <field name="carrier_id" ref="delivery_carrier"/>
+        </record>
+        <record id="delivery_grid_line1" model="delivery.grid.line">
+            <field name="name">Weight &lt;= 5kg</field>
+            <field name="grid_id" ref="delivery_grid"/>
+            <field eval="5" name="max_value"/>
+            <field eval="20" name="list_price"/>
+            <field eval="10" name="standard_price"/>
+        </record>
+        <record id="delivery_grid_line2" model="delivery.grid.line">
+            <field name="name">Weight &gt; 5kg</field>
+            <field name="grid_id" ref="delivery_grid"/>
+            <field name="operator">&gt;=</field>
+            <field eval="5" name="max_value"/>
+            <field eval="50" name="list_price"/>
+            <field eval="30" name="standard_price"/>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 2c05d4567a5..f247c53ed82 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,64 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <!-- Create a transporter -->
-        
-        <record id="delivery_partner" model="res.partner">
-            <field name="name">The Poste</field>
-            <field name="website">http://www.openerp.com</field>
-        </record>
-        <record id="delivery_partner_address" model="res.partner.address">
-            <field name="name">Fabien Pinckaers</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="delivery_partner"/>
-        </record>
-        
-        <!-- Create a partner -->
-        
-        <record id="delivery_product" model="product.product">
-            <field name="name">Delivery by Poste</field>
-            <field name="type">service</field>
-            <field model="product.category" name="categ_id" search="[]"/>
-        </record>
-        
-        <!-- Carrier -->
-        
-        <record id="delivery_carrier" model="delivery.carrier">
-            <field name="name">The Poste - Express</field>
-            <field name="partner_id" ref="delivery_partner"/>
-            <field name="product_id" ref="delivery_product"/>
-        </record>
-        
-        <!-- Carrier Grids -->
-        
-        <record id="delivery_grid" model="delivery.grid">
-            <field name="name">The Poste Express - Pricelist</field>
-            <field name="carrier_id" ref="delivery_carrier"/>
-        </record>
         <record id="delivery_grid_line3" model="delivery.grid.line">
-            <field name="name">Franco, price &gt;= 300</field>
-            <field name="grid_id" ref="delivery_grid"/>
+            <field name="name">Free if price &gt;= 300</field>
+            <field name="grid_id" ref="delivery.delivery_grid"/>
             <field eval="300" name="max_value"/>
             <field name="operator">&gt;=</field>
             <field name="type">price</field>
             <field eval="0" name="list_price"/>
             <field eval="20" name="standard_price"/>
         </record>
-        <record id="delivery_grid_line1" model="delivery.grid.line">
-            <field name="name">Weight &lt;= 250</field>
-            <field name="grid_id" ref="delivery_grid"/>
-            <field eval="250" name="max_value"/>
-            <field eval="100" name="list_price"/>
-            <field eval="80" name="standard_price"/>
-        </record>
-        <record id="delivery_grid_line2" model="delivery.grid.line">
-            <field name="name">Weight &gt; 250</field>
-            <field name="grid_id" ref="delivery_grid"/>
-            <field name="operator">&gt;=</field>
-            <field eval="250" name="max_value"/>
-            <field eval="120" name="list_price"/>
-            <field eval="100" name="standard_price"/>
-        </record>
-        
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 08fdd8cafcd..e5357ee0e04 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -198,7 +198,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute" attrs="{'invisible':[('state','!=','draft')]}"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index d0d38cc3d94..ca7506fe518 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -25,6 +25,7 @@
             </field>
         </record>
         
+        <!--
         <act_window
             domain="[('sale_id', '=', active_id)]"
             id="act_sale_order_2_stock_picking"
@@ -32,6 +33,7 @@
             res_model="stock.picking"
             src_model="sale.order"
             context="{'contact_display': 'partner'}" />
+        -->
        
        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0eac0308acc..27c19065652 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -168,7 +168,7 @@ class sale_open_invoice(osv.osv_memory):
             tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
             tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
         return {
-            'name': 'Invoices',
+            'name': _('Deposit Invoice'),
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'account.invoice',
@@ -181,4 +181,4 @@ class sale_open_invoice(osv.osv_memory):
 
 sale_open_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 6e192d31108..33262a5cdd7 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -2,26 +2,26 @@
 <openerp>
     <data>
         <record id="view_sale_advance_payment_inv" model="ir.ui.view">
-            <field name="name">Deposit Invoice</field>
+            <field name="name">Advance Invoice</field>
             <field name="model">sale.advance.payment.inv</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partial Invoice">
+                <form string="Advance Invoice">
                     <field name="product_id"/>
                     <newline />
-                    <field name="qtty"/>
+                    <field name="qtty" invisible="1"/>
                     <field name="amount"/>
                     <newline />
                     <separator string="" colspan="4"/>
                     <label string=""  colspan="2" />
-					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward"/>
                 </form>
             </field>
         </record>
 
         <record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
-            <field name="name">Deposit</field>
+            <field name="name">Advance Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.advance.payment.inv</field>
             <field name="view_type">form</field>
@@ -34,15 +34,15 @@
             <field name="model">sale.open.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Invoices">
-		            <label string="You invoice has been successfully created!" />
+                <form string="Invoices">
+                    <label string="You invoice has been successfully created!" />
                     <newline />
                     <separator string="" colspan="4"/>
-		            <group colspan="4">
-		                <button special="cancel" string="Close" icon="gtk-cancel"/>
-		                <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
-		            </group>
-	             </form>
+                    <group colspan="4">
+                        <button special="cancel" string="Close" icon="gtk-cancel"/>
+                        <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+                    </group>
+                 </form>
             </field>
         </record>
 

From 255eea5655a7d2c75bd3642903d4a804f472f59f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 18:42:26 +0200
Subject: [PATCH 279/294] fix

bzr revid: fp@tinyerp.com-20101017164226-dg8yx79q0c7yrvbr
---
 addons/account/account.py                     |  8 ++++
 addons/account/account_view.xml               | 33 +++++++-------
 addons/account/data/account_data2.xml         |  5 +++
 addons/account/invoice.py                     |  6 ++-
 addons/hr_timesheet/hr_timesheet_data.xml     |  5 +++
 .../hr_timesheet_invoice.py                   |  4 +-
 .../hr_timesheet_invoice_data.xml             | 10 +++++
 addons/profile_tools/installer.py             |  3 +-
 addons/profile_tools/misc_tools_installer.xml |  1 +
 addons/project/installer.py                   |  5 ---
 addons/project_timesheet/project_timesheet.py | 20 +++++++--
 .../project_timesheet_view.xml                |  6 +--
 addons/sale/sale_view.xml                     | 43 +++++++++++--------
 addons/sale/stock_view.xml                    |  2 +-
 .../sale/wizard/sale_make_invoice_advance.py  |  8 ++--
 .../sale/wizard/sale_make_invoice_advance.xml |  2 +-
 16 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index bdd6b37b988..5794c59ffdc 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2544,9 +2544,17 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         if ids:
             return ids[0]
         return False
+
+    def _get_default_accounts(self, cr, uid, context=None):
+        accounts = [{'acc_name':'Current','account_type':'bank'},
+                    {'acc_name':'Deposit','account_type':'bank'},
+                    {'acc_name':'Cash','account_type':'cash'}]
+        return accounts
+
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
         'chart_template_id': _get_chart,
+        'bank_accounts_id': _get_default_accounts,
         'code_digits': 6,
         'seq_journal': True
     }
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cc44e4563d8..8217522715e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2413,23 +2413,22 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="company_id" widget="selection"/>
-                  <field name ="code_digits" />
-                  <field name="chart_template_id" widget="selection"/>
-                  <field name ="seq_journal" />
-                  <field colspan="4" mode="tree" name="bank_accounts_id"
-                         nolabel="1" widget="one2many_list">
-                    <form string="Bank Information">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </form>
-                    <tree editable="bottom" string="Bank Information">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </tree>
-                  </field>
+                    <field name="company_id" widget="selection"/>
+                    <field name ="code_digits" groups="base.group_extended"/>
+                    <field name="chart_template_id" widget="selection"/>
+                    <field name ="seq_journal" groups="base.group_extended"/>
+                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                        <form string="Bank Information">
+                            <field name="acc_name"/>
+                            <field name="account_type"/>
+                            <field name="currency_id" widget="selection" groups="base.group_extended"/>
+                        </form>
+                        <tree editable="bottom" string="Bank Information">
+                            <field name="acc_name"/>
+                            <field name="account_type"/>
+                            <field name="currency_id" widget="selection" groups="base.group_extended"/>
+                        </tree>
+                    </field>
                 </group>
               </data>
             </field>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 8cd2071f70e..38bdd4b2b2c 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="analytic_journal_sale" model="account.analytic.journal">
+            <field name="name">Sales</field>
+            <field name="type">sale</field>
+        </record>
+
         <!--
         Payment term
         -->
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a39e259681e..4b308c06418 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -677,7 +677,7 @@ class account_invoice(osv.osv):
         return (ref or '').replace('/','')
 
     def _get_analytic_lines(self, cr, uid, id):
-        inv = self.browse(cr, uid, [id])[0]
+        inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
         company_currency = inv.company_id.currency_id.id
@@ -693,6 +693,8 @@ class account_invoice(osv.osv):
                     ref = inv.reference
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
+                if not inv.journal_id.analytic_journal_id:
+                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,))
                 il['analytic_lines'] = [(0,0, {
                     'name': il['name'],
                     'date': inv['date_invoice'],
@@ -702,7 +704,7 @@ class account_invoice(osv.osv):
                     'product_id': il['product_id'],
                     'product_uom_id': il['uos_id'],
                     'general_account_id': il['account_id'],
-                    'journal_id': self._get_journal_analytic(cr, uid, inv.type),
+                    'journal_id': inv.journal_id.analytic_journal_id.id,
                     'ref': ref,
                 })]
         return iml
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index e7cb3d5e0d4..a19b2c67291 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -18,5 +18,10 @@
             <field eval="False" name="purchase_ok"/>
         </record>
 
+        <record id="hr.employee" model="hr.employee">
+            <field name="product_id" ref="product_consultant"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index f605fd760be..8dd25ef1eb3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -27,8 +27,8 @@ class hr_timesheet_invoice_factor(osv.osv):
     _name = "hr_timesheet_invoice.factor"
     _description = "Invoice Rate"
     _columns = {
-        'name': fields.char('Internal name', size=128, required=True),
-        'customer_name': fields.char('Name', size=128, help="Name of the customer"),
+        'name': fields.char('Internal name', size=128, required=True, translate=True),
+        'customer_name': fields.char('Name', size=128, help="Label for the customer"),
         'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
     }
     _defaults = {
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index a81af0788b6..462888e0b39 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -6,5 +6,15 @@
             <field name="customer_name">100%</field>
             <field name="factor">0.0</field>
         </record>
+        <record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
+            <field name="name">90%</field>
+            <field name="customer_name">90%</field>
+            <field name="factor">10.0</field>
+        </record>
+        <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
+            <field name="name">50%</field>
+            <field name="customer_name">50%</field>
+            <field name="factor">50.0</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 54fd0602802..6ea024aebbe 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -29,9 +29,10 @@ class misc_tools_installer(osv.osv_memory):
         'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
         'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
         'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
+        'share':fields.boolean('Share Data / Portals',help='This module allows you to easily give restricted access of any filtered list of objects to any customer or supplier.' \
+            'Just click on the share icon to give access to your customers on their project\'s tasks, support requests, invoices, etc.'),
     }
     _defaults = {
-        'lunch': True,
     }
 misc_tools_installer()
 
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index b59f95ab908..d81936756a6 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -25,6 +25,7 @@
               <attribute name="string">Configure</attribute>
           </xpath>
           <group colspan="8">
+            <field name="share"/>
             <field name="lunch"/>
             <field name="idea"/>
             <field name="survey"/>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 7a147737768..693e2d58018 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -47,11 +47,6 @@ class project_installer(osv.osv_memory):
         'project_gtd': fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
     }
-
-    _defaults={
-        'project_issue': True,
-    }
-
 project_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index f5480793adc..8d846f919e7 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -26,6 +26,20 @@ import pooler
 import tools
 from tools.translate import _
 
+class project_project(osv.osv):
+    _inherit = 'project.project'
+    def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
+        result = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
+        if result.get('value', False):
+            try:
+                d = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
+                if d:
+                    result['value']['to_invoice'] = d[1]
+            except ValueError, e:
+                pass
+        return result
+project_project()
+
 class project_work(osv.osv):
     _inherit = "project.task.work"
 
@@ -145,13 +159,13 @@ class project_work(osv.osv):
                     
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
-                    prod_id=prod_id,
-                    quantity=vals_line['unit_amount'], unit=False, context=context)
+                    prod_id=prod_id, company_id=False,
+                    unit_amount=vals_line['unit_amount'], unit=False, context=context)
 
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     vals_line['amount'] = amount_unit['value']['amount']
 
-            obj.write(cr, uid, [line_id.id], vals_line, context=context)
+            self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
             
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 05be6d5466e..c0dcd3a46bc 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -27,14 +27,14 @@
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Member"]' position='after'>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+                    <filter icon="terp-camera_test" string="Invoiceble" domain="[('to_invoice','!=', False)]" help="Invoiceable Project"/>
                 </xpath>
             </field>
         </record>
 
-        <menuitem id="menu_project_billing" name="Billing"
+        <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>
-        <menuitem id="menu_project_billing_line" name="Bill Tasks Work"
+        <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree"/>
         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
                 parent="base.menu_main_pm" sequence="5" groups="project.group_project_finance_user"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e5357ee0e04..36ba5e62d81 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -198,7 +198,8 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice"
+                                    type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
@@ -374,14 +375,15 @@
                 <form string="Sales Order Lines">
                     <group colspan="4" col="6">
                         <field name="order_id"/>
-                        <field name="product_id" readonly="1"/>
+                        <field name="order_partner_id" readonly="1" invisible="1"/>
                         <field name="invoiced"/>
+
+                        <field name="product_id" readonly="1"/>
                         <field name="product_uom_qty" readonly="1"/>
-                        <field groups="product.group_uos" name="product_uos_qty"/>
                         <field name="product_uom"/>
+
                         <field colspan="4" name="name" groups="base.group_extended"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                        <field name="order_partner_id" readonly="1" invisible="1"/>
                     </group>
                     <separator colspan="4" string="Price"/>
                     <group colspan="4" col="6">
@@ -394,20 +396,21 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="3" colspan="2">
-                       <!-- <button colspan="1"
-                          name="%(action_view_sale_order_line_make_invoice)d"
-                          string="Make Invoice"
-                          type="action"
-                          icon="terp-document-new"
-                          attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>-->
                         <button name="button_cancel"
                             string="Cancel" type="object"
                             icon="gtk-cancel"
-                            attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
+                            states="confirmed,exception"/>
+                        <button colspan="1"
+                            name="%(action_view_sale_order_line_make_invoice)d"
+                            string="Create Invoice"
+                            type="action"
+                            states="done"
+                            icon="gtk-go-forward"
+                            attrs="{'invisible': [('invoiced', '=', 1)]}"/>
                         <button name="button_done"
                             string="Done" type="object"
-                            icon="gtk-jump-to"
-                            attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
+                            states="confirmed,exception"
+                            icon="gtk-go-forward" />
                     </group>
                 </form>
             </field>
@@ -444,10 +447,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-check" string="Confirmed"
+                    <filter icon="terp-check" string="To Do"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
-                        help="Confirmed Sale Order Lines"
+                        help="Confirmed sale order lines, not yet delivered"
+                        />
+                    <filter icon="terp-check" string="Done"
+                        domain="[('state','=','done')]"
+                        name="sale_order_done"
+                        help="Sale order lines done"
                         />
                     <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped"
@@ -514,7 +522,7 @@
         src_model="product.product"
         groups="base.group_extended"/>
 
-        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"
+        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"
             groups="base.group_extended"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <!-- configartion view -->
@@ -530,8 +538,7 @@
                   <attribute name="string">Sales Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                <attribute name="string"
-                       >Configure Sales Order Logistic</attribute>
+                <attribute name="string">Configure Sales Order Logistic</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">Setup your sales workflow and default values.</attribute>
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index ca7506fe518..4075c523cb9 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -33,7 +33,6 @@
             res_model="stock.picking"
             src_model="sale.order"
             context="{'contact_display': 'partner'}" />
-        -->
        
        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -48,6 +47,7 @@
             <field name="view_id" ref="stock.view_picking_out_form"/>
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
+        -->
         
         <!-- Adding Sale Order Reference to outgoing picking -->
         
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 27c19065652..0037c10405d 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -26,8 +26,9 @@ class sale_advance_payment_inv(osv.osv_memory):
     _name = "sale.advance.payment.inv"
     _description = "Sale Advance Payment Invoice"
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
-        'amount': fields.float('Unit Price', size=(16, 2), required=True),
+        'product_id': fields.many2one('product.product', 'Advance Product', required=True,
+            help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
+        'amount': fields.float('Advance Amount', size=(16, 2), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', size=(16, 2), required=True),
     }
     _defaults = {
@@ -95,6 +96,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 }
 
                 inv_id = inv_obj.create(cr, uid, inv)
+                inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context)
 
                 for inv in sale.invoice_ids:
                     ids_inv.append(inv.id)
@@ -168,7 +170,7 @@ class sale_open_invoice(osv.osv_memory):
             tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
             tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
         return {
-            'name': _('Deposit Invoice'),
+            'name': _('Advance Invoice'),
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'account.invoice',
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 33262a5cdd7..2cdcb9b8c99 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -40,7 +40,7 @@
                     <separator string="" colspan="4"/>
                     <group colspan="4">
                         <button special="cancel" string="Close" icon="gtk-cancel"/>
-                        <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+                        <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-go-forward"/>
                     </group>
                  </form>
             </field>

From ea969153db4f887a8fb9213b7e7cd11f01bb31e3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 19:30:00 +0200
Subject: [PATCH 280/294] [IMP+FIX] improvements patches from xrg

bzr revid: fp@tinyerp.com-20101017173000-m208j7b6kges3zlc
---
 addons/account/account.py                     |  7 ++-
 addons/account/account_analytic_line.py       | 10 +--
 addons/account/invoice.py                     | 12 ++--
 addons/account/security/ir.model.access.csv   |  8 +--
 addons/account/test/account_report.yml        |  4 +-
 addons/audittrail/audittrail.py               | 62 +++++++++----------
 addons/crm/crm_lead.py                        | 22 ++++---
 addons/crm/crm_meeting.py                     |  2 +-
 addons/crm/crm_opportunity.py                 |  4 +-
 addons/fetchmail/fetchmail.py                 |  3 +-
 addons/hr_recruitment/hr_recruitment.py       |  4 +-
 .../hr_timesheet_invoice.py                   |  6 +-
 addons/mrp/procurement.py                     |  4 +-
 addons/project/project.py                     |  6 +-
 addons/project_issue/project_issue.py         |  4 +-
 addons/purchase/purchase.py                   |  4 +-
 addons/stock/product.py                       |  2 +
 addons/stock/stock.py                         |  2 +-
 addons/stock/stock_demo.xml                   |  5 +-
 .../survey/report/survey_browse_response.py   |  1 +
 20 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5794c59ffdc..8ef5004df04 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1215,7 +1215,8 @@ class account_move(osv.osv):
     #
     # TODO: Check if period is closed !
     #
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        context = context or {}
         if 'line_id' in vals and context.get('copy'):
             for l in vals['line_id']:
                 if not l[0]:
@@ -1256,6 +1257,7 @@ class account_move(osv.osv):
         return result
 
     def copy(self, cr, uid, id, default={}, context={}):
+        context = context or {}
         default.update({
             'state':'draft',
             'name':'/',
@@ -1265,7 +1267,8 @@ class account_move(osv.osv):
         })
         return super(account_move, self).copy(cr, uid, id, default, context)
 
-    def unlink(self, cr, uid, ids, context={}, check=True):
+    def unlink(self, cr, uid, ids, context=None, check=True):
+        context = context or {}
         toremove = []
         obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context):
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a982ca51182..f3c2b71122f 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -24,8 +24,6 @@ import time
 from osv import fields
 from osv import osv
 from tools.translate import _
-import tools
-from tools import config
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
@@ -82,12 +80,13 @@ class account_analytic_line(osv.osv):
             return {}
         product_obj = self.pool.get('product.product')
         analytic_journal_obj =self.pool.get('account.analytic.journal')
+        company_obj = self.pool.get('res.company')
+        product_price_type_obj = self.pool.get('product.price.type')
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id)
         if not company_id:
             company_id = j_id.company_id.id
         result = 0.0
-        is_purchase = False
 
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
@@ -99,8 +98,6 @@ class account_analytic_line(osv.osv):
                                 'for this product: "%s" (id:%d)') % \
                                 (prod.name, prod.id,))
             amount_unit = prod.price_get('standard_price', context)[prod.id]
-            is_purchase = True
-
         else:
             a = prod.product_tmpl_id.property_account_income.id
             if not a:
@@ -128,9 +125,8 @@ class account_analytic_line(osv.osv):
             if pricetype.field == 'list_price':
                 flag = True
             amount_unit = prod.price_get(pricetype.field, context)[prod.id]
-            amount = amount_unit*unit_amount or 1.0
             prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-            amount = amount_unit*unit_amount or 1.0
+            amount = amount_unit*unit or 1.0
             result = round(amount, prec)
             if not flag:
                 result *= -1
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 4b308c06418..0b314109052 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -351,7 +351,7 @@ class account_invoice(osv.osv):
         if view_type == 'tree':
             doc = etree.XML(res['arch'])
             nodes = doc.xpath("//field[@name='partner_id']")
-            partner_string = 'Customer'
+            partner_string = _('Customer')
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
                 partner_string = _('Supplier')
             for node in nodes:
@@ -363,7 +363,7 @@ class account_invoice(osv.osv):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             for inv_id, name in self.name_get(cr, uid, [res], context=context):
-                message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.")
+                message = _("Invoice '%s' is waiting for validation.") % name
                 self.log(cr, uid, inv_id, message)
             return res
         except Exception, e:
@@ -376,7 +376,7 @@ class account_invoice(osv.osv):
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
         for inv_id, name in self.name_get(cr, uid, ids, context=context):
-            message = _('Invoice ') + " '" + name + "' "+ _("is paid.")
+            message = _("Invoice '%s' is paid.") % name
             self.log(cr, uid, inv_id, message)
         return True
 
@@ -1226,8 +1226,10 @@ class account_invoice(osv.osv):
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
             code = invoice.currency_id.code
-            amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)'
-            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt)
+            # TODO: use currency's formatting function
+            msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \
+                    (name, pay_amount, code, invoice.amount_total, code, total, code)
+            self.log(cr, uid, inv_id,  msg)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index da8555cf22b..99692bc3e2e 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -31,7 +31,7 @@
 "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,1,1,1
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
 "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
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
@@ -94,11 +94,11 @@
 "access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
 "access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
-"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
+"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
 "access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
 "access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 0aae9dbe3d0..d91e4771d6f 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -67,8 +67,8 @@
     import netsvc, tools, os, time
     import datetime
     from mx.DateTime import *
-	import warnings
-	warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
+    import warnings
+    warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
     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 = {}
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index dd843449c8c..c2ef5f5d4a4 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -456,7 +456,7 @@ class audittrail_objects_proxy(osv_pool):
         """
         Overrides Object Proxy execute method
         @param db: the current database
-        @param uid: the current user’s ID for security checks,
+        @param uid: the current user's ID for security checks,
         @param object: Object who's values are being changed
         @param method: get any method and create log
 
@@ -500,49 +500,47 @@ class audittrail_objects_proxy(osv_pool):
                             return self.log_fct(db, uid, model, method, fct_src, *args)
 
                 return fct_src(db, uid, model, method, *args)
-        res = my_fct(db, uid, model, method, *args)
-        cr.close()
-        return res
-
+        try:
+            res = my_fct(db, uid, model, method, *args)
+            return res
+        finally:
+            cr.close()
 
     def exec_workflow(self, db, uid, model, method, *args, **argv):
         pool = pooler.get_pool(db)
-        cr = pooler.get_db(db).cursor()
-        cr.autocommit(True)
         logged_uids = []
         fct_src = super(audittrail_objects_proxy, self).exec_workflow
         field = method
         rule = False
         model_pool = pool.get('ir.model')
         rule_pool = pool.get('audittrail.rule')
-        model_ids = model_pool.search(cr, uid, [('model', '=', model)])
-        for obj_name in pool.obj_list():
-            if obj_name == 'audittrail.rule':
-                rule = True
-        if not rule:
-            cr.close()
-            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
-        if not model_ids:
-            cr.close()
-            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+        cr = pooler.get_db(db).cursor()
+        cr.autocommit(True)
+        try:
+            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+            for obj_name in pool.obj_list():
+                if obj_name == 'audittrail.rule':
+                    rule = True
+            if not rule:
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+            if not model_ids:
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
 
-        rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')])
-        if not rule_ids:
-             cr.close()
-             return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+            rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')])
+            if not rule_ids:
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
 
-        for thisrule in rule_pool.browse(cr, uid, rule_ids):
-            for user in thisrule.user_id:
-                logged_uids.append(user.id)
-            if not logged_uids or uid in logged_uids:
-                 if thisrule.log_workflow:
-                     cr.close()
-                     return self.log_fct(db, uid, model, method, fct_src, *args)
+            for thisrule in rule_pool.browse(cr, uid, rule_ids):
+                for user in thisrule.user_id:
+                    logged_uids.append(user.id)
+                if not logged_uids or uid in logged_uids:
+                    if thisrule.log_workflow:
+                        return self.log_fct(db, uid, model, method, fct_src, *args)
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+
+            return True
+        finally:
             cr.close()
-            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
-
-        cr.close()
-        return True
 
 audittrail_objects_proxy()
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e6226bb44bb..3b0bd140748 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -198,11 +198,12 @@ class crm_lead(crm_case, osv.osv):
             self.write(cr, uid, ids, value)
 
         for case in self.browse(cr, uid, ids):
-            n = {
-                'lead': _('The lead'),
-                'opportunity': _('The opportunity')
-            }.get(case.type, _('The case'))
-            message = n +" '" + case.name + "' "+ _("has been opened.")
+            if case.type == 'lead':
+                message = _("The lead '%s' has been opened.") % name
+            elif case.type == 'opportunity':
+                message = _("The opportunity '%s' has been opened.") % name
+            else:
+                message = _("The case '%s' has been opened.") % name
             self.log(cr, uid, case.id, message)
         return res
 
@@ -217,11 +218,12 @@ class crm_lead(crm_case, osv.osv):
         res = super(crm_lead, self).case_close(cr, uid, ids, args)
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         for case in self.browse(cr, uid, ids):
-            n = {
-                'lead': _('The lead'),
-                'opportunity': _('The opportunity')
-            }.get(case.type, _('The case'))
-            message = n +" '" + case.name + "' "+ _("has been closed.")
+            if case.type == 'lead':
+                message = _("The lead '%s' has been closed.") % name
+            elif case.type == 'opportunity':
+                message = _("The opportunity '%s' has been closed.") % name
+            else:
+                message = _("The case '%s' has been closed.") % name
             self.log(cr, uid, case.id, message)
         return res
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index d2c79bc3497..b81819e1171 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -134,7 +134,7 @@ class crm_meeting(crm_case, osv.osv):
         """
         res = super(crm_meeting, self).case_open(cr, uid, ids, args)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The meeting') + " '" + name + "' "+ _("has been confirmed.")
+            message = _("The meeting '%s' has been confirmed.") % name
             self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 797d5e70704..9bd998d0f46 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -70,7 +70,7 @@ class crm_opportunity(osv.osv):
         for (id, name) in self.name_get(cr, uid, ids):
             opp = self.browse(cr, uid, id)
             if opp.type == 'opportunity':
-                message = _('The opportunity') + " '" + name + "' "+ _("has been won.")
+                message = _("The opportunity '%s' has been won.") % name
                 self.log(cr, uid, id, message)
         return res
 
@@ -94,7 +94,7 @@ class crm_opportunity(osv.osv):
         for (id, name) in self.name_get(cr, uid, ids):
             opp = self.browse(cr, uid, id)
             if opp.type == 'opportunity':
-                message = _('The opportunity') + " '" + name + "' "+ _("has been marked as lost.")
+                message = _("The opportunity '%s' has been marked as lost.") % name
                 self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 7d527442391..2147d774762 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -71,8 +71,9 @@ class email_server(osv.osv):
     }
 
     def check_duplicate(self, cr, uid, ids):
+	# RFC *-* Why this limitation? why not in SQL constraint?
         vals = self.read(cr, uid, ids, ['user', 'password'])[0]
-        cr.execute("select count(id) from email_server where user='%s' and password='%s'" % (vals['user'], vals['password']))
+        cr.execute("select count(id) from email_server where user='%s' and password='%s'", (vals['user'], vals['password']))
         res = cr.fetchone()
         if res:
             if res[0] > 1:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index bc6e7193920..c676b4199be 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -407,7 +407,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         if not date['date_open']:
             self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The job request ') + " '" + name + "' "+ _("has been set 'in progress'.")
+            message = _("The job request '%s' has been set 'in progress'.") % name
             self.log(cr, uid, id, message)
         return res
 
@@ -423,7 +423,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         job_obj = self.pool.get('hr.job')
         res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Applicant ') + " '" + name + "' "+ _("is being hired.")
+            message = _("Applicant '%s' is being hired.") % name
             self.log(cr, uid, id, message)
 
         applicant = self.browse(cr, uid, ids)[0]
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 8dd25ef1eb3..cc1ff3b9324 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -45,7 +45,10 @@ class account_analytic_account(osv.osv):
             context = {}
         res = {}
 
-        cr.execute('select account_id as account_id, l.invoice_id from hr_analytic_timesheet h left join account_analytic_line l on (h.line_id=l.id)')
+        cr.execute('SELECT account_id as account_id, l.invoice_id '
+                'FROM hr_analytic_timesheet h LEFT JOIN account_analytic_line l '
+                    'ON (h.line_id=l.id) '
+                    'WHERE l.account_id = ANY(%s)', (ids,))
         account_to_invoice_map = {}
         for rec in cr.dictfetchall():
             account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
@@ -163,6 +166,7 @@ class account_invoice(osv.osv):
             obj_analytic_account = self.pool.get('account.analytic.account')
             for il in iml:
                 if il['account_analytic_id']:
+		    # *-* browse (or refactor to avoid read inside the loop)
                     to_invoice = obj_analytic_account.read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
                     if to_invoice:
                         il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 38f07e0f1d1..9af65a473a3 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -40,10 +40,10 @@ class procurement_order(osv.osv):
         """
         properties = [x.id for x in procurement.property_ids]
         bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
-        if not bom_id:            
+        if not bom_id:
             cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
             for (id, name) in self.name_get(cr, uid, procurement.id):
-                message = _('Procurement ') + " '" + name + "' "+ _("has an exception: 'No BoM defined for this product !'")
+                message = _("Procurement '%s' has an exception: 'No BoM defined for this product !'") % name
                 self.log(cr, uid, id, message)
             return False
         return True
diff --git a/addons/project/project.py b/addons/project/project.py
index 3653d6ba0da..8b8745fa45c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -248,7 +248,7 @@ class project(osv.osv):
         task_obj.write(cr, uid, task_ids, {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
         self.write(cr, uid, ids, {'state':'close'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The project ') + " '" + name + "' "+ _("has been closed.")
+            message = _("The project '%s' has been closed.") % name
             self.log(cr, uid, id, message)
         return True
 
@@ -270,7 +270,7 @@ class project(osv.osv):
     def reset_project(self, cr, uid, ids, context=None):
         res = self.setActive(cr, uid, ids, value=True, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The project ') + " '" + name + "' "+ _("has been opened.")
+            message = _("The project '%s' has been opened.") % name
             self.log(cr, uid, id, message)
         return res
 
@@ -732,7 +732,7 @@ class task(osv.osv):
     def do_pending(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'pending'})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The task ') + " '" + name + "' "+ _("is pending.")
+            message = _("The task '%s' is pending.") % name
             self.log(cr, uid, id, message)
         return True
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 91b7f5b3437..2887b25610d 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -58,7 +58,7 @@ class project_issue(crm.crm_case, osv.osv):
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Issue ') + " '" + name + "' "+ _("has been opened.")
+            message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
         return res
 
@@ -73,7 +73,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         res = super(project_issue, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Issue ') + " '" + name + "' "+ _("has been closed.")
+            message = _("Issue '%s' has been closed.") % name
             self.log(cr, uid, id, message)
         return res
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 9615b089fa2..57b9a477ac9 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -330,7 +330,7 @@ class purchase_order(osv.osv):
             wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
             wf_service.trg_create(uid, 'purchase.order', p_id, cr)
         for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Purchase order') + " '" + name + "' "+ _("has been set in draft state.")
+            message = _("Purchase order '%s' has been set in draft state.") % name
             self.log(cr, uid, id, message)
         return True
 
@@ -412,7 +412,7 @@ class purchase_order(osv.osv):
                 wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
         for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled.")
+            message = _("Purchase order '%s' is cancelled.") % name
             self.log(cr, uid, id, message)
         return True
 
diff --git a/addons/stock/product.py b/addons/stock/product.py
index e1d4c71b46c..ddb582f4a3c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -188,6 +188,7 @@ class product_product(osv.osv):
         if not ids:
             return res
 
+	# TODO: write in more ORM way, less queries, more pg84 magic
         if context.get('shop', False):
             cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
             res2 = cr.fetchone()
@@ -246,6 +247,7 @@ class product_product(osv.osv):
             date_values = [to_date]
 
        
+	# TODO: perhaps merge in one query.
         if date_values:
             where.append(tuple(date_values))
         if 'in' in what:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c7973456fb9..831b1dafcb5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -632,7 +632,7 @@ class stock_picking(osv.osv):
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Address', help="Address of partner"),
-        'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),        
+        'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index bce4de8b593..bdc11f208ca 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -244,7 +244,7 @@
         </record>
         <record id="stock_warehouse_shop1" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">Shop 2</field>
             <field name="lot_stock_id" ref="stock_location_shop1"/>
             <field name="partner_address_id" ref="res_partner_address_eric0"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
@@ -262,9 +262,8 @@
             <field name="type">out</field>
             <field name="move_type">direct</field>
             <field name="invoice_state">2binvoiced</field>
-            <field name="address_id"  ref="base.main_address"/>
+            <field name="address_id"  ref="res_partner_address_fabien0"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.main_partner"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 2cdb98622a9..a2ee95e417e 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -204,6 +204,7 @@ class survey_browse_response(report_rml):
                 rml += """<blockTable colWidths='""" + colwidth + """' style="Table_heading">
                           <tr>
                             <td><para style="terp_tblheader_General_Centre">Answer Create Date:- </para></td>
+                            # *-* formatting hard coded, breaks with utf8
                             <td><para style="terp_tblheader_General_Centre_simple">""" + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """</para></td>
                             <td><para style="terp_tblheader_General_Centre"></para></td>
                             <td><para style="terp_tblheader_General_right">Answer By:- </para></td>

From 295cf8b2355a17430370e592b1778c1ce2a3a965 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 20:05:28 +0200
Subject: [PATCH 281/294] [IMP] Complete rewrite of sale_journal module   no
 need for picking journal anymore, the stock has a journal system by default  
 no need for sale journal anymore, you can use sales team   invoice types is
 kept

bzr revid: fp@tinyerp.com-20101017180528-3cmxx06v7wh9a6yi
---
 addons/sale/sale_installer.py                 |   7 +-
 addons/sale/sale_view.xml                     |   6 +-
 addons/sale_journal/__init__.py               |   3 -
 addons/sale_journal/__openerp__.py            |   7 +-
 addons/sale_journal/report/__init__.py        |  25 --
 .../report/picking_journal_report.py          |  88 -----
 .../report/picking_journal_report_view.xml    | 106 -----
 .../report/sale_journal_report.py             |  75 ----
 .../report/sale_journal_report_view.xml       |  89 -----
 addons/sale_journal/sale_journal.py           | 183 +--------
 addons/sale_journal/sale_journal_data.xml     |  10 +-
 addons/sale_journal/sale_journal_demo.xml     |  20 +-
 addons/sale_journal/sale_journal_view.xml     | 361 +-----------------
 .../sale_journal/security/ir.model.access.csv |   9 +-
 addons/sale_journal/test/picking_journal.yml  |  87 -----
 addons/sale_journal/test/sale_journal.yml     |  95 -----
 16 files changed, 51 insertions(+), 1120 deletions(-)
 delete mode 100644 addons/sale_journal/report/__init__.py
 delete mode 100644 addons/sale_journal/report/picking_journal_report.py
 delete mode 100644 addons/sale_journal/report/picking_journal_report_view.xml
 delete mode 100644 addons/sale_journal/report/sale_journal_report.py
 delete mode 100644 addons/sale_journal/report/sale_journal_report_view.xml
 delete mode 100644 addons/sale_journal/test/picking_journal.yml
 delete mode 100644 addons/sale_journal/test/sale_journal.yml

diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index 4197c0a370b..a8cc5432020 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -28,11 +28,8 @@ class sale_installer(osv.osv_memory):
     _columns = {
         'delivery': fields.boolean('Delivery Costs', 
             help="Allows you to compute delivery costs on your quotations."),
-        'sale_journal': fields.boolean('Sales and deliveries by journal',
-            help="Allows you to categorise your "
-                "sales and deliveries (picking lists) between different journals. "
-                "This module is very helpful for bigger companies that "
-                "work by departments."),
+        'sale_journal': fields.boolean('Invoicing journals',
+            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
         'sale_layout': fields.boolean('Sales Order Layout Improvement',
             help="Provides some features to improve the layout of the Sales Order reports."),
         'sale_margin': fields.boolean('Margins in Sales Orders',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 36ba5e62d81..b9eabcaa02e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -49,9 +49,11 @@
             <field name="help">If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale.</field>
         </record>
 
+        <menuitem id="menu_config_sale"
+            parent="base.menu_base_config"
+            name="Sales" groups="base.group_extended"/>
         <menuitem action="action_shop_form" id="menu_action_shop_form"
-            parent="product.prod_config_main" sequence="0"
-            groups="base.group_extended,base.group_sale_manager"/>
+            parent="menu_config_sale" sequence="0" />
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index b41a4be55d1..b05803da6c6 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -20,7 +20,4 @@
 ##############################################################################
 
 import sale_journal
-import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 4fde94fc709..37fc05fd066 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -53,14 +53,9 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'sale_journal_view.xml',
-        'report/sale_journal_report_view.xml',
-        'report/picking_journal_report_view.xml',
     ],
     'demo_xml': ['sale_journal_demo.xml'],
-    'test': [
-             'test/sale_journal.yml',
-             'test/picking_journal.yml',
-             ],
+    'test': [ ],
     'installable': True,
     'active': False,
     'certificate': '0077661619085',
diff --git a/addons/sale_journal/report/__init__.py b/addons/sale_journal/report/__init__.py
deleted file mode 100644
index bfe23eb8cce..00000000000
--- a/addons/sale_journal/report/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import sale_journal_report 
-import picking_journal_report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/report/picking_journal_report.py b/addons/sale_journal/report/picking_journal_report.py
deleted file mode 100644
index 74c00367838..00000000000
--- a/addons/sale_journal/report/picking_journal_report.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import tools
-from decimal_precision import decimal_precision as dp
-
-
-class sale_journal_picking_report(osv.osv):
-    """
-    Picking list by journal and by invoice
-    """
-    _name = "sale.journal.picking.report"
-    _description = "Picking lists"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), ('05', 'May'), ('06', 'June'),
-                          ('07', 'July'), ('08', 'August'), ('09', 'September'), ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-
-        'invoice_state':fields.selection([
-            ("invoiced", "invoiced"),
-            ("2binvoiced", "to be invoiced"),
-            ("none", "None")
-        ], "Invoice state", readonly=True),
-        'state': fields.selection([
-            ('draft', 'draft'),
-            ('auto', 'waiting'),
-            ('confirmed', 'confirmed'),
-            ('assigned', 'assigned'),
-            ('done', 'done'),
-            ('cancel', 'cancel'),
-        ], 'State', readonly=True),
-        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True),
-        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True),
-        'quantity': fields.float('Quantities', readonly=True),
-        'price_total': fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Sale Price')),
-        'price_average': fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Sale Price')),
-        'count': fields.integer('# of Lines', readonly=True),
-    }
-    _order = 'journal_id, name desc, price_total desc'
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'sale_journal_picking_report')
-
-        cr.execute("""
-            create or replace view sale_journal_picking_report as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date, 'YYYY') as name,
-                    to_char(s.date, 'MM') as month,
-                    s.state,
-                    s.invoice_state,
-                    s.invoice_type_id,
-                    s.journal_id,
-                    sum(l.product_qty) as quantity,
-                    count(*) as count,
-                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
-                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
-                from stock_picking s
-                    right join stock_move l on (s.id=l.picking_id)
-                    left join sale_order_line ol on (l.sale_line_id=ol.id)
-                group by s.journal_id, s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
-                order by s.invoice_type_id, s.invoice_state, s.state
-                )
-        """)
-
-sale_journal_picking_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/report/picking_journal_report_view.xml b/addons/sale_journal/report/picking_journal_report_view.xml
deleted file mode 100644
index 8c98b6b3928..00000000000
--- a/addons/sale_journal/report/picking_journal_report_view.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<openerp>
-   <data> 
-   
-     <!-- picking by journal and invoice's tree view-->
-
-        <record model="ir.ui.view" id="view_sale_journal_picking_report_tree">
-            <field name="name">sale.journal.picking.report.tree</field>
-            <field name="model">sale.journal.picking.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Picking Journal">
-                    <field name="name" invisible="1"/>
-                    <field name="month" invisible="1"/>
-                    <field name="invoice_state" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="invoice_type_id" invisible="1"/>
-                    <field name="journal_id" invisible="1"/>
-                    <field name="quantity" />
-                    <field name="count" />
-                    <field name="price_average"/>
-                    <field name="price_total"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- picking journal's graph view -->
-
-        <record id="view_sale_journal_picking_graph" model="ir.ui.view">
-            <field name="name">sale.journal.picking.report.graph</field>
-            <field name="model">sale.journal.picking.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-               <graph string="Picking journal Statistics" type="bar">
-                 <field name="journal_id"/>
-                 <field name="invoice_type_id"/>
-                 <field name="price_total"/>
-              </graph>
-           </field>
-       </record>
-
-       <!-- Picking journal search view -->
-
-        <record model="ir.ui.view" id="view_sale_journal_picking_report_search">
-            <field name="name">sale.journal.picking.report.search</field>
-            <field name="model">sale.journal.picking.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Picking journal">
-                    <group col="8" colspan="4">
-                        <filter icon="terp-go-year" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
-                        <filter icon="terp-go-month" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                                string="Draft"
-                                domain="[('state','=','draft')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                                string="Pending"
-                                domain="[('state','=','waiting')]"/>
-                        <filter icon="terp-camera_test"
-                                string="Confirmed"
-                                domain="[('state','=','confirmed')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="invoice_state" select="1"/>
-                        <field name="state" select="1"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="12">
-                        <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                        <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_type_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Invoice state" icon="terp-stock_effects-object-colorize" context="{'group_by':'invoice_state'}"/>
-                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_sale_journal_picking_report_open">
-            <field name="name">Statistics on picking to invoice</field>
-            <field name="res_model">sale.journal.picking.report</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-        </record>
-
-    <!-- Action for picking journal view -->
-
-        <record model="ir.actions.act_window" id="action_sale_journal_picking_report_open_menu_all">
-            <field name="name">Picking Journal</field>
-            <field name="res_model">sale.journal.picking.report</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
-            <field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help">Display your company picking journal and personalize its view by filtering it with specific selection criteria.</field>
-        </record>
-
-        <menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" 
-                  action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
-
-    </data>
-</openerp>
diff --git a/addons/sale_journal/report/sale_journal_report.py b/addons/sale_journal/report/sale_journal_report.py
deleted file mode 100644
index 723a7f88722..00000000000
--- a/addons/sale_journal/report/sale_journal_report.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-import tools
-
-class sale_journal_report(osv.osv):
-    _name = "sale.journal.report"
-    _description = "Sales Orders by Journal"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True), 
-        'month':fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), 
-                                  ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'), 
-                                  ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 
-        'state': fields.selection([
-            ('draft', 'Quotation'), 
-            ('waiting_date', 'Waiting Schedule'), 
-            ('manual', 'Manual in progress'), 
-            ('progress', 'In progress'), 
-            ('shipping_except', 'Shipping Exception'), 
-            ('invoice_except', 'Invoice Exception'), 
-            ('done', 'Done'), 
-            ('cancel', 'Cancel')
-        ], 'Order State', readonly=True), 
-        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', readonly=True), 
-        'quantity': fields.float('Quantities', readonly=True), 
-        'price_total': fields.float('Total Price', readonly=True), 
-        'price_average': fields.float('Average Price', readonly=True), 
-        'count': fields.integer('# of Lines', readonly=True), 
-    }
-    
-    _order = 'journal_id, name desc,price_total desc'
-    
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'sale_journal_report')
-        cr.execute("""
-            create or replace view sale_journal_report as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date_order, 'YYYY') as name,
-                    to_char(s.date_order,'MM') as month,
-                    s.state,
-                    s.journal_id,
-                    sum(l.product_uom_qty) as quantity,
-                    count(*),
-                    sum(l.product_uom_qty*l.price_unit) as price_total,
-                    (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average
-                from sale_order s
-                    right join sale_order_line l on (s.id=l.order_id)
-                group by s.journal_id , to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'), s.state
-            )
-        """)
-        
-sale_journal_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
deleted file mode 100644
index e73fdcf9785..00000000000
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<openerp>
-   <data>
-
-   <!-- Sales by journal's view  -->
-
-	    <record model="ir.ui.view" id="view_sale_journal_report_tree">
-	        <field name="name">sale.journal.report.tree</field>
-	        <field name="model">sale.journal.report</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Sales by Journal">
-	                <field name="name" invisible="1"/>
-	                <field name="state" invisible="1"/>
-	                <field name="journal_id" invisible="1"/>
-	                <field name="quantity"/>
-	                <field name="count"/>
-	                <field name="price_average"/>
-	                <field name="price_total"/>
-	            </tree>
-	        </field>
-	    </record>
-
-	    <!-- sales journal graph view -->
-
-	    <record id="view_sale_journal_graph" model="ir.ui.view">
-	        <field name="name">sale.journal.report.graph</field>
-            <field name="model">sale.journal.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-               <graph string="Sales journal Statistics" type="bar">
-                 <field name="journal_id"/>
-                 <field name="price_total"/>
-              </graph>
-           </field>
-       </record>
-
-	  <!-- sales by journal search view -->
-
-	    <record model="ir.ui.view" id="view_sale_journal_report_search">
-	        <field name="name">sale.journal.report.search</field>
-	        <field name="model">sale.journal.report</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Sales by Journal">
-	            	<group col="8" colspan="4">
-		            	<filter icon="terp-go-year" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
-		               	<filter icon="terp-go-month" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
-		               	<separator orientation="vertical"/>
-		                <filter icon="terp-document-new"
-		                    	string="Quotations"
-		                    	domain="[('state','=','draft')]"/>
-		                <filter icon="terp-gtk-media-pause"
-		                		string="Waiting Schedule"
-		                		domain="[('state','=','waiting_date')]"/>
-		                <filter icon="terp-camera_test"
-		                		string="In progress"
-		                		domain="[('state','=','progress')]"/>
-		                <separator orientation="vertical"/>
-		                <field name="name" select="1"/>
-		                <field name="state" select="1"/>
-		                <field name="journal_id" widget="selection"/>
-					</group>
-					<newline/>
-					<group expand="1" string="Group By..." colspan="4" col="12">
-						<filter string="journal" name="journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-						<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-					</group>
-	            </search>
-	        </field>
-	    </record>
-
-	<!-- Action of sales by journal view-->
-
-	    <record model="ir.actions.act_window" id="action_sale_journal_report_open_menu_all">
-	    	<field name="name">Sales by Journal</field>
-	        <field name="res_model">sale.journal.report</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,graph</field>
-	        <field name="search_view_id" ref="view_sale_journal_report_search"/>
-	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help">This view allows you to access your sales orders or quotations by journal. You can create journal in order to group different sales orders by teams and perform automatic actions on a journal (confirm or cancel all sales of a journal).</field>
-	    </record>
-
-	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all"
-	              parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2" groups="base.group_sale_manager"/>
-
-	</data>
-</openerp>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 8cb10178f02..09902b21099 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -39,160 +39,6 @@ class sale_journal_invoice_type(osv.osv):
     }
 sale_journal_invoice_type()
 
-class sale_journal(osv.osv):
-    _name = 'sale_journal.sale.journal'
-    _description = 'Sale Journal'
-    _columns = {
-        'name': fields.char('Journal', size=64, required=True, states={'close':[('readonly',True)]}),
-        'code': fields.char('Code', size=16, required=True, states={'close':[('readonly',True)]}),
-        'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'close':[('readonly',True)]}),
-        'date': fields.date('Journal date', required=True, states={'close':[('readonly',True)]}),
-        'date_created': fields.date('Creation date', readonly=True, required=True),
-        'date_close': fields.date('Close date ', readonly=True),
-        'sale_stats_ids': fields.one2many("sale.journal.report", "journal_id", 'Sale stats', readonly=True),
-        'state': fields.selection([
-            ('draft','Draft'),
-            ('open','Open'),
-            ('cancel','Cancel'),
-            ('confirm','Confirm'),
-            ('close','Close'),
-        ], 'State', required=True, readonly=True),
-        'note': fields.text('Note'),
-    }
-    _defaults = {
-        'date': time.strftime('%Y-%m-%d'),
-        'date_created': time.strftime('%Y-%m-%d'),
-        'user_id': lambda self,cr,uid,context: uid,
-        'state': lambda self,cr,uid,context: 'draft',
-    }
-
-    def button_sale_cancel(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'cancel'})
-        for id in ids:
-            sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
-            for saleid in sale_ids:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr)
-        return True
-
-    def button_sale_confirm(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'confirm'})
-        for id in ids:
-            sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
-            for saleid in sale_ids:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr)
-        return True
-
-    def button_open(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'open'})
-        return True
-
-    def button_draft(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'draft'})
-        return True
-
-    def button_close(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
-        return True
-    def button_reset(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'draft'})
-        return True
-    def copy(self, cr, uid, id, default=None, context=None):
-        """Overrides orm copy method
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        if default is None:
-            default = {}
-        default.update({'sale_stats_ids': []})
-        return super(sale_journal, self).copy(cr, uid, id, default=default, context=context)
-
-sale_journal()
-
-class picking_journal(osv.osv):
-    _name = 'sale_journal.picking.journal'
-    _description = 'Picking Journal'
-    _columns = {
-        'name': fields.char('Journal', size=64, required=True),
-        'code': fields.char('Code', size=16, required=True),
-        'user_id': fields.many2one('res.users', 'Responsible', required=True),
-        'date': fields.date('Journal date', required=True),
-        'date_created': fields.date('Creation date', readonly=True, required=True),
-        'date_close': fields.date('Close date', readonly=True),
-        'picking_stats_ids': fields.one2many("sale.journal.picking.report", "journal_id", 'Journal Stats', readonly=True),
-        'state': fields.selection([
-            ('draft','Draft'),
-            ('open','Open'),
-            ('cancel','Cancel'),
-            ('close','Close'),
-            ('confirm','Confirm'),
-        ], 'Creation date', required=True, readonly=True),
-        'note': fields.text('Note'),
-    }
-    _defaults = {
-        'date': time.strftime('%Y-%m-%d'),
-        'date_created': time.strftime('%Y-%m-%d'),
-        'user_id': lambda self,cr,uid,context: uid,
-        'state': lambda self,cr,uid,context: 'draft',
-    }
-    def button_picking_cancel(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'cancel'})
-        for id in ids:
-            pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
-            for pickid in pick_ids:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_cancel', cr)
-        return True
-
-    def button_open(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'open'})
-        return True
-
-    def button_draft(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'draft'})
-        return True
-
-    def button_close(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
-        return True
-
-    def button_reset(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'draft'})
-        return True
-
-    def button_picking_confirm(self, cr, uid, ids, context={}):
-
-        self.write(cr, uid, ids, {'state':'confirm'})
-        for id in ids:
-            pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
-            for pickid in pick_ids:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
-        return True
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """Overrides orm copy method
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        if default is None:
-            default = {}
-        default.update({'picking_stats_ids': []})
-        return super(picking_journal, self).copy(cr, uid, id, default=default, context=context)
-
-picking_journal()
-
 #==============================================
 # sale journal inherit
 #==============================================
@@ -201,22 +47,20 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'property_invoice_type': fields.property(
-        'sale_journal.invoice.type',
-        type = 'many2one',
-        relation = 'sale_journal.invoice.type',
-        string = "Invoicing Method",
-        method = True,
-        view_load = True,
-        group_name = "Accounting Properties",
-        help = "The type of journal used for sales and picking."),
+            'sale_journal.invoice.type',
+            type = 'many2one',
+            relation = 'sale_journal.invoice.type',
+            string = "Invoicing Method",
+            method = True,
+            view_load = True,
+            group_name = "Accounting Properties",
+            help = "The type of journal used for sales and picking."),
     }
 res_partner()
 
 class picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
-        'journal_id': fields.many2one('sale_journal.picking.journal', 'Picking Journal',  domain=[('state','!=', 'close')],help="Picking Journal"),
-        'sale_journal_id': fields.many2one('sale_journal.sale.journal', 'Sale Journal'),
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
     }
 picking()
@@ -224,7 +68,6 @@ picking()
 class sale(osv.osv):
     _inherit = "sale.order"
     _columns = {
-        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', domain=[('state','not in', ('done', 'draft''cancel'))]),
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
     }
     def action_ship_create(self, cr, uid, ids, *args):
@@ -232,18 +75,16 @@ class sale(osv.osv):
         for order in self.browse(cr, uid, ids, context={}):
             pids = [ x.id for x in order.picking_ids]
             self.pool.get('stock.picking').write(cr, uid, pids, {
-                'invoice_type_id': order.invoice_type_id.id,
-                'sale_journal_id': order.journal_id.id
+                'invoice_type_id': order.invoice_type_id and order.invoice_type_id.id or False,
             })
         return result
 
     def onchange_partner_id(self, cr, uid, ids, part):
         result = super(sale, self).onchange_partner_id(cr, uid, ids, part)
         if part:
-            itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type.id
-            result['value']['invoice_type_id'] = itype
+            itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type
+            if itype:
+                result['value']['invoice_type_id'] = itype.id
         return result
 
 sale()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/sale_journal_data.xml b/addons/sale_journal/sale_journal_data.xml
index 3639f945c83..9d305fe9912 100644
--- a/addons/sale_journal/sale_journal_data.xml
+++ b/addons/sale_journal/sale_journal_data.xml
@@ -2,11 +2,11 @@
 <openerp>
 <data noupdate="1">
 
-	<record model="ir.property" id="property_invoice_type_def">
-		<field name="name">property_invoice_type</field>
-		<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_invoice_type')]"/>
-		<field name="value" eval="False"/>
-	</record>
+    <record model="ir.property" id="property_invoice_type_def">
+        <field name="name">property_invoice_type</field>
+        <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_invoice_type')]"/>
+        <field name="value" eval="False"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal_demo.xml b/addons/sale_journal/sale_journal_demo.xml
index 30606e25145..061a5af8544 100644
--- a/addons/sale_journal/sale_journal_demo.xml
+++ b/addons/sale_journal/sale_journal_demo.xml
@@ -2,17 +2,17 @@
 <openerp>
 <data noupdate="1">
 
-	<record model="sale_journal.invoice.type" id="daily">
-		<field name="name">Daily invoicing</field>
-	</record>
-	<record model="sale_journal.invoice.type" id="monthly">
-		<field name="name">Monthly invoicing</field>
-		<field name="invoicing_method">grouped</field>
-	</record>
+    <record model="sale_journal.invoice.type" id="daily">
+        <field name="name">Daily invoicing</field>
+    </record>
+    <record model="sale_journal.invoice.type" id="monthly">
+        <field name="name">Monthly invoicing</field>
+        <field name="invoicing_method">grouped</field>
+    </record>
 
-	<record model="ir.property" id="sale_journal.property_invoice_type_def">
-		<field name="value" eval="'sale_journal.invoice.type,'+str(daily)"/>
-	</record>
+    <record model="ir.property" id="sale_journal.property_invoice_type_def">
+        <field name="value" eval="'sale_journal.invoice.type,'+str(daily)"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 4485769cd62..ad160ec28ae 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,10 +1,5 @@
 <openerp>
    <data>
-        <menuitem id="base.menu_base_config" name="Configuration" parent="base.menu_base_partner" sequence="30"
-            groups="base.group_sale_salesman,base.group_sale_manager"/>
-        <menuitem id="menu_sale_journal_config" name="Sale Journals"
-            parent="base.menu_base_config" sequence="5" groups="base.group_sale_salesman"/>
-
    <!--  sale journal invoice Type's Form  view -->
 
         <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
@@ -14,13 +9,12 @@
             <field name="arch" type="xml">
                 <form string="Invoice Type">
                     <group colspan="4" col="6">
-                    <field name="name" select="1"/>
-                    <field name="invoicing_method" select="1"/>
-                    <field name="active" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="invoicing_method" select="1"/>
+                        <field name="active" select="1"/>
                     </group>
-                    <separator string="Notes" colspan="3"/>
-                    <newline/>
-                    <field name="note" colspan="3" nolabel="1"/>
+                    <separator string="Notes" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -42,113 +36,15 @@
       <!-- Action for sale journal invoice Type -->
 
         <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+            <field name="name">Invoice Types</field>
             <field name="res_model">sale_journal.invoice.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Create specific invoicing types that can be maintained in your sales orders. An invoicing type can, for example, be a time lapse to be observed before billing your sales orders. Example: invoice daily, invoice every Wednesday, at end of month, etc.</field>
+            <field name="help">Invoice types are used on partners, sales order and delivery orders. You can create journal to group your invoicing according to customer's needs: daily, each wednesday, monthly, etc.</field>
         </record>
 
-     <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/>
-
-    <!-- sale journal Form view  -->
-
-        <record model="ir.ui.view" id="view_sale_journal_form">
-            <field name="name">sale_journal.sale.journal.form</field>
-            <field name="model">sale_journal.sale.journal</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Journals">
-                    <group colspan="4"    col="6">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="date_created" select="1"/>
-                        <field name="date_close" select="1"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Sales">
-                            <field name="sale_stats_ids" colspan="4" nolabel="1">
-                                <tree string="Sales">
-                                    <field name="name"/>
-                                    <field name="quantity"/>
-                                    <field name="price_total"/>
-                                    <field name="price_average"/>
-                                    <field name="count"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Notes">
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
-                    <field name="state"/>
-                        <group col="6" colspan="2">
-                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="terp-check"/>
-                            <button string="Confirm Sales" name="button_sale_confirm" states="open" type="object" icon="terp-camera_test"/>
-                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="terp-dialog-close"/>
-                            <button name="button_draft" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
-                            <button string="Cancel Sales" name="button_sale_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
-                        </group>
-                </form>
-            </field>
-        </record>
-
-  <!-- Sale journal tree view -->
-
-        <record model="ir.ui.view" id="view_sale_journal_tree">
-            <field name="name">sale_journal.sale.journal.tree</field>
-            <field name="model">sale_journal.sale.journal</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Sales Journals">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-    <!-- Sale journal search view -->
-
-        <record model="ir.ui.view" id="view_sale_journal_search">
-            <field name="name">sale_journal.sale.journal.search</field>
-            <field name="model">sale_journal.sale.journal</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Sales by Journal">
-                    <group col="8" colspan="4">
-						<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Sales Journal which are in draft state"/>
-                        <filter icon="terp-check" string="Open" domain="[('state','=','open')]" help="Open Sales Journal"/>
-                        <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirmed Sales Journal"/>
-                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Sales Journal which are cancelled"/>
-                        <filter icon="terp-dialog-close" string="Close" domain="[('state','=','done')]" help="Sales Journal which are closed"/>
-                       <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="user_id"/>
-                        <field name="date"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-      <!-- Action for sale journal view -->
-
-        <record model="ir.actions.act_window" id="action_definition_journal">
-            <field name="res_model">sale_journal.sale.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_user_id':uid}</field>
-            <field name="search_view_id" ref="view_sale_journal_search"/>
-            <field name="help">Display and maintain the sales journals to be used in your system. A sales journal is the place where all specific sales are recorded. If you do not need more than one sales journal, just create a generic sales journal that will be the default journal to be used for all made sales.</field>
-        </record>
-
-
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70"/>
+     <menuitem id="menu_definition_journal_invoice_type"
+        parent="sale.menu_config_sale" action="action_definition_journal_invoice_type"/>
 
     <!-- Inherit sales order form view -->
 
@@ -159,11 +55,7 @@
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                	<group colspan="2" col="2">
-	                    <separator string="Journal" colspan="4"/>
-	                    <field name="journal_id" select="1" widget="selection" domain="[('state','in', ('draft', 'open'))]"/>
-	                    <field name="invoice_type_id" select="1" widget="selection"/>
-                    </group>
+                    <field name="invoice_type_id" widget="selection"/>
                 </field>
             </field>
         </record>
@@ -177,8 +69,7 @@
             <field name="inherit_id" ref="sale.view_order_tree" />
             <field name="arch" type="xml">
                 <field name="state" position="after">
-                    <field name="invoice_type_id"/>
-                    <field name="journal_id"/>
+                    <field name="invoice_type_id" widget="selection"/>
                 </field>
             </field>
         </record>
@@ -192,9 +83,7 @@
             <field name="inherit_id" ref="stock.view_picking_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id" widget="selection"/>
                 </field>
             </field>
         </record>
@@ -208,9 +97,7 @@
             <field name="inherit_id" ref="stock.vpicktree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
                     <field name="invoice_type_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
                 </field>
             </field>
         </record>
@@ -222,8 +109,6 @@
             <field name="inherit_id" ref="stock.view_picking_in_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
                     <field name="invoice_type_id" select="1"/>
                 </field>
             </field>
@@ -236,9 +121,7 @@
             <field name="inherit_id" ref="stock.view_picking_in_tree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
                     <field name="invoice_type_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
                 </field>
             </field>
         </record>
@@ -250,8 +133,6 @@
             <field name="inherit_id" ref="stock.view_picking_out_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
                     <field name="invoice_type_id" select="1"/>
                 </field>
             </field>
@@ -264,73 +145,11 @@
             <field name="inherit_id" ref="stock.view_picking_out_tree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
                     <field name="invoice_type_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
                 </field>
             </field>
         </record>
 
-        <!-- Action of sale journal report in sale journal  -->
-
-        <act_window name="Monthly sales"
-            context="{'search_default_journal_id': active_id}"
-            res_model="sale.journal.report"
-            src_model="sale_journal.sale.journal"
-            id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
-
-       <!-- Action  of stock picking  in picking journal  -->
-
-        <act_window name="Assigned picking"
-            domain="[('state', '=', 'assigned')]"
-            context="{'search_default_journal_id': [active_id]}"
-            res_model="stock.picking"
-            src_model="sale_journal.picking.journal"
-            id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
-
-      <!-- Action  of stock picking  in picking journal  -->
-
-        <act_window name="Confirmed picking"
-            domain="[('state', '=', 'confirmed')]"
-            context="{'search_default_journal_id': [active_id]}"
-            res_model="stock.picking"
-            src_model="sale_journal.picking.journal"
-            id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
-
-     <!-- Action  of stock picking  in sale journal  -->
-
-        <act_window name="Assigned picking"
-            domain="[('state', '=', 'assigned')]"
-            context="{'search_default_sale_journal_id': [active_id]}"
-            res_model="stock.picking"
-            src_model="sale_journal.sale.journal"
-            id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
-
-    <!-- Action  of stock picking in sale journal -->
-
-        <act_window name="Confirmed picking"
-            domain="[('state', '=', 'confirmed')]"
-            context="{'search_default_sale_journal_id': [active_id]}"
-            res_model="stock.picking"
-            src_model="sale_journal.sale.journal"
-            id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
-
-    <!-- Action of sale order in sale journal -->
-
-        <act_window name="Draft sales"
-            domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
-            res_model="sale.order"
-            src_model="sale_journal.sale.journal"
-            id="act_sale_journal_sale_journal_2_sale_order_draft"/>
-
-      <!-- Action  of sale order in sale journal -->
-
-        <act_window name="Approved sales"
-            domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
-            res_model="sale.order"
-            src_model="sale_journal.sale.journal"
-            id="act_sale_journal_sale_journal_2_sale_order_approved"/>
-
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.journal.property.form.inherit</field>
             <field name="model">res.partner</field>
@@ -338,161 +157,13 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <field name="property_invoice_type"/>
+                    <group colspan="2" col="2">
+                        <separator string="Invoicing" colspan="2"/>
+                        <field name="property_invoice_type" widget="selection"/>
+                    </group>
                 </page>
             </field>
         </record>
 
-    <!--=====================================================-->
-    <!-- picking journal view-->
-    <!--=====================================================    -->
-
-        <record model="ir.ui.view" id="view_picking_journal_form">
-            <field name="name">sale_journal.picking.journal.form</field>
-            <field name="model">sale_journal.picking.journal</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Picking Journal">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <newline/>
-                        <field name="date" select="1"/>
-                        <field name="date_created" select="1"/>
-                        <field name="date_close" select="1"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Picking">
-                            <field name="picking_stats_ids" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Notes">
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
-                    <field name="state"/>
-                        <group col="6" colspan="2">
-                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="terp-check"/>
-                            <button string="Confirm Picking" name="button_picking_confirm" states="open" type="object" icon="terp-camera_test"/>
-                            <button name="button_reset" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
-                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="terp-dialog-close"/>
-                            <button string="Cancel Picking" name="button_picking_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
-                        </group>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_picking_journal_tree">
-            <field name="name">sale_journal.picking.journal.tree</field>
-            <field name="model">sale_journal.picking.journal</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Picking Journal">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id"/>
-                    <field name="date"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-       <!-- Picking journal tree view  -->
-
-        <record model="ir.ui.view" id="view_picking_journal_search">
-            <field name="name">sale_journal.picking.journal.search</field>
-            <field name="model">sale_journal.picking.journal</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Picking Journals">
-                    <group col="8" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Picking Journals which are in draft state"/>
-					   	<filter icon="terp-check" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
-					   	<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Picking Journals which are cancelled"/>
-					   	<filter icon="terp-dialog-close" string="Close" domain="[('state','=','done')]" help="Picking Journals which are closed"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="user_id"/>
-                        <field name="date"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-<!-- Action of Picking journals -->
-
-        <record model="ir.actions.act_window" id="action_definition_picking_journal">
-            <field name="name">Picking Journals</field>
-            <field name="res_model">sale_journal.picking.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_user_id':uid}</field>
-            <field name="search_view_id" ref="view_picking_journal_search"/>
-        </record>
-
-        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/>
-
-        <record model="ir.actions.act_window" id="action_invoice_type_tree">
-            <field name="name">Picking by invoice_method</field>
-            <field name="res_model">sale_journal.invoice.type</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">tree</field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-            <field name="name">Picking to invoice</field>
-            <field name="res_model">stock.picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-        </record>
-
-        <record model="ir.values" id="ir_open_invoice_type">
-            <field name="key2">tree_but_open</field>
-            <field name="model">sale_journal.invoice.type</field>
-            <field name="name">Picking to invoice</field>
-            <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
-            <field name="object" eval="True"/>
-        </record>
-
-        <record id="view_picking_out_jorunal_search_form" model="ir.ui.view">
-            <field name="name">stock.picking.journal.search</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="stock.view_picking_out_search"/>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
-                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_picking_in_jorunal_search_form" model="ir.ui.view">
-            <field name="name">stock.picking.journal.search</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="stock.view_picking_in_search"/>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
-                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_picking_internal_jorunal_search_form" model="ir.ui.view">
-            <field name="name">stock.picking.journal.search</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="stock.view_picking_internal_search"/>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='Origin']" position="after">
-                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                </xpath>
-            </field>
-        </record>
-
-
    </data>
 </openerp>
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index dcee2bd1f4e..bc1a3b003c3 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,13 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,0,0,0
+"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,1,1,1
 "access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
 "access_sale_journal_invoice_type_salesman","sale_journal.invoice.type salesman","model_sale_journal_invoice_type","base.group_sale_salesman",1,0,0,0
-"access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","base.group_sale_salesman",1,0,0,0
 "access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","base.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","base.group_sale_manager",1,1,1,1
-"access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","base.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_stock_worker","sale_journal.sale.journal stock worker","model_sale_journal_sale_journal","stock.group_stock_user",1,0,0,0
-"access_sale_journal_picking_journal_stock_worker","sale_journal.picking.journal stock worker","model_sale_journal_picking_journal","stock.group_stock_user",1,0,0,0
 "access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
-"access_sale_journal_sale_journal_report_manager","sale_journal_sale_journal_report_manager","model_sale_journal_report","base.group_sale_manager",1,1,1,1
-"access_sale_journal_picking_report","sale_journal_picking_report","model_sale_journal_picking_report","stock.group_stock_manager",1,1,1,1
diff --git a/addons/sale_journal/test/picking_journal.yml b/addons/sale_journal/test/picking_journal.yml
deleted file mode 100644
index 9412c3d40d1..00000000000
--- a/addons/sale_journal/test/picking_journal.yml
+++ /dev/null
@@ -1,87 +0,0 @@
--
-  In order to test the sale_journal module in OpenERP,
-  I create a picking journal
--
-  !record {model: sale_journal.picking.journal, id: sale_journal_picking_journal_pickjournal0}:
-    code: PJ
-    date: '2010-08-04'
-    date_created: '2010-08-04'
-    name: Pick_journal
-    state: draft
-    user_id: base.user_root
--
-  I create a picking for product keyboard, quantity 50
--
-  !record {model: stock.picking, id: stock_picking_out0}:
-    address_id: base.res_partner_address_6
-    company_id: base.main_company
-    invoice_state: none
-    journal_id: sale_journal_picking_journal_pickjournal0
-    move_lines:
-      - company_id: base.main_company
-        date_expected: '2010-08-04 14:09:38'
-        date: '2010-08-04 14:09:38'
-        location_id: stock.stock_location_stock
-        product_id: product.product_product_24
-        product_qty: 50.0
-        product_uom: product.product_uom_unit
-        location_dest_id: stock.stock_location_customers
-        name: '[KEYA] Keyboard - AZERTY'
-        product_uos_qty: 50.0
-    move_type: direct
-    name: OUT/00007
-    type: out
--
-  I verify that a Journal consist of picking order
--
-  !python {model: sale_journal.picking.journal}: |
-    pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    assert pick_jour.picking_stats_ids, "Journal does not consist of a picking order" 
--
-  Then I click on the 'Open Journal' button
--
-  !python {model: sale_journal.picking.journal}: |
-    self.button_open(cr, uid, [ref("sale_journal_picking_journal_pickjournal0")], {"lang": "en_US", "search_default_user_id":
-      1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal_picking")],
-      "active_id": ref("sale_journal.menu_definition_journal_picking")})
--
-  I verify that a state of journal has transit from draft to open state
--
-  !python {model: sale_journal.picking.journal}: |
-    pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    assert (pick_jour.state == 'open'), "Journal is not in the open state"
--
-  Then I click on the 'Confirm Picking' button
--
-  !python {model: sale_journal.picking.journal}: |
-    self.button_picking_confirm(cr, uid, [ref("sale_journal_picking_journal_pickjournal0")], {"lang": "en_US", "search_default_user_id":
-      1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal_picking")],
-      "active_id": ref("sale_journal.menu_definition_journal_picking")})
--
-  I verify that a state of journal has transit from open to confirm state
--
-  !python {model: sale_journal.picking.journal}: |
-    pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    assert (pick_jour.state == 'confirm'), "Journal is not in the open state"
--
-  I verify that an picking order is now in the confirm state
--
-  !python {model: stock.picking}: |
-    pick_jour_obj = self.pool.get('sale_journal.picking.journal')
-    jour = pick_jour_obj.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    stock_pick = self.browse(cr, uid, ref("stock_picking_out0"))
-    pick_jour = self.search(cr, uid, [('journal_id','=',jour.name) and ('state','=','confirmed')])
-    assert pick_jour, "Sale order is not in the confirm state"
--
-  Then I click on the 'Close Journal' button
--
-  !python {model: sale_journal.picking.journal}: |
-    self.button_close(cr, uid, [ref("sale_journal_picking_journal_pickjournal0")], {"lang": "en_US", "search_default_user_id":
-      1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal_picking")],
-      "active_id": ref("sale_journal.menu_definition_journal_picking")})
--
-  I verify that a state of journal has transit from confirm to close state
--
-  !python {model: sale_journal.picking.journal}: |
-    pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    assert (pick_jour.state == 'close'), "Journal is not in the open state"
diff --git a/addons/sale_journal/test/sale_journal.yml b/addons/sale_journal/test/sale_journal.yml
deleted file mode 100644
index 365e2640031..00000000000
--- a/addons/sale_journal/test/sale_journal.yml
+++ /dev/null
@@ -1,95 +0,0 @@
--
-  In order to test the sale_journal module in OpenERP,
-  I create a sale journal and place a sale order related to a journal
--
-  I create a sale journal
--
-  !record {model: sale_journal.sale.journal, id: sale_journal_sale_journal_journal0}:
-    code: J1
-    date: '2010-08-04'
-    date_created: '2010-08-04'
-    name: Journal_1
-    state: draft
-    user_id: base.user_root
--
-  I place a sale order for product keyboard, quantity 100
--
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: '2010-08-04'
-    invoice_quantity: order
-    invoice_type_id: sale_journal.daily
-    journal_id: sale_journal_sale_journal_journal0
-    name: Test_SO012
-    order_line:
-      - name: '[KEYA] Keyboard - AZERTY'
-        price_unit: 7.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
-        product_id: product.product_product_24
-        product_uos_qty: 100.0
-        th_weight: 0.0
-        type: make_to_stock
-    order_policy: manual
-    partner_id: base.res_partner_4
-    partner_invoice_id: base.res_partner_address_7
-    partner_order_id: base.res_partner_address_7
-    partner_shipping_id: base.res_partner_address_7
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I verify that a Journal consist of sale order
--
-  !python {model: sale_journal.sale.journal}: |
-    sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
-    assert sal_jour.sale_stats_ids, "Journal does not consist of a sale order details" 
--
-  Then I click on the 'Open Journal' button
--
-  !python {model: sale_journal.sale.journal}: |
-    self.button_open(cr, uid, [ref("sale_journal_sale_journal_journal0")], {"lang": "en_US", "search_default_user_id":
-      1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal")],
-      "active_id": ref("sale_journal.menu_definition_journal")})
--
-  I verify that a state of journal has transit from draft to open state
--
-  !python {model: sale_journal.sale.journal}: |
-    sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
-    assert (sal_jour.state == 'open'), "Journal is not in the open state"
--
-  Then I click on the 'Confirm Sales' button   
--
-  !python {model: sale_journal.sale.journal}: |
-    self.button_sale_confirm(cr, uid, [ref("sale_journal_sale_journal_journal0")], {"lang": "en_US", "search_default_user_id":
-      1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal")],
-      "active_id": ref("sale_journal.menu_definition_journal")})   
--
-  I verify that a state of journal has transit from open to confirm state
--
-  !python {model: sale_journal.sale.journal}: |
-    sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
-    assert (sal_jour.state == 'confirm'), "Journal is not in the confirm state"
--
-  I verify that a sale order is now in the confirm state
--
-  !python {model: sale.order}: |
-    sale_jour_obj = self.pool.get('sale_journal.sale.journal')
-    jour = sale_jour_obj.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    so_jour = self.search(cr, uid, [('journal_id','=',jour.name) and ('state','=','manual')])
-    assert so_jour, "Sale order is not in the confirm state"
--
-  Then I click on the 'Close Journal' button
--
-  !python {model: sale_journal.sale.journal}: |
-    self.button_close(cr, uid, [ref("sale_journal_sale_journal_journal0")], {"lang": "en_US", "search_default_user_id":
-      1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal")],
-      "active_id": ref("sale_journal.menu_definition_journal")})
--
-  I verify that a state of journal has transit from confirm to close state
--
-  !python {model: sale_journal.sale.journal}: |
-    sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
-    assert (sal_jour.state == 'close'), "Journal is not in the close state" 
\ No newline at end of file

From da25cf7cb866224d2bc7bb39d59a0c66b96ad6fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 20:19:50 +0200
Subject: [PATCH 282/294] [IMP] useability improvements menu audit trail

bzr revid: fp@tinyerp.com-20101017181950-17yrh9pou8j55ku7
---
 addons/audittrail/audittrail_view.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 218db24d89a..5fdcfcd5558 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -55,7 +55,7 @@
     <!-- Action for audittrail rule -->
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
-            <field name="name">Rules</field>
+            <field name="name">Audit Rules</field>
             <field name="res_model">audittrail.rule</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -63,12 +63,8 @@
             <!--<field name="view_id" ref="view_audittrail_rule_form" />-->
         </record>
 
-        <menuitem name="Audittrail" id="menu_action_audittrail"
-            groups="base.group_extended"
-            parent="base.menu_administration" />
-
         <menuitem name="Rules" id="menu_action_audittrail_rule_tree"
-            action="action_audittrail_rule_tree" parent="menu_action_audittrail" />
+            action="action_audittrail_rule_tree" parent="base.menu_audit" />
 
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
@@ -152,12 +148,12 @@
 <!--  Action for Audittrail Log  -->
 
         <record model="ir.actions.act_window" id="action_audittrail_log_tree">
-            <field name="name">Logs</field>
+            <field name="name">Audit Logs</field>
             <field name="res_model">audittrail.log</field>
             <field name="view_type">form</field>
         </record>
         <menuitem name="Logs" id="menu_action_audittrail_log_tree"
-            action="action_audittrail_log_tree" parent="menu_action_audittrail" />
+            action="action_audittrail_log_tree" parent="base.menu_audit" />
 
     </data>
 </openerp>

From f1c40bd6d4da75880cef38afa893300e02349f98 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 20:28:33 +0200
Subject: [PATCH 283/294] fix_from_xrg_regression

bzr revid: fp@tinyerp.com-20101017182833-dywgmlxltkq1g2rs
---
 addons/board/board_administration_view.xml | 15 ---------------
 addons/crm/crm_lead.py                     | 12 ++++++------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 675143342c0..3352c915898 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -2,26 +2,11 @@
 <openerp>
     <data>
     <!-- Latest Activities -->
-        <record model="ir.ui.view" id="view_latest_activities_tree">
-            <field name="name">latest.activities.tree</field>
-            <field name="model">res.log</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Latest Activities">
-                    <field name="name"/>
-                    <field name="create_date"/>
-                    <field name="user_id" />
-                    <field name="res_model"/>
-                    <field name="res_id"/>
-                </tree>
-            </field>
-        </record>
         <record model="ir.actions.act_window" id="action_latest_activities_tree">
             <field name="name">Latest Activities</field>
             <field name="res_model">res.log</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_latest_activities_tree"></field>
         </record>
 
         <record id="board_administration_form" model="ir.ui.view">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3b0bd140748..6a113a42c2a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -199,11 +199,11 @@ class crm_lead(crm_case, osv.osv):
 
         for case in self.browse(cr, uid, ids):
             if case.type == 'lead':
-                message = _("The lead '%s' has been opened.") % name
+                message = _("The lead '%s' has been opened.") % case.name
             elif case.type == 'opportunity':
-                message = _("The opportunity '%s' has been opened.") % name
+                message = _("The opportunity '%s' has been opened.") % case.name
             else:
-                message = _("The case '%s' has been opened.") % name
+                message = _("The case '%s' has been opened.") % case.name
             self.log(cr, uid, case.id, message)
         return res
 
@@ -219,11 +219,11 @@ class crm_lead(crm_case, osv.osv):
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         for case in self.browse(cr, uid, ids):
             if case.type == 'lead':
-                message = _("The lead '%s' has been closed.") % name
+                message = _("The lead '%s' has been closed.") % case.name
             elif case.type == 'opportunity':
-                message = _("The opportunity '%s' has been closed.") % name
+                message = _("The opportunity '%s' has been closed.") % case.name
             else:
-                message = _("The case '%s' has been closed.") % name
+                message = _("The case '%s' has been closed.") % case.name
             self.log(cr, uid, case.id, message)
         return res
 

From 2c63a39497a6a24e3db177d685e5e9191c0a632e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 22:31:19 +0200
Subject: [PATCH 284/294] [IMP] access rights, account tax include no more
 required, some fixes

bzr revid: fp@tinyerp.com-20101017203119-2p80zc0nz6tjpxr8
---
 addons/account/invoice.py                     |  11 +-
 addons/account/security/ir.model.access.csv   |   2 +-
 addons/account_tax_include/__init__.py        |  25 --
 addons/account_tax_include/__openerp__.py     |  44 ----
 .../account_tax_include.py                    | 228 ------------------
 .../account_tax_include_view.xml              |  79 ------
 .../i18n/account_tax_include.pot              |  52 ----
 addons/account_tax_include/i18n/ar.po         |  52 ----
 addons/account_tax_include/i18n/bg.po         |  52 ----
 addons/account_tax_include/i18n/bs.po         |  52 ----
 addons/account_tax_include/i18n/ca.po         |  53 ----
 addons/account_tax_include/i18n/cs.po         |  52 ----
 addons/account_tax_include/i18n/de.po         |  52 ----
 addons/account_tax_include/i18n/el.po         |  53 ----
 addons/account_tax_include/i18n/en_AU.po      |  53 ----
 addons/account_tax_include/i18n/en_GB.po      |  53 ----
 addons/account_tax_include/i18n/es.po         |  52 ----
 addons/account_tax_include/i18n/es_AR.po      |  52 ----
 addons/account_tax_include/i18n/es_EC.po      |  52 ----
 addons/account_tax_include/i18n/et.po         |  52 ----
 addons/account_tax_include/i18n/fi.po         |  53 ----
 addons/account_tax_include/i18n/fr.po         |  52 ----
 addons/account_tax_include/i18n/gl.po         |  54 -----
 addons/account_tax_include/i18n/hr.po         |  52 ----
 addons/account_tax_include/i18n/hu.po         |  52 ----
 addons/account_tax_include/i18n/id.po         |  52 ----
 addons/account_tax_include/i18n/it.po         |  52 ----
 addons/account_tax_include/i18n/ko.po         |  53 ----
 addons/account_tax_include/i18n/lt.po         |  52 ----
 addons/account_tax_include/i18n/nb.po         |  53 ----
 addons/account_tax_include/i18n/nl.po         |  52 ----
 addons/account_tax_include/i18n/nl_BE.po      |  52 ----
 addons/account_tax_include/i18n/oc.po         |  53 ----
 addons/account_tax_include/i18n/pl.po         |  52 ----
 addons/account_tax_include/i18n/pt.po         |  52 ----
 addons/account_tax_include/i18n/pt_BR.po      |  52 ----
 addons/account_tax_include/i18n/ro.po         |  52 ----
 addons/account_tax_include/i18n/ru.po         |  52 ----
 addons/account_tax_include/i18n/sk.po         |  53 ----
 addons/account_tax_include/i18n/sl.po         |  52 ----
 addons/account_tax_include/i18n/sq.po         |  53 ----
 addons/account_tax_include/i18n/sr.po         |  53 ----
 addons/account_tax_include/i18n/sv.po         |  52 ----
 addons/account_tax_include/i18n/tlh.po        |  52 ----
 addons/account_tax_include/i18n/tr.po         |  52 ----
 addons/account_tax_include/i18n/uk.po         |  52 ----
 addons/account_tax_include/i18n/vi.po         |  53 ----
 addons/account_tax_include/i18n/zh_CN.po      |  63 -----
 addons/account_tax_include/i18n/zh_TW.po      |  52 ----
 .../test/account_tax_include.yml              |  93 -------
 addons/account_voucher/account_voucher.py     |  19 +-
 addons/board/board_administration_view.xml    |   4 +-
 addons/product/security/product_security.xml  |   2 +-
 addons/project/board_project_view.xml         |  17 +-
 addons/project/project.py                     | 151 ++----------
 addons/project/project_demo.xml               |   2 +-
 addons/project/project_view.xml               |  13 +-
 addons/project/report/project_report_view.xml |   2 +-
 addons/project/security/ir.model.access.csv   |   8 -
 addons/project/security/project_security.xml  |   8 -
 addons/project_gtd/project_gtd_view.xml       |   2 +-
 .../project_gtd/security/ir.model.access.csv  |   2 -
 addons/project_issue/project_issue_view.xml   |   2 +-
 .../report/project_issue_report_view.xml      |   2 +-
 .../security/ir.model.access.csv              |   7 -
 .../security/ir.model.access.csv              |   5 -
 .../project_long_term_view.xml                |   4 +-
 .../security/ir.model.access.csv              |   5 -
 .../security/ir.model.access.csv              |   1 -
 .../project_planning_view.xml                 |   2 +-
 .../security/ir.model.access.csv              |   3 -
 .../security/ir.model.access.csv              |   3 -
 .../project_timesheet_view.xml                |   2 +-
 .../security/ir.model.access.csv              |   2 -
 74 files changed, 51 insertions(+), 2960 deletions(-)
 delete mode 100644 addons/account_tax_include/__init__.py
 delete mode 100644 addons/account_tax_include/__openerp__.py
 delete mode 100644 addons/account_tax_include/account_tax_include.py
 delete mode 100644 addons/account_tax_include/account_tax_include_view.xml
 delete mode 100644 addons/account_tax_include/i18n/account_tax_include.pot
 delete mode 100644 addons/account_tax_include/i18n/ar.po
 delete mode 100644 addons/account_tax_include/i18n/bg.po
 delete mode 100644 addons/account_tax_include/i18n/bs.po
 delete mode 100644 addons/account_tax_include/i18n/ca.po
 delete mode 100644 addons/account_tax_include/i18n/cs.po
 delete mode 100644 addons/account_tax_include/i18n/de.po
 delete mode 100644 addons/account_tax_include/i18n/el.po
 delete mode 100644 addons/account_tax_include/i18n/en_AU.po
 delete mode 100644 addons/account_tax_include/i18n/en_GB.po
 delete mode 100644 addons/account_tax_include/i18n/es.po
 delete mode 100644 addons/account_tax_include/i18n/es_AR.po
 delete mode 100644 addons/account_tax_include/i18n/es_EC.po
 delete mode 100644 addons/account_tax_include/i18n/et.po
 delete mode 100644 addons/account_tax_include/i18n/fi.po
 delete mode 100644 addons/account_tax_include/i18n/fr.po
 delete mode 100644 addons/account_tax_include/i18n/gl.po
 delete mode 100644 addons/account_tax_include/i18n/hr.po
 delete mode 100644 addons/account_tax_include/i18n/hu.po
 delete mode 100644 addons/account_tax_include/i18n/id.po
 delete mode 100644 addons/account_tax_include/i18n/it.po
 delete mode 100644 addons/account_tax_include/i18n/ko.po
 delete mode 100644 addons/account_tax_include/i18n/lt.po
 delete mode 100644 addons/account_tax_include/i18n/nb.po
 delete mode 100644 addons/account_tax_include/i18n/nl.po
 delete mode 100644 addons/account_tax_include/i18n/nl_BE.po
 delete mode 100644 addons/account_tax_include/i18n/oc.po
 delete mode 100644 addons/account_tax_include/i18n/pl.po
 delete mode 100644 addons/account_tax_include/i18n/pt.po
 delete mode 100644 addons/account_tax_include/i18n/pt_BR.po
 delete mode 100644 addons/account_tax_include/i18n/ro.po
 delete mode 100644 addons/account_tax_include/i18n/ru.po
 delete mode 100644 addons/account_tax_include/i18n/sk.po
 delete mode 100644 addons/account_tax_include/i18n/sl.po
 delete mode 100644 addons/account_tax_include/i18n/sq.po
 delete mode 100644 addons/account_tax_include/i18n/sr.po
 delete mode 100644 addons/account_tax_include/i18n/sv.po
 delete mode 100644 addons/account_tax_include/i18n/tlh.po
 delete mode 100644 addons/account_tax_include/i18n/tr.po
 delete mode 100644 addons/account_tax_include/i18n/uk.po
 delete mode 100644 addons/account_tax_include/i18n/vi.po
 delete mode 100644 addons/account_tax_include/i18n/zh_CN.po
 delete mode 100644 addons/account_tax_include/i18n/zh_TW.po
 delete mode 100644 addons/account_tax_include/test/account_tax_include.yml

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 0b314109052..23978296367 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1295,14 +1295,6 @@ class account_invoice_line(osv.osv):
         'price_unit': _price_unit_default,
     }
 
-    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
-        tax_obj = self.pool.get('account.tax')
-        if price_unit:
-            taxes = tax_obj.browse(cr, uid, tax_id)
-            for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id):
-                price_unit = price_unit - tax['amount']
-        return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
         if context is None:
             context = {}
@@ -1402,8 +1394,7 @@ class account_invoice_line(osv.osv):
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
             tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
         if type in ('in_invoice', 'in_refund'):
-            to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context)
-            result.update(to_update)
+            result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
 
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 99692bc3e2e..124593ff8f5 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -39,7 +39,7 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
deleted file mode 100644
index f96eb08f2fe..00000000000
--- a/addons/account_tax_include/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account_tax_include
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
deleted file mode 100644
index a6bab18ce01..00000000000
--- a/addons/account_tax_include/__openerp__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Invoices and prices with taxes included',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """Allow the user to work tax included prices.
-Especially useful for b2c businesses.
-
-This module implements the modification on the invoice form.
-""",
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['account'],
-    'init_xml': [],
-    'update_xml': ['account_tax_include_view.xml'],
-    'demo_xml': [],
-    'test': ['test/account_tax_include.yml'],
-    'installable': True,
-    'active': False,
-    'certificate': '0070514190381',
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
deleted file mode 100644
index afd1ef36ae7..00000000000
--- a/addons/account_tax_include/account_tax_include.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from osv import fields, osv
-
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-    _columns = {
-        'price_type': fields.selection([('tax_included','Tax included'),
-                                        ('tax_excluded','Tax excluded')],
-                                        'Price method', required=True, readonly=True,
-                                        states={'draft': [('readonly', False)]}),
-    }
-    _defaults = {
-        'price_type': 'tax_excluded',
-    }
-
-    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        map_old_new = {}
-        refund_ids = []
-        for old_inv_id in ids:
-            new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description, journal_id=journal_id)
-            refund_ids += new_id
-            map_old_new[old_inv_id] = new_id[0]
-
-        for old_inv_id in map_old_new.keys():
-            old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type']
-            self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record})
-        return refund_ids
-
-account_invoice()
-
-class account_invoice_line(osv.osv):
-    _inherit = "account.invoice.line"
-
-    def _amount_line2(self, cr, uid, ids, name, args, context=None):
-        """
-        Return the subtotal excluding taxes with respect to price_type.
-        """
-        res = {}
-        tax_obj = self.pool.get('account.tax')
-        cur_obj = self.pool.get('res.currency')
-        dec_obj = self.pool.get('decimal.precision')
-        for line in self.browse(cr, uid, ids):
-            cur = line.invoice_id and line.invoice_id.currency_id or False
-            res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
-            res[line.id] = {
-                'price_subtotal': 0.0,
-                'price_subtotal_incl': 0.0,
-                'data': []
-            }
-            if not line.quantity:
-                continue
-            if line.invoice_id:
-                product_taxes = []
-                if line.product_id:
-                    if line.invoice_id.type in ('out_invoice', 'out_refund'):
-                        product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
-                    else:
-                        product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
-
-                if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
-                    res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-                else:
-                    res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-                    for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
-                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.precision_get(cr, uid, 'Account'))
-            else:
-                res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-
-            if res[line.id]['price_subtotal']:
-                res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
-                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
-                    res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
-                    res[line.id]['data'].append(tax)
-            else:
-                res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
-                for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
-                    res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
-                    res[line.id]['data'].append(tax)
-
-            res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
-            res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
-        return res
-
-    def _price_unit_default(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if 'check_total' in context:
-            t = context['check_total']
-            if context.get('price_type', False) == 'tax_included':
-                for l in context.get('invoice_line', {}):
-                    if len(l) >= 3 and l[2]:
-                        p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0)
-                        t = t - (p * l[2].get('quantity'))
-                return t
-            return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
-        return 0
-
-    def _get_invoice(self, cr, uid, ids, context=None):
-        result = {}
-        for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
-            for line in inv.invoice_line:
-                result[line.id] = True
-        return result.keys()
-
-    _columns = {
-        'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
-            store={'account.invoice':(_get_invoice,['price_type'], 10), 'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids, None,10)}),
-        'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
-            store={'account.invoice':(_get_invoice,['price_type'], 10), 'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids, None,10)}),
-                }
-
-    _defaults = {
-        'price_unit': _price_unit_default,
-                }
-
-    def move_line_get_item(self, cr, uid, line, context=None):
-        return {
-                'type':'src',
-                'name':line.name,
-                'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal,
-                'quantity':line.quantity,
-                'price':line.price_subtotal,
-                'account_id':line.account_id.id,
-                'product_id': line.product_id.id,
-                'uos_id':line.uos_id.id,
-                'account_analytic_id':line.account_analytic_id.id,
-                }
-
-    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
-        if context is None:
-            context = {}
-        # if the tax is already included, just return the value without calculations
-        if context.get('price_type', False) == 'tax_included':
-            return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-        else:
-            return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
-
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        # note: will call product_id_change_unit_price_inv with context...
-
-        # Temporary trap, for bad context that came from koo:
-
-        ctx = (context and context.copy()) or {}
-        ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
-        return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
-
-account_invoice_line()
-
-class account_invoice_tax(osv.osv):
-    _inherit = "account.invoice.tax"
-
-    def compute(self, cr, uid, invoice_id, context=None):
-        tax_grouped = {}
-        tax_obj = self.pool.get('account.tax')
-        cur_obj = self.pool.get('res.currency')
-        line_obj = self.pool.get('account.invoice.line')
-
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
-        line_ids = map(lambda x: x.id, inv.invoice_line)
-
-        cur = inv.currency_id
-        company_currency = inv.company_id.currency_id.id
-
-        for line in inv.invoice_line:
-            data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
-            for tax in data['data']:
-                val={}
-                val['invoice_id'] = inv.id
-                val['name'] = tax['name']
-                val['amount'] = tax['amount']
-                val['manual'] = False
-                val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
-
-                if inv.type in ('out_invoice','in_invoice'):
-                    val['base_code_id'] = tax['base_code_id']
-                    val['tax_code_id'] = tax['tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
-                else:
-                    val['base_code_id'] = tax['ref_base_code_id']
-                    val['tax_code_id'] = tax['ref_tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
-
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
-                if not key in tax_grouped:
-                    tax_grouped[key] = val
-                else:
-                    tax_grouped[key]['amount'] += val['amount']
-                    tax_grouped[key]['base'] += val['base']
-                    tax_grouped[key]['base_amount'] += val['base_amount']
-                    tax_grouped[key]['tax_amount'] += val['tax_amount']
-
-        for t in tax_grouped.values():
-            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
-            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
-            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
-
-        return tax_grouped
-
-account_invoice_tax()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_tax_include/account_tax_include_view.xml b/addons/account_tax_include/account_tax_include_view.xml
deleted file mode 100644
index 4c103cd0d50..00000000000
--- a/addons/account_tax_include/account_tax_include_view.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_tax_view_price" model="ir.ui.view">
-            <field name="name">account.tax.exlcuded.view.form</field>
-            <field name="type">form</field>
-            <field name="model">account.tax</field>
-            <field name="inherit_id" ref="account.view_tax_form"/>
-            <field name="arch" type="xml">
-                <field name="python_compute" position="after">
-                    <separator colspan="4" string="Compute Code for Taxes included prices"/>
-                    <field colspan="4" name="python_compute_inv" nolabel="1"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="account_invoice_view_price" model="ir.ui.view">
-            <field name="name">account.invoice.vat.exlcuded.view.form</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="arch" type="xml">
-                <field name="payment_term" position="after">
-                    <field name="price_type"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="invoice_supplier_form_tax_include" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.tax_include</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
-                    <field name="price_type"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.tax_include2</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="price_subtotal_incl"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.tax_include3</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field name="product_id" position="replace">
-                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id,{'company_id': parent.company_id, 'price_type':parent.price_type})"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_invoice_line_tree" model="ir.ui.view">
-            <field name="name">account.invoice.line.tree</field>
-            <field name="model">account.invoice.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="price_subtotal_incl"/>
-                </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/account_tax_include/i18n/account_tax_include.pot b/addons/account_tax_include/i18n/account_tax_include.pot
deleted file mode 100644
index da7622102bd..00000000000
--- a/addons/account_tax_include/i18n/account_tax_include.pot
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po
deleted file mode 100644
index 5090a5e011f..00000000000
--- a/addons/account_tax_include/i18n/ar.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po
deleted file mode 100644
index f0b055241cc..00000000000
--- a/addons/account_tax_include/i18n/bg.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:06+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "�евалиден XML за преглед на архитектурата"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "�ачин на изчи�л�ване"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С включен данък"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Без данък"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
deleted file mode 100644
index 97a0c10e367..00000000000
--- a/addons/account_tax_include/i18n/bs.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-10 12:26+0000\n"
-"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna procedura"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Ra�uni i cijene sa uklju�enim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uklju�en"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Porez nije uklju�en"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Izra�unaj cijene sa porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub-ukupno"
diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po
deleted file mode 100644
index ce0276a8c26..00000000000
--- a/addons/account_tax_include/i18n/ca.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-29 06:30+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Mètode preu"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures i preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impostos exclosos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Codi pel càlcul dels preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
deleted file mode 100644
index a8958b780d7..00000000000
--- a/addons/account_tax_include/i18n/cs.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:35+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný XML pro zobrazení architektury"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda ur�ování cen"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury a ceny v�etně daní"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "DanÄ› zahrnuty"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Daně vylou�eny"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Výpo�etní kód pro ceny v�etně daně"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Mezisou�et"
diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po
deleted file mode 100644
index 4635a414aaa..00000000000
--- a/addons/account_tax_include/i18n/de.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-09 13:20+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Preismethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Rechnungen und Preise mit inkludierten Steuern"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Steuer inklusive"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Steuern exklusive"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Berechnungsgrundlage (inkl. Steuer)"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Zwischensumme"
diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po
deleted file mode 100644
index 74d719a9b9e..00000000000
--- a/addons/account_tax_include/i18n/el.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:27+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυ�ο XML για την α�χιτεκτονική όψης!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Μέθοδος Τιμής"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Τιμολόγια και τιμές με ενσωμάτωση φό�ων"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Συμπε�ίληψη φό�ου"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Εξαι�ο�νται φό�οι"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Κωδικός Υπολογισμο� για Φό�ους που εμπε�ιέχονται στις τιμές"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Υποσ�νολο"
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
deleted file mode 100644
index 4c0e3609f24..00000000000
--- a/addons/account_tax_include/i18n/en_AU.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# English (Australia) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:19+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (Australia) <en_AU@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/en_GB.po b/addons/account_tax_include/i18n/en_GB.po
deleted file mode 100644
index cd72d7a2cac..00000000000
--- a/addons/account_tax_include/i18n/en_GB.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:20+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po
deleted file mode 100644
index b01d20c9ec8..00000000000
--- a/addons/account_tax_include/i18n/es.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-24 20:17+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos excluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para el cálculo de precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po
deleted file mode 100644
index a9cc40c0d4c..00000000000
--- a/addons/account_tax_include/i18n/es_AR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-14 18:28+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método de precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos no incluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código del cálculo para precios con impuestos incluídos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es_EC.po b/addons/account_tax_include/i18n/es_EC.po
deleted file mode 100644
index 1858f2a52bc..00000000000
--- a/addons/account_tax_include/i18n/es_EC.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 17:47+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos excluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para el cálculo de precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po
deleted file mode 100644
index d4398a2ae58..00000000000
--- a/addons/account_tax_include/i18n/et.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinna meetod"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Makse sisaldavad arved ja hinnad"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Maksuga"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Maksuta"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Arvuta kood maksuga hindadele"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Vahesumma"
diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po
deleted file mode 100644
index 0b8e8dfcee2..00000000000
--- a/addons/account_tax_include/i18n/fi.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:40+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinnan tyyppi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Laskut ja hinnat veroilla"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Vero sisältyy"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Ilman veroa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Laske koodi hinnoille joissa on vero mukana"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Välisumma"
diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po
deleted file mode 100644
index 3f912c6ffba..00000000000
--- a/addons/account_tax_include/i18n/fr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Méthode de prix"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures et prix avec taxes comprises"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe comprise"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Hors-taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Code de calcul pour les prix taxes comprises"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sous-total"
diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po
deleted file mode 100644
index 96e95387061..00000000000
--- a/addons/account_tax_include/i18n/gl.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# translation of account-tax-include-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: account-tax-include-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método prezo"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prezos con impostos incluídos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluído"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para o cálculo dos impostos en prezos incluídos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po
deleted file mode 100644
index ba46ce2f95a..00000000000
--- a/addons/account_tax_include/i18n/hr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:43+0000\n"
-"Last-Translator: Dragan Jovanovic <dragan.jovanovic@strojotex.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna metoda"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Ra�uni i cijene sa uklju�enim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uklju�en"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nije uklju�en porez"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Kod za izra�un cijena sa uklju�enim porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Podzbroj"
diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po
deleted file mode 100644
index 5090a5e011f..00000000000
--- a/addons/account_tax_include/i18n/hu.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
deleted file mode 100644
index e0d1f76a6b1..00000000000
--- a/addons/account_tax_include/i18n/id.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML tidak valid untuk Menampilkan Arsitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metode Harga"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktur dan harga sudah termasuk pajak"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Termasuk Pajak"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tidak termasuk pajak"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "menghitung kode untuk Pajak termasuk harga"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub Total"
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
deleted file mode 100644
index 8b6d0f9df36..00000000000
--- a/addons/account_tax_include/i18n/it.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 07:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metodo di pagamento"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tasse incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tasse escluse"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotale"
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
deleted file mode 100644
index 254d3ffc1b1..00000000000
--- a/addons/account_tax_include/i18n/ko.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:43+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "뷰 아키�처� XML� 유효하지 않습니다."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "가격 방�"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "세금� �함� �보�스와 가격"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "세금 �함"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "세금 제외"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "세금 �함 가격� 위한 컴퓨터 코드"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "서브토털"
diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po
deleted file mode 100644
index 35af6cdcb04..00000000000
--- a/addons/account_tax_include/i18n/lt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:54+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/nb.po b/addons/account_tax_include/i18n/nb.po
deleted file mode 100644
index a457b6a3c49..00000000000
--- a/addons/account_tax_include/i18n/nb.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ugyldig XML for visningsarkitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
deleted file mode 100644
index cfccf0663d4..00000000000
--- a/addons/account_tax_include/i18n/nl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-14 21:11+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Prijsmethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturen en prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Exclusief belastingen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Bereken code voor prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotaal"
diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po
deleted file mode 100644
index 68a51f90ec3..00000000000
--- a/addons/account_tax_include/i18n/nl_BE.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:12+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po
deleted file mode 100644
index 95700dc830e..00000000000
--- a/addons/account_tax_include/i18n/oc.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:48+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metòde de prètz"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prèses amb taxas inclusas"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxa inclusa"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fòra taxa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Còde de calcul pels prèses amb taxas compresas"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sostotal"
diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po
deleted file mode 100644
index efa5a2bfdfb..00000000000
--- a/addons/account_tax_include/i18n/pl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-21 15:43+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda wyceny"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury i ceny zawierajÄ…ce podatki."
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Zawiera podatek"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nie zawiera podatku"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Wylicz kod dla cen z podatkiem"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Suma częściowa"
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
deleted file mode 100644
index 9f5c11b9832..00000000000
--- a/addons/account_tax_include/i18n/pt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:49+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura da vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método do preço"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e preços com imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluído"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código de cálculo para preços com imposto incluído"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po
deleted file mode 100644
index bd8ff06c8e4..00000000000
--- a/addons/account_tax_include/i18n/pt_BR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:28+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
deleted file mode 100644
index c6c5a81169c..00000000000
--- a/addons/account_tax_include/i18n/ro.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:52+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda de pret"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturi şi preţuri cu taxele incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fără taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Calcul cod pentru preţuri cu taxe incluse"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
deleted file mode 100644
index 0d7efd3ffdf..00000000000
--- a/addons/account_tax_include/i18n/ru.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-06 06:51+0000\n"
-"Last-Translator: mr.The <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "�еправильный XML дл� про�мотра архитектуры!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Метод ра�чета цены"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Счета и цены � налогами"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С налогами"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "До налогов"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Выполнить код дл� цен � налогами"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Промежуточный итог"
diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po
deleted file mode 100644
index eedd88d3edc..00000000000
--- a/addons/account_tax_include/i18n/sk.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:53+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktúry a ceny zahrnuté s DPH"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Medzisú�et"
diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po
deleted file mode 100644
index 22db03c5894..00000000000
--- a/addons/account_tax_include/i18n/sl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda cene"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Ra�uni in cene z vklju�enimi davki"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Davek vklju�en"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Davek ni vklju�en"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Koda izra�una za davke v cenah"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Delna vsota"
diff --git a/addons/account_tax_include/i18n/sq.po b/addons/account_tax_include/i18n/sq.po
deleted file mode 100644
index 7c7b2189fd2..00000000000
--- a/addons/account_tax_include/i18n/sq.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/sr.po b/addons/account_tax_include/i18n/sr.po
deleted file mode 100644
index bfcc7a71005..00000000000
--- a/addons/account_tax_include/i18n/sr.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Serbian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 08:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cenovna metoda"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Ra�uni i cene sa uklju�enim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uklju�en"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nije uklju�en porez"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Kompjuterski kod za izra�unavanje cijena sa uklju�enim porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
deleted file mode 100644
index 30a63ed1824..00000000000
--- a/addons/account_tax_include/i18n/sv.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 02:42+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po
deleted file mode 100644
index 334e888d03d..00000000000
--- a/addons/account_tax_include/i18n/tlh.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
deleted file mode 100644
index a719aaf1b2b..00000000000
--- a/addons/account_tax_include/i18n/tr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 06:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Fiyat Yöntemi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Vergiler dahil fiyat ve faturalar"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "KDV Dahil"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "KDV Hariç"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Alt Toplam"
diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po
deleted file mode 100644
index 8b467132fb9..00000000000
--- a/addons/account_tax_include/i18n/uk.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:16+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "�еправильний XML дл� �рхітектури Вигл�ду!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/vi.po b/addons/account_tax_include/i18n/vi.po
deleted file mode 100644
index 055c2581901..00000000000
--- a/addons/account_tax_include/i18n/vi.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
deleted file mode 100644
index b5ed33802ae..00000000000
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 16:34+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "价格规则"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "�票和�税价"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "�税"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "��税"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "�税价格计算代�"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "�计"
-
-#~ msgid ""
-#~ "Allow the user to work tax included prices.\n"
-#~ "Especially useful for b2c businesses.\n"
-#~ "    \n"
-#~ "This module implement the modification on the invoice form.\n"
-#~ msgstr ""
-#~ "�许用户使用�税价格\n"
-#~ "特别适用于B2C商务\n"
-#~ "\n"
-#~ "这模�使�票的格�生效\n"
diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po
deleted file mode 100644
index cc456963251..00000000000
--- a/addons/account_tax_include/i18n/zh_TW.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/test/account_tax_include.yml b/addons/account_tax_include/test/account_tax_include.yml
deleted file mode 100644
index a4b0f8531b9..00000000000
--- a/addons/account_tax_include/test/account_tax_include.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-
--
-  Creating a tax record
--
-  !record {model: account.tax, id: account_tax_a0}:
-    amount: 0.10000000000000001
-    applicable_type: 'true'
-    company_id: base.main_company
-    description: a
-    name: a
-    sequence: 1
-    type: percent
-    type_tax_use: all
-
--
-  Creating a account invoice record with tax excluded
--
-  !record {model: account.invoice, id: account_invoice_tax_exclude}:
-    account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
-    company_id: base.main_company
-    currency_id: base.EUR
-    invoice_line:
-      - account_id: account.a_sale
-        name: '[PC1] Basic PC'
-        price_unit: 100.0
-        quantity: 1.0
-        invoice_line_tax_id:
-          - account_tax_a0
-        product_id: product.product_product_pc1
-        uos_id: product.product_uom_unit
-    journal_id: account.sales_journal
-    partner_id: base.res_partner_desertic_hispafuentes
-    price_type: tax_excluded
-    reference_type: none
-
--
-  Performing an osv_memory action button_reset_taxes on module account.invoice
--
-  !python {model: account.invoice}: |
-    self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_exclude")], {"lang": "en_US", "tz": False,
-      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
-      "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
-      })
--
-  Check if tax is excluded in invoice
--
-  !assert {model: account.invoice, id: account_invoice_tax_exclude, severity: error, string: price type is tax excluded}:
-       - state == "draft"
-       - amount_untaxed == 100.0
-       - amount_tax == 10.0
-       - amount_total == 110.0
-
--
-  Creating a account invoice record with tax include
--
-  !record {model: account.invoice, id: account_invoice_tax_include}:
-    account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
-    company_id: base.main_company
-    currency_id: base.EUR
-    invoice_line:
-      - account_id: account.a_sale
-        name: '[PC1] Basic PC'
-        price_unit: 100.0
-        quantity: 1.0
-        invoice_line_tax_id:
-          - account_tax_a0
-        product_id: product.product_product_pc1
-        uos_id: product.product_uom_unit
-    journal_id: account.sales_journal
-    partner_id: base.res_partner_desertic_hispafuentes
-    price_type: tax_included
-    reference_type: none
-
--
-  Performing an osv_memory action button_reset_taxes on module account.invoice
--
-  !python {model: account.invoice}: |
-    self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_include")], {"lang": "en_US", "tz": False,
-      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
-      "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
-      })
--
-  Check if tax is included in invoice
--
-  !assert {model: account.invoice, id: account_invoice_tax_include, severity: error, string: price type is tax included}:
-       - state == "draft"
-       - amount_untaxed == 90.91
-       - amount_tax == 9.09
-       - amount_total == 100.00
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c048763ac5d..a59b36a2736 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -572,7 +572,6 @@ class account_voucher(osv.osv):
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
         currency_pool = self.pool.get('res.currency')
-        bank_st_line_obj = self.pool.get('account.bank.statement.line')
         tax_obj = self.pool.get('account.tax')
         for inv in self.browse(cr, uid, ids):
             if inv.move_id:
@@ -593,11 +592,6 @@ class account_voucher(osv.osv):
                 'period_id': inv.period_id and inv.period_id.id or False
             }
             move_id = move_pool.create(cr, uid, move)
-            line_bank_ids = bank_st_line_obj.search(cr, uid, [('voucher_id', '=', inv.id)], context=context)
-            if line_bank_ids:
-                bank_st_line_obj.write(cr, uid, line_bank_ids, {
-            'move_ids': [(4, move_id, False)]
-            })
 
             #create the first line manually
             company_currency = inv.journal_id.company_id.currency_id.id
@@ -867,13 +861,20 @@ class account_bank_statement(osv.osv):
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
         voucher_obj = self.pool.get('account.voucher')
         wf_service = netsvc.LocalService("workflow")
-        st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
+        bank_st_line_obj = self.pool.get('account.bank.statement.line')
+        st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
         if st_line.voucher_id:
             voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
             if st_line.voucher_id.state == 'cancel':
                 voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
             wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
-            return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
+
+            v = voucher_obj.browse(cr, uid, st_line.voucher_id.id, context=context)
+            bank_st_line_obj.write(cr, uid, [st_line_id], {
+                'move_ids': [(4, v.move_id.id, False)]
+            })
+
+            return self.pool.get('account.move.line').write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
 
 account_bank_statement()
@@ -915,4 +916,4 @@ class account_bank_statement_line(osv.osv):
         self.pool.get('account.voucher').unlink(cr, uid, unlink_ids, context=context)
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
-account_bank_statement_line()
\ No newline at end of file
+account_bank_statement_line()
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 3352c915898..257dfbd6150 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -32,9 +32,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_administration_form"/>
         </record>
-       <menuitem id="menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
-            groups="base.group_extended"/>
-       <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="menu_reporting"/>
+       <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
        <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
 
         <!-- User Connection -->
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 171cf523b8b..32399358f68 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -6,7 +6,7 @@
         <field name="name">Useability / Product UoS View</field>
     </record>
     <record id="group_product_manager" model="res.groups">
-        <field name="name">Product / Manager</field>
+        <field name="name">Product Manager</field>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 8664538f86f..bc86872110a 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -23,7 +23,7 @@
                     <field name="progress" widget="progressbar"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-				    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                 </tree>
@@ -36,25 +36,16 @@
             <field name="type">tree</field>
             <field eval="99" name="priority"/>
             <field name="arch" type="xml">
-                  <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Delegated Tasks">
-                    <field name="user_id"/>
+                  <tree colors="red:date_deadline&lt;current_date" string="My Delegated Tasks">
                     <field name="name"/>
                     <field name="project_id"/>
+                    <field name="delegated_user_id"/>
                     <field name="date_deadline"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
-                    <field name="type_id"/>
-                    <button name="next_type" invisible="context.get('set_visible',False)"
-                        states="draft,open,pending"
-                        string="Change Stage"
-                        type="object"
-                        icon="gtk-go-forward"
-                        groups="base.group_extended"
-                        help="Change Type"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-				    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                 </tree>
             </field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 8b8745fa45c..640df9017d8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -78,82 +78,30 @@ class project(osv.osv):
         pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
         return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
 
-    def _get_user_and_default_uom_ids(self, cr, uid):
-        users_obj = self.pool.get('res.users')
-        model_data_obj = self.pool.get('ir.model.data')
-        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
-        default_uom = user_uom = model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
-        obj_tm = users_obj.browse(cr, uid, uid).company_id.project_time_mode_id
-        if obj_tm:
-            user_uom = obj_tm.id
-        return user_uom, default_uom
-
     def _progress_rate(self, cr, uid, ids, names, arg, context=None):
-        def _get_all_child_projects(ids):
-            """Recursively get child project ids"""
-            child_ids = flatten([project_hierarchy.get(idn, []) for idn in ids])
-            if child_ids:
-                child_ids = _get_all_child_projects(child_ids)
-            return ids + child_ids
-        # END _get_all_child_projects
-
         res = {}.fromkeys(ids, 0.0)
         progress = {}
         if not ids:
             return res
-
-        par_child_projects = {}
-        all_projects = list(ids)
-
-        # get project hierarchy:
-        cr.execute('''SELECT prp.id AS pr_parent_id, prpc.id AS pr_child_id
-            FROM account_analytic_account AS p
-            JOIN account_analytic_account AS c ON p.id = c.parent_id
-            JOIN project_project AS prp ON prp.analytic_account_id = p.id
-            JOIN project_project AS prpc ON prpc.analytic_account_id = c.id''')
-
-        project_hierarchy = dict((k, list(set([v[1] for v in itr]))) for k, itr in groupby(cr.fetchall(), itemgetter(0)))
-
-        for id in ids:
-            child_projects = _get_all_child_projects([id])
-            par_child_projects[id] = child_projects
-            all_projects.extend(child_projects)
-
-        all_projects = dict.fromkeys(all_projects).keys()
         cr.execute('''SELECT
                 project_id, sum(planned_hours), sum(total_hours), sum(effective_hours)
             FROM
-                project_task
+                project_task 
             WHERE
-                project_id IN %s AND
+                project_id in %s AND
                 state<>'cancelled'
             GROUP BY
-                project_id''',(tuple(all_projects),))
-        progress = dict(map(lambda x: (x[0], (x[1] or 0.0, x[2] or 0.0, x[3] or 0.0)), cr.fetchall()))
+                project_id''',
+                   (tuple(ids),))
+        progress = dict(map(lambda x: (x[0], (x[1],x[2],x[3])), cr.fetchall()))
 
-        user_uom, def_uom = self._get_user_and_default_uom_ids(cr, uid)
-        for project in self.browse(cr, uid, par_child_projects.keys(), context=context):
-            s = [0.0, 0.0, 0.0]
-            tocompute = par_child_projects[project.id]
-            while tocompute:
-                p = tocompute.pop()
-                for i in range(3):
-                    s[i] += progress.get(p, (0.0, 0.0, 0.0))[i]
-
-            uom_obj = self.pool.get('product.uom')
-            if user_uom != def_uom:
-                s[0] = uom_obj._compute_qty(cr, uid, user_uom, s[0], def_uom)
-                s[1] = uom_obj._compute_qty(cr, uid, user_uom, s[1], def_uom)
-                s[2] = uom_obj._compute_qty(cr, uid, user_uom, s[2], def_uom)
-            if project.state == 'close':
-                progress_rate = 100.0
-            else:
-                progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
+        for project in self.browse(cr, uid, ids, context=context):
+            s = progress.get(project.id, (0.0,0.0,0.0))
             res[project.id] = {
                 'planned_hours': s[0],
                 'effective_hours': s[2],
                 'total_hours': s[1],
-                'progress_rate': progress_rate
+                'progress_rate': s[1] and (100.0 * s[2] / s[1]) or 0.0
             }
         return res
 
@@ -173,7 +121,6 @@ class project(osv.osv):
             if work.task_id and work.task_id.project_id: result[work.task_id.project_id.id] = True
         return result.keys()
 
-
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for proj in self.browse(cr, uid, ids):
             if proj.tasks:
@@ -227,11 +174,12 @@ class project(osv.osv):
         'sequence': 10,
     }
 
+    # TODO: Why not using a SQL contraints ?
     def _check_dates(self, cr, uid, ids):
-         leave = self.read(cr, uid, ids[0], ['date_start', 'date'])
-         if leave['date_start'] and leave['date']:
-             if leave['date_start'] > leave['date']:
-                 return False
+         for leave in self.read(cr, uid, ids, ['date_start', 'date']):
+             if leave['date_start'] and leave['date']:
+                 if leave['date_start'] > leave['date']:
+                     return False
          return True
 
     _constraints = [
@@ -387,23 +335,9 @@ class task(osv.osv):
         res = {}
         cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
         hours = dict(cr.fetchall())
-
-        uom_obj = self.pool.get('product.uom')
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-        if user_uom != default_uom:
-            for task in self.browse(cr, uid, ids, context=context):
-                if hours.get(task.id, False):
-                    dur_in_user_uom =  uom_obj._compute_qty(cr, uid, default_uom, hours.get(task.id, 0.0), user_uom)
-                    hours[task.id] = dur_in_user_uom
-        timespent=0
         for task in self.browse(cr, uid, ids, context=context):
-            res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
-#            res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
-
-            for ctimespent in task.work_ids:
-                timespent=timespent+ctimespent.hours
-            res[task.id]['delay_hours'] = task.planned_hours - timespent
-
+            res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': (task.remaining_hours or 0.0) + hours.get(task.id, 0.0)}
+            res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
@@ -483,23 +417,23 @@ class task(osv.osv):
         'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
         'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
         'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'user_id': fields.many2one('res.users', 'Assigned to'),
@@ -779,53 +713,6 @@ class project_work(osv.osv):
 
     _order = "date desc"
 
-    def create(self, cr, uid, vals, *args, **kwargs):
-        project_obj = self.pool.get('project.project')
-        uom_obj = self.pool.get('product.uom')
-        if vals.get('hours', False):
-            user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-            duration = vals['hours']
-            if user_uom != default_uom:
-                duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
-            cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
-        return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        project_obj = self.pool.get('project.project')
-        uom_obj = self.pool.get('product.uom')
-        if vals.get('hours', False):
-            old_hours = self.browse(cr, uid, ids, context=context)
-            user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-            duration = vals['hours']
-            for old in old_hours:
-                if vals.get('hours') != old.hours:
-                    # this code is only needed when we update the hours of the project
-                    # TODO: it may still a second calculation if the task.id is changed
-                    # at this task.
-                    if user_uom == default_uom:
-                        for work in self.browse(cr, uid, ids, context=context):
-                            cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
-                    else:
-                        for work in self.browse(cr, uid, ids, context=context):
-                            duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
-                            del_work =  uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
-                            cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
-        return super(project_work,self).write(cr, uid, ids, vals, context=context)
-
-    def unlink(self, cr, uid, ids, *args, **kwargs):
-        context = kwargs.get('context', {})
-        project_obj = self.pool.get('project.project')
-        uom_obj = self.pool.get('product.uom')
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-        if user_uom == default_uom:
-            for work in self.browse(cr, uid, ids, context):
-                cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
-        else:
-            for work in self.browse(cr, uid, ids, context):
-                duration =  uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
-                cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (duration, work.task_id.id))
-        return super(project_work, self).unlink(cr, uid, ids, *args, **kwargs)
-
 project_work()
 
 class account_analytic_account(osv.osv):
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 8d3752c0979..34ab831bbe2 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -42,7 +42,7 @@
         </record>
         <record id="res_users_finacial_manager" model="res.users">
             <field name="name">Fabian</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="login">fbs</field>
             <field name="password">fbs</field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f41018b886d..a69903c34d2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,10 +5,10 @@
         <menuitem
             icon="terp-project" id="base.menu_main_pm"
             name="Project" sequence="10"
-            groups="group_project_manager,group_project_user,group_project_finance_user"/>
+            groups="group_project_manager,group_project_user"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="group_project_finance_user"/>
+        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -304,16 +304,13 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','open'))" string="Tasks">
-                    <field name="id"/>
+                <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
-                    <field name="planned_hours"/>
-                    <field name="delay_hours"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
@@ -328,7 +325,7 @@
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                 </tree>
@@ -497,7 +494,7 @@
             <field name="help">Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="group_project_finance_user"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a00918bfcd8..53d97c02802 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -149,7 +149,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="group_project_finance_user"/>
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index f01d05b82ba..fb237e88769 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -21,11 +21,3 @@
 "access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
 "access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
 "access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
-"access_project_project_project_financial_user","project.project.project.financial.user","model_project_project","group_project_finance_user",1,0,0,0
-"access_project_task_project_financial_user","project.task.project.financial.user","model_project_task","group_project_finance_user",1,0,0,0
-"access_project_task_work_project_financial_user","project.task.work.project.financial.user","model_project_task_work","group_project_finance_user",1,0,0,0
-"access_report_project_task_user_project_financial_user","report.project.task.user.project.financial.user","model_report_project_task_user","group_project_finance_user",1,0,0,0
-"access_project_board_project_financial_user","board.board.project.financial.user","board.model_board_board","group_project_finance_user",1,0,0,0
-"access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0
-"access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0
-"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 97453dcb33b..e77b1f338d1 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -2,14 +2,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_project_finance" model="res.groups">
-        <field name="name">Project / Financial Manager</field>
-    </record>
-
-    <record id="group_project_finance_user" model="res.groups">
-        <field name="name">Project / Financial User</field>
-    </record>
-
     <record id="group_project_manager" model="res.groups">
         <field name="name">Project / Manager</field>
     </record>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 318cb365271..427bd7fd87e 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -31,7 +31,7 @@
         <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc.</field>
     </record>
 
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,project.group_project_finance_user"
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting"
                 parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 42a4790b745..0398fbfb0ee 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -5,5 +5,3 @@
 "access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
 "access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
 "access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
-"access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0
-"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index af99e9efe16..3894740f0f1 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="project.group_project_finance_user"/>
+        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index e2e34a0f5f5..5a8c4886d2f 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -177,7 +177,7 @@
         </record>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
-        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager,project.group_project_finance_user"/>
+        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
 
 
   </data>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index f52df8356a7..f5602f5ae4b 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -8,13 +8,6 @@
 "access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
 "access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
 "access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
-"access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0
-"access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
-"access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0
-"access_project_issue_report_financial_user","project.issue.report.financial.user","model_project_issue_report","project.group_project_finance_user",1,0,0,0
-"access_project_issue_board_project_financial_user","board.board.project.issue.financial.user","board.model_board_board","project.group_project_finance_user",1,0,0,0
-"access_project_issue_project_financial_user","project.issue.financial.user","model_project_issue","project.group_project_finance_user",1,0,0,0
-"access_mailgate_message_project_financial_user","mailgate.message.financial.user","mail_gateway.model_mailgate_message","project.group_project_finance_user",1,0,0,0
 "access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
 "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 15c23202cea..0e6c92c038b 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -3,11 +3,6 @@
 "access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
 "access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
 "access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
-"access_hr_analytic_timesheet_project_financial_user","account.analytic.line.timesheet.project.financial.user","account.model_account_analytic_line","project.group_project_finance_user",1,1,1,0
-"access_account_analytic_journal_project_financial_user","account.analytic.journal.project.financial.user","account.model_account_analytic_journal","project.group_project_finance_user",1,1,1,0
-"access_account_fiscalyear_project_financial_user","account.fiscalyear.project.financial.user","account.model_account_fiscalyear","project.group_project_finance_user",1,1,1,0
-"access_hr_timesheet_invoice_factor_project_financial_user","hr_timesheet_invoice.factor.project.financial.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_finance_user",1,1,1,0
-"access_account_invoice_project_financial_user","account.invoice.project.financial.user","account.model_account_invoice","project.group_project_finance_user",1,1,1,0
 "access_hr_analytic_timesheet_project_manager","account.analytic.line.timesheet.project.manager","account.model_account_analytic_line","project.group_project_manager",1,1,1,1
 "access_account_analytic_journal_project_manager","account.analytic.journal.project.manager","account.model_account_analytic_journal","project.group_project_manager",1,1,1,1
 "access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ac6f884f3a4..71e96543232 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -379,10 +379,10 @@
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended,project.group_project_finance_user"
+            groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 3d91ca956ce..3aaebb64294 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -6,9 +6,4 @@
 "access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
-"access_project_resource_allocation_financial_user","project.resource.allocation.financial.user","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0
-"access_project_phase_financial_user","project.phase.financial.user","model_project_phase","project.group_project_finance_user",1,0,0,0
-"access_resource_resource_financial_user","resource.resource.financial.user","model_resource_resource","project.group_project_finance_user",1,0,0,0
-"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0
-"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0
 "access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index e31ffd860cb..5756a7456bb 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
 "access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
-"access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0
 "access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index bd0b5c359b2..9abff817d17 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -219,7 +219,7 @@
             parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
 
         <!--
             Planning statistics
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index c42263370f3..d5cb64be83d 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -8,7 +8,4 @@
 "access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
 "access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_financial_user","report_account_analytic.planning.financial.user","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0
-"access_report_account_analytic_planning_stat_financial_user","report_account_analytic.planning.stat.financial.user","model_report_account_analytic_planning_stat","project.group_project_finance_user",1,0,0,0
 "access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 0a4746e185a..88e8c506e14 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -7,6 +7,3 @@
 "access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
 "access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
 "access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
-"access_project_scrum_backlog_financial_user","project_scrum.product.backlog.financial.user","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0
-"access_project_scrum_sprint_financial_user","project_scrum.sprint.financial.user","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0
-"access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c0dcd3a46bc..5ceaf83890e 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -37,6 +37,6 @@
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree"/>
         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                parent="base.menu_main_pm" sequence="5" groups="project.group_project_finance_user"/>
+                parent="base.menu_main_pm" sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 54e35956248..4888811df2f 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -2,5 +2,3 @@
 "access_report_timesheet_task_user_manager","report.timesheet.task.user.manager","model_report_timesheet_task_user","project.group_project_manager",1,1,1,1
 "access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
 "access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
-"access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0
-"access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0

From 47e7b2c78fbcd27230ff1969f75d5e3971670a52 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 23:30:29 +0200
Subject: [PATCH 285/294] [IMP] Access rights and __openerp__ cleaning

bzr revid: fp@tinyerp.com-20101017213029-79yh7xvz06ii8dgo
---
 addons/account_voucher/__openerp__.py           | 2 +-
 addons/base_synchro/__openerp__.py              | 2 +-
 addons/document_email/__openerp__.py            | 1 -
 addons/email_template/__openerp__.py            | 2 +-
 addons/fetchmail/__openerp__.py                 | 1 -
 addons/hr_payroll/__openerp__.py                | 2 +-
 addons/hr_payroll_account/__openerp__.py        | 2 +-
 addons/procurement/security/ir.model.access.csv | 4 +++-
 addons/project/project.py                       | 2 +-
 addons/project/project_view.xml                 | 6 ++----
 addons/project_gtd/project_gtd.py               | 9 +++++----
 addons/purchase/security/ir.model.access.csv    | 2 +-
 addons/sale/security/ir.model.access.csv        | 3 ++-
 addons/stock/stock_view.xml                     | 6 +++---
 14 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 683cca2442e..ce5cd607332 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Accounting Voucher Entries",
     "version" : "1.0",
-    "author" : 'OpenERP SA & Axelor',
+    "author" : 'OpenERP SA',
     "description": """Account Voucher module includes all the basic requirements of
     Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
     * Voucher Entry
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index bd285821e2b..3bb46827d68 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -22,7 +22,7 @@
 {
         "name":"Base Synchro",
         "version":"0.1",
-        "author":"Tiny",
+        "author":"OpenERP SA",
         "category":"Generic Modules/Base",
         "description": """Synchronization with all objects.""",
         "depends":["base"],
diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py
index 0348665ffa0..6f61ba62858 100644
--- a/addons/document_email/__openerp__.py
+++ b/addons/document_email/__openerp__.py
@@ -25,7 +25,6 @@
     "name" : "Email Integrated Document",
     "version" : "1.1",
     "depends" : ["base", "document", "fetchmail","mail_gateway"],
-    "author" : "Tiny",
     "description": """Email Integrated Document
     * Email based Document submission
     * user based document submission
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 9469104bd27..d5f5e9776d3 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Email Template for OpenERP",
     "version" : "0.7 RC",
-    "author" : "Sharoon Thomas, Openlabs",
+    "author" : "Openlabs",
     "website" : "http://openerp.com",
     "category" : "Added functionality",
     "depends" : ['marketing'],
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 94dbdf4ef5c..e9050fda075 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -33,7 +33,6 @@
     * Automatic Email Receive
     * Email based Records (Add, Update)
     """,
-    'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index c9339ce013c..65b593c5891 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -33,7 +33,7 @@
     * Monthly Payroll Register
     * Integrated with Holiday Management
     """,
-    'author':'OpenERP SA/Axelor',
+    'author':'OpenERP SA',
     'website':'http://www.openerp.com',
     'depends': [
         'hr',
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 97ae94a361c..d65570a1ad9 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -28,7 +28,7 @@
     * Payment Encoding
     * Company Contribution Management
     """,
-    'author':'OpenERP SA/Axelor',
+    'author':'OpenERP SA',
     'website':'http://www.openerp.com',
     'depends': [
         'hr_payroll',
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index 5bf81a079c6..382543c9df4 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
+"access_procurement_stock_manager","procurement.order stock.manager","model_procurement_order","stock.group_stock_manager",1,1,1,1
+"access_procurement_stock_user","procurement.order stock.user","model_procurement_order","stock.group_stock_user",1,1,1,1
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,1,1,1
 "access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
 "access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
 "access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
diff --git a/addons/project/project.py b/addons/project/project.py
index 640df9017d8..e60845764f7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -402,7 +402,7 @@ class task(osv.osv):
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
-        'type_id': fields.many2one('project.task.type', 'Type',),
+        'type_id': fields.many2one('project.task.type', 'Stage'),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a69903c34d2..8cf262237da 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -311,7 +311,7 @@
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
-                    <field name="date_deadline" invisible="context.get('set_visible',False)"/>
+                    <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
                         states="draft,open,pending"
@@ -388,11 +388,9 @@
                             icon="gtk-execute"
                             groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="type_id" widget="selection"/>
-                        <separator orientation="vertical"/>
                         <field name="project_id" select="1">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 092738d2cf6..bac2f621f37 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -29,7 +29,7 @@ class project_gtd_context(osv.osv):
     _name = "project.gtd.context"
     _description = "Context"
     _columns = {
-        'name': fields.char('Context', size=64, required=True, select=1),
+        'name': fields.char('Context', size=64, required=True, select=1, translate=1),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
     }
     _defaults = {
@@ -44,7 +44,7 @@ class project_gtd_timebox(osv.osv):
     _name = "project.gtd.timebox"
     _order = "sequence"
     _columns = {
-        'name': fields.char('Timebox', size=64, required=True, select=1),
+        'name': fields.char('Timebox', size=64, required=True, select=1, translate=1),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of timebox."),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
     }
@@ -104,9 +104,10 @@ class project_task(osv.osv):
         res = super(project_task,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         search_extended = False
         timebox_obj = self.pool.get('project.gtd.timebox')
-        if res['type'] == 'search':
+        access_pool = self.pool.get('ir.model.access')
+        if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
-            search_extended ='''<newline/><group col="%d" expand="1" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
+            search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
             search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" string="%s"/>''' % (_('GTD'),)
             search_extended += '''<separator orientation="vertical"/>'''
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 77a0aff7bb4..ef854f8f038 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -18,7 +18,7 @@
 "access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","group_purchase_manager",1,1,1,1
 "access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","group_purchase_manager",1,1,1,1
 "access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0
-"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,1,1,1
+"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
 "access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0
 "access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,1,1,1
 "access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 426d30b52fe..11718051d04 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,7 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,0,0,0
+"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
+"access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
 "access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
 "access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
 "access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0b2ecea565f..9a53b6d01d2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -93,6 +93,7 @@
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
                             <tree string="Products" editable="bottom">
+                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
                                 <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
@@ -100,21 +101,20 @@
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
-                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products ">
+                                <field domain="[('usage','=','internal')]" name="location_id"/>
+                                <newline/>
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
-                                <field  domain="[('usage','=','internal')]" name="location_id"/>
                                 <group colspan="2" col="4">
                                 <field name="prod_lot_id" groups="base.group_extended"/>
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                                         string="Split inventory lines" groups="base.group_extended"
                                         type="action" icon="terp-stock_effects-object-colorize"/>
                                 </group>
-                                
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">

From ed5019c38504f359c6e95013e71fe304411208a9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 00:08:23 +0200
Subject: [PATCH 286/294] [IMP] better views, hr timesheet and expenses

bzr revid: fp@tinyerp.com-20101017220823-cflmo1s0kcr02v4y
---
 addons/board/board_administration_view.xml | 68 +++++++++-------------
 addons/hr_expense/hr_expense.py            |  2 +-
 addons/hr_expense/hr_expense_view.xml      | 39 +++++++------
 addons/hr_timesheet/hr_timesheet.py        |  4 +-
 addons/hr_timesheet/hr_timesheet_view.xml  |  5 +-
 5 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 257dfbd6150..7c7c0da57cf 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -1,40 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <!-- Latest Activities -->
-        <record model="ir.actions.act_window" id="action_latest_activities_tree">
-            <field name="name">Latest Activities</field>
-            <field name="res_model">res.log</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="board_administration_form" model="ir.ui.view">
-            <field name="name">board.administration.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Administration Dashboard">
-                    <hpaned position="100">
-                        <child1>
-                            <action  name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/>
-                        </child1>
-                        <child2>
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-        <record id="open_board_administration_form" model="ir.actions.act_window">
-             <field name="name">Administration Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_administration_form"/>
-        </record>
-       <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
-       <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
-
         <!-- User Connection -->
         <record model="ir.ui.view" id="view_user_connection_tree">
             <field name="name">user.connection.tree</field>
@@ -55,17 +21,39 @@
             <field name="view_id" ref="view_user_connection_tree"></field>
         </record>
 
-        <record id="board_user_connection_form" model="ir.ui.view">
-            <field name="name">board.user.connection.form</field>
+        <!-- Latest Activities -->
+        <record model="ir.actions.act_window" id="action_latest_activities_tree">
+            <field name="name">Latest Activities</field>
+            <field name="res_model">res.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record id="board_administration_form" model="ir.ui.view">
+            <field name="name">board.administration.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="board_administration_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1/action[@string='Latest Activities']" position="after">
-                            <action  width="510" name="%(action_user_connection_tree)d" string="Latest Connections" />
-            	</xpath>
+                <form string="Administration Dashboard">
+                    <hpaned position="100">
+                        <child1>
+                            <action name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/>
+                            <action width="510" name="%(action_user_connection_tree)d" string="Latest Connections" />
+                        </child1>
+                        <child2>
+                        </child2>
+                    </hpaned>
+                </form>
             </field>
         </record>
+        <record id="open_board_administration_form" model="ir.actions.act_window">
+             <field name="name">Administration Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_administration_form"/>
+        </record>
+       <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
+       <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 0679fee37b1..143d27f2d9b 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -226,7 +226,7 @@ class hr_expense_line(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Short Description', size=128, required=True),
+        'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
         'total_amount': fields.function(_amount, method=True, string='Total'),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 3d92a76a3c3..9eb073ce52e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -16,7 +16,7 @@
                     <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
-                    <field name="total_amount"/>
+                    <field name="total_amount" sum="Total"/>
                 </tree>
             </field>
         </record>
@@ -68,10 +68,9 @@
                 <form string="Expenses Sheet">
                     <group colspan="4" col="6">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="ref" groups="base.group_extended"/>
-                        <field name="date" select="1"/>
-                        <field name="amount"/>
+                        <field name="date"/>
                         <field name="currency_id"/>
                         <field name="department_id" groups="base.group_extended"/>
                         <field name="company_id" groups="base.group_multi_company"/>
@@ -81,17 +80,23 @@
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
-                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
-                                    <field name="name" />
-                                    <field name="date_value" />
-                                    <field name="unit_quantity"/>
-                                    <field name="unit_amount"/>
-                                    <field name="ref"/>
-                                    <field name="sequence" groups="base.group_extended"/>
-                                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
-                                    <newline/>
-                                    <field name="total_amount"/>
+                                    <group col="6" colspan="4">
+                                        <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
+                                        <field name="name" colspan="4"/>
+                                        <newline/>
+                                        <field name="unit_amount"/>
+                                        <field name="unit_quantity"/>
+                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
+                                    </group>
+                                    <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
+                                        <separator string="Customer Project" colspan="2"/>
+                                        <field domain="[('type','=','normal')]" name="analytic_account"/>
+                                    </group>
+                                    <group colspan="2" col="2">
+                                        <separator string="References" colspan="2"/>
+                                        <field name="date_value" />
+                                        <field name="ref"/>
+                                    </group>
                                 </form>
                             </field>
                             <field name="state"/>
@@ -99,8 +104,8 @@
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
+                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward"/>
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward"/>
                             </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 84e7db409ab..3d2ca5388d3 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -87,7 +87,9 @@ class hr_analytic_timesheet(osv.osv):
         if prod_id and unit_amount:
             # find company
             company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
-            res.update(self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, journal_id, context=context))
+            r = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, journal_id, context=context)
+            if r:
+                res.update(r)
         # update unit of measurement
         if prod_id:
             uom = self.pool.get('product.product').browse(cr, uid, prod_id, context=context)
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 689e3c31261..98c4413ade1 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -69,9 +69,8 @@
                         <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
-                        <field name="account_id" select="1" widget="selection"/>
-                        <field name="product_id" select="1"/>
-                        <field name="date" select="1"/>
+                        <field name="account_id"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">

From 130f43b1d97493ce1e87e8d500a4af9889128654 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 00:27:08 +0200
Subject: [PATCH 287/294] [FIX] misc fixes from xrg

bzr revid: fp@tinyerp.com-20101017222708-71xbvzflx6pe797v
---
 addons/hr_attendance/report/attendance_by_month.py       | 6 ++++--
 addons/hr_attendance/report/timesheet.py                 | 5 ++++-
 addons/hr_evaluation/hr_evaluation.py                    | 4 ++--
 addons/hr_holidays/hr_holidays.py                        | 3 +--
 addons/hr_payroll/report/rml_parse.py                    | 4 ++--
 addons/hr_payroll_account/hr_payroll_account.py          | 7 +++----
 addons/hr_recruitment/wizard/hr_recruitment_phonecall.py | 2 ++
 addons/process/process.py                                | 6 +-----
 addons/wiki/web/widgets/wikimarkup/__init__.py           | 7 ++++---
 9 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index da761f3bb0c..c8d0378b971 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -80,11 +80,13 @@ class report_custom(report_rml):
                     if attendences and attendences[-1]['action'] == 'sign_in':
                         attendences.append({'name': tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
                     # sum up the attendances' durations
+                    ldt = None
                     for att in attendences:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
-                        if att['action'] == 'sign_out':
+                        if ldt and att['action'] == 'sign_out':
                             wh += (dt - ldt).seconds/60/60
-                        ldt = dt
+                        else:
+                            ldt = dt
                     # Week xml representation
 #                    wh = hour2str(wh)
                     today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, round(wh,2))
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index abedddd50c5..ff759fb3eaf 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -79,10 +79,13 @@ class report_custom(report_rml):
                     if attendances and attendances[-1]['action'] == 'sign_in':
                         attendances.append({'name': n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_out'})
                     # sum up the attendances' durations
+                    ldt = None
                     for att in attendances:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
-                        if att['action'] == 'sign_out':
+                        if ldt and att['action'] == 'sign_out':
                             week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
+                        else:
+                            ldt = dt
 
                 # Week xml representation
                 week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 97f00d8b861..20bd8a0b327 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -235,12 +235,12 @@ class hr_evaluation(osv.osv):
                         hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [int_id], context=context)
 
                     if (not wait) and phase.mail_feature:
-                        body = phase.mail_body % {'employee_name': child.name, 'user_signature': user.signature,
+                        body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
                             'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
                         sub = phase.email_subject
                         dest = [child.work_email]
                         if dest:
-                           tools.email_send(src, dest, sub, body)
+                           tools.email_send(evaluation.employee_id.work_email, dest, sub, body)
 
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index eca3c02f301..79710a569fb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -240,8 +240,7 @@ class hr_holidays(osv.osv):
                 if record.case_id:
                     self.pool.get('crm.meeting').unlink(cr, uid, [record.case_id.id])
                 if record.linked_request_ids:
-                    list_ids = []
-                    [list_ids.append(i) for id in record.linked_request_ids]
+                    list_ids = [ lr.id for lr in record.linked_request_ids]
                     self.holidays_cancel(cr, uid, list_ids)
                     self.unlink(cr, uid, list_ids)
 
diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
index 7abb29711b6..0eb783de39f 100755
--- a/addons/hr_payroll/report/rml_parse.py
+++ b/addons/hr_payroll/report/rml_parse.py
@@ -68,7 +68,7 @@ class rml_parse(report_sxw.rml_parse):
     def _get_and_change_date_format_for_swiss (self,date_to_format):
         date_formatted=''
         if date_to_format:
-            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+            date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
         return date_formatted
 
     def _explode_name(self,chaine,length):
@@ -107,7 +107,7 @@ class rml_parse(report_sxw.rml_parse):
         return Stringer
 
     def explode_this(self,chaine,length):
-        chaine = rstrip(chaine)
+        chaine = chaine.rstrip()
         ast = list(chaine)
         i = length
         while i <= len(ast):
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index dcef94c3f35..d9f963ed537 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -28,8 +28,6 @@ from osv import fields, osv
 from tools import config
 from tools.translate import _
 
-
-
 def prev_bounds(cdate=False):
     when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
     this_first = date(when.year, when.month, 1)
@@ -572,8 +570,9 @@ class hr_payslip(osv.osv):
 
                 line_ids += [movel_pool.create(cr, uid, rec, context=context)]
 
-                for contrub in line.category_id.contribute_ids:
-                    print contrib.name, contrub.code, contrub.amount_type, contrib.contribute_per, line.total
+                # if self._debug:
+                #    for contrib in line.category_id.contribute_ids:
+                #       _log.debug("%s %s %s %s %s",  contrib.name, contrub.code, contrub.amount_type, contrib.contribute_per, line.total)
 
             adj_move_id = False
             if total_deduct > 0:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 7cb5366a275..6e817eaf49a 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -42,8 +42,10 @@ class job2phonecall(osv.osv_memory):
         return case.user_id and case.user_id.id or False
 
     def _date_category(self, cr, uid, context=None):
+        case_obj = self.pool.get('hr.applicant')
         if context is None:
             context = {}
+        case = case_obj.browse(cr, uid, context['active_id'], context=context)
         categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')], context=context)
         return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
 
diff --git a/addons/process/process.py b/addons/process/process.py
index 479b8748ff3..544ff73e761 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -30,16 +30,12 @@ class Env(dict):
         self.__usr = user
 
     def __getitem__(self, name):
-
         if name in ('__obj', '__user'):
-            return super(ExprContext, self).__getitem__(name)
-
+            return super(Env, self).__getitem__(name)
         if name == 'user':
             return self.__user
-
         if name == 'object':
             return self.__obj
-
         return self.__obj[name]
 
 class process_process(osv.osv):
diff --git a/addons/wiki/web/widgets/wikimarkup/__init__.py b/addons/wiki/web/widgets/wikimarkup/__init__.py
index 91fec4bc4fd..5eceea0e86d 100644
--- a/addons/wiki/web/widgets/wikimarkup/__init__.py
+++ b/addons/wiki/web/widgets/wikimarkup/__init__.py
@@ -455,7 +455,6 @@ class BaseParser(object):
 		if hasattr(self, 'count'):
 			data = self.env[namespace]
 			test = key in data
-			ls
 			self.count = True
 		return key in self.env[namespace]
 
@@ -1114,7 +1113,7 @@ class BaseParser(object):
 					trail = url[i:] + trail
 					url = url[0:i]
 
-				url = cleanURL(url)
+				url = self.cleanURL(url)
 
 				sb.append(u'<a href="')
 				sb.append(url)
@@ -1978,7 +1977,9 @@ class Parser(BaseParser):
 			if toclevel < wgMaxTocLevel:
 				toc.append(u"</li>\n")
 				toc.append(u"</ul>\n</li>\n" * max(0, toclevel - 1))
-			toc.insert(0, u'<div id="toc"><h2>' + _('Table of Contents') + '</h2>')
+			#TODO: use gettext
+			#toc.insert(0, u'<div id="toc"><h2>' + _('Table of Contents') + '</h2>')
+			toc.insert(0, u'<div id="toc"><h2>Table of Contents</h2>')
 			toc.append(u'</ul>\n</div>')
 
 		# split up and insert constructed headlines

From c6b0b3f058d2ae2345e201d93f4b709b892f8366 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 00:28:29 +0200
Subject: [PATCH 288/294] fix

bzr revid: fp@tinyerp.com-20101017222829-or5hns50jy0d5og6
---
 addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index af2c5afd35c..d520283bd2d 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -43,7 +43,7 @@ def execute(connector, method, *args):
         if e.args[0] == 111:
             if wait_count > wait_limit:
                 print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds."%(wait_limit)
-                clean()
+                # clean() Commented...
                 sys.exit(1)
             print 'Please wait %d sec to start server....'%(waittime)
             wait_count += 1

From 47f3768d1de484b5f6dedf65777cfcf645c9d82a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 00:45:35 +0200
Subject: [PATCH 289/294] fix

bzr revid: fp@tinyerp.com-20101017224535-pzqi1pq7uw0jd6zq
---
 addons/hr_timesheet/hr_timesheet.py           |  5 ++---
 addons/project_timesheet/project_timesheet.py | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 3d2ca5388d3..20d97634214 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -23,7 +23,6 @@ import time
 
 from osv import fields
 from osv import osv
-from osv.orm import except_orm
 from tools.translate import _
 
 class hr_employee(osv.osv):
@@ -39,7 +38,7 @@ class hr_employee(osv.osv):
         try:
             result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
             return result[1]
-        except ValueError, e:
+        except ValueError:
             pass
         return False
 
@@ -48,7 +47,7 @@ class hr_employee(osv.osv):
         try:
             result = md.get_object_reference(cr, uid, 'hr_timesheet', 'product_consultant')
             return result[1]
-        except ValueError, e:
+        except ValueError:
             pass
         return False
 
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 8d846f919e7..601fbfa578b 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -80,10 +80,7 @@ class project_work(osv.osv):
         
         vals_line = {}
         context = kwargs.get('context', {})
-        #TOFIX: after loading project_timesheet module, it's fail yml of other project* modules. 
-        #Temporary: pass context['withoutemployee'] = True in all yml.
-        if 'withoutemployee' in context and context['withoutemployee']:
-            return super(project_work,self).create(cr, uid, vals, context=context)
+
         obj_task = task_obj.browse(cr, uid, vals['task_id'])
         result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
         vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
@@ -93,7 +90,8 @@ class project_work(osv.osv):
         
         #calculate quantity based on employee's product's uom 
         vals_line['unit_amount'] = vals['hours']
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+
+        default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
         if result['product_uom_id'] != default_uom:
             vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
         acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
@@ -150,7 +148,7 @@ class project_work(osv.osv):
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:
-                user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+                default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
                 vals_line['unit_amount'] = vals['hours']
                 prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
 

From c5af93014cb167eb948fb8d31791e0b21a6dc847 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 00:58:20 +0200
Subject: [PATCH 290/294] [FIX] fixinf test according to modification in the
 invoicing wizard

bzr revid: fp@tinyerp.com-20101017225820-sp2r52bslfnpcf6o
---
 addons/stock_invoice_directly/test/stock_invoice_directly.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index 6a7e99276b9..4a0708b84d9 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -65,7 +65,6 @@
   !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
     invoice_date: '2010-08-04'
     journal_id: account.bank_journal
-    type: out_invoice
 - 
   I create a Customer invoice for my outgoing picking order.
 - 
@@ -82,4 +81,4 @@
     partner = picking[0].address_id.partner_id.id
     inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner)])
     assert inv_ids, 'No Invoice is generated!'
-    
\ No newline at end of file
+    

From 498600b991b4a6d76f78b63130366ca3d3b681e6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 01:08:02 +0200
Subject: [PATCH 291/294] modifs

bzr revid: fp@tinyerp.com-20101017230802-zrp0ex20kd6jkjxi
---
 addons/lunch/report/order.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 7a6dca6c260..172bff69308 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -78,7 +78,7 @@
           <para style="terp_default_8">[[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.title and o.address_id.partner_id.title.name) or '' ]] [[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.name) or '' ]]</para>
           <para style="terp_default_8">[[ (o.address_id and o.address_id.street) or '' ]]</para>
           <para style="terp_default_8">[[ (o.address_id and o.address_id.street2) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.zip) or '' ]] [[ (o.address_id and o.user_id.address_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_id and o.address_id.zip) or '' ]] [[ (o.address_id and o.address_id.city) or '' ]]</para>
           <para style="terp_default_8">[[ (o.address_id and o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para')]]</para>
           <para style="terp_default_8">[[ (o.address_id and o.address_id.country_id and o.address_id.country_id.name) or '' ]]</para>
         </td>
@@ -145,4 +145,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From 2030147fe0c4feb555b2effee575054c179f4c03 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 01:12:35 +0200
Subject: [PATCH 292/294] [IMP] Lunch order report

bzr revid: fp@tinyerp.com-20101017231235-hc267qajekaltyob
---
 addons/lunch/report/order.rml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 172bff69308..d47816abd9c 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -66,7 +66,6 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para>
     <blockTable colWidths="293.0,235.0" style="Table1">
       <tr>
         <td>
@@ -75,16 +74,19 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.title and o.address_id.partner_id.title.name) or '' ]] [[ (o.address_id and o.address_id.partner_id and o.address_id.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.street) or '' ]]</para>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.street2) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.zip) or '' ]] [[ (o.address_id and o.address_id.city) or '' ]]</para>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para')]]</para>
-          <para style="terp_default_8">[[ (o.address_id and o.address_id.country_id and o.address_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.title and user.address_id.partner_id.title.name) or '' ]] [[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (user.address_id and user.address_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (user.address_id and user.address_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (user.address_id and user.address_id.zip) or '' ]] [[ (user.address_id and user.address_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (user.address_id and user.address_id.state_id and user.address_id.state_id.name) or removeParentNode('para')]]</para>
+          <para style="terp_default_8">[[ (user.address_id and user.address_id.country_id and user.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_header">Lunch Order</para>
+
+	<section>
+    <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para>
     <blockTable colWidths="80.0,70.0,141.0,172.0,65.0" style="Table2">
       <tr>
         <td>
@@ -144,5 +146,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+	</section>
   </story>
 </document>

From 2d71f013e7d971d03a4d0f23c3e7289e9b07e5a9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 01:33:01 +0200
Subject: [PATCH 293/294] fix

bzr revid: fp@tinyerp.com-20101017233301-yyao1l9b1jnyq3kz
---
 addons/project/company.py            |  8 --------
 addons/project/project.py            | 18 ++++++++++++++++++
 addons/project/project_demo.xml      | 13 ++++++-------
 addons/project/test/test_project.yml | 16 +++++-----------
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/addons/project/company.py b/addons/project/company.py
index 18f970118a4..0967d130737 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -31,13 +31,5 @@ class res_company(osv.osv):
 "forget to setup the right unit of measure in your employees.",
         ),
     }
-    
-    def write(self, cr, uid, ids,vals, context={}):
-        task_ids=self.pool.get('project.task').search(cr, uid, [('state','in',['open', 'pending'])])
-        if ('project_time_mode_id' in vals) and task_ids:
-            raise osv.except_osv(_('Error !'), _('You cannot modify Project Time Unit as there are open or pending tasks created with current time unit.'))
-        return super(res_company,self).write(cr, uid, ids, vals, context=context)
-
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project.py b/addons/project/project.py
index e60845764f7..254d447b618 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -712,7 +712,25 @@ class project_work(osv.osv):
     }
 
     _order = "date desc"
+    def create(self, cr, uid, vals, *args, **kwargs):
+        if 'hours' in vals and (not vals['hours']):
+            vals['hours'] = 0.00
+        if 'task_id' in vals:
+            cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (vals.get('hours',0.0), vals['task_id']))
+        return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
+    def write(self, cr, uid, ids,vals,context={}):
+        if 'hours' in vals and (not vals['hours']):
+            vals['hours'] = 0.00
+        if 'hours' in vals:
+            for work in self.browse(cr, uid, ids, context):
+                cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (vals.get('hours',0.0), work.hours, work.task_id.id))
+        return super(project_work,self).write(cr, uid, ids, vals, context)
+
+    def unlink(self, cr, uid, ids, *args, **kwargs):
+        for work in self.browse(cr, uid, ids):
+            cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
+        return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
 project_work()
 
 class account_analytic_account(osv.osv):
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 34ab831bbe2..0c1c386a700 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -271,7 +271,7 @@
         <record id="project_task_116" model="project.task">
             <field name="planned_hours">38.0</field>
             <field name="remaining_hours">38.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="description">BoM, After sales returns, interventions. Traceability.</field>
@@ -280,7 +280,7 @@
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Data importation + Doc</field>
@@ -288,7 +288,7 @@
         <record id="project_task_131" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Modifications asked by the customer.</field>
@@ -296,7 +296,7 @@
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
@@ -306,7 +306,7 @@
             <field name="sequence">15</field>
             <field name="planned_hours">8.0</field>
             <field name="remaining_hours">8.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
@@ -315,7 +315,7 @@
             <field name="sequence">17</field>
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">2</field>
             <field name="state">open</field>
@@ -357,7 +357,6 @@
             <field name="project_id" ref="project_project_21"/>
             <field name="name">MRP; functional layer</field>
             <field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d 12:12')" name="date_close"/>
         </record>
         <record id="project_task_194" model="project.task">
             <field name="sequence">30</field>
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index bc65ab67f77..8cf8e0afb19 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -65,10 +65,6 @@
 - 
   !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
        - state == "open"
-       
-       
-
-      
 -
   Test for different project-states    
 - 
@@ -109,8 +105,6 @@
 - 
   !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
        - state == "open"
-
-
 -
   Test for task work allocation
 -
@@ -140,7 +134,7 @@
 - 
   Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
 - 
-  !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+  !record {model: project.task, id: project_task_technicaltraining0}:
     work_ids:
       - date: '2010-05-31 15:04:22'
         hours: 10.0
@@ -155,7 +149,7 @@
 - 
   Make a work task entry 'Training on OpenERP xml views' of 10 hours
 - 
-  !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+  !record {model: project.task, id: project_task_technicaltraining0}:
     work_ids:
       - date: '2010-06-01 15:04:46'
         hours: 10.0
@@ -170,7 +164,7 @@
 - 
   Make a work task entry 'Training on workflows' of 10 hours        
 - 
-  !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+  !record {model: project.task, id: project_task_technicaltraining0}:
     work_ids:
       - date: '2010-06-02 15:05:24'
         hours: 10.0
@@ -206,7 +200,7 @@
 - 
   Make a work task entry 'Training on reports and wizards' of 10 hours
 - 
-  !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+  !record {model: project.task, id: project_task_technicaltraining0}:
     work_ids:
       - date: '2010-05-31 15:08:40'
         hours: 10.0
@@ -257,7 +251,7 @@
 - 
   Make a work task entry 'Training on yml' of 5 hours
 - 
-  !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+  !record {model: project.task, id: project_task_technicaltraining0}:
     work_ids:
       - date: '2010-05-31 16:55:27'
         hours: 5.0

From f801922db4179e1f75e220ea95759b582be61073 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Oct 2010 01:37:59 +0200
Subject: [PATCH 294/294] [IMP] removed base.user_admin -> base.user_root

bzr revid: fp@tinyerp.com-20101017233759-xzdcmfg0e9ceiow0
---
 .../security/account_security.xml             |  2 +-
 addons/document/document_data.xml             | 20 +++++++++----------
 addons/lunch/lunch_demo.xml                   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 4aceb12d266..0d6006fd9b0 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="base.user_admin" model="res.users">
+        <record id="base.user_root" model="res.users">
             <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index f13213034e8..ef829b6e258 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -11,12 +11,12 @@
     <record model="document.storage" id="storage_default">
         <field name="name">Database storage</field>
         <field name="type">db</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record model="document.directory" id="dir_root">
         <field name="name">Documents</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
     </record>
@@ -24,7 +24,7 @@
     <record model="document.directory" id="dir_my_folder">
         <field name="name">My Folder</field>
         <field name="parent_id" ref="dir_root"/>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="ressource_id">0</field>
  
     </record>
@@ -37,7 +37,7 @@
         <field name="ressource_id">0</field>
 
         <field name="ressource_type_id" search="[('model','=','res.partner.category')]" />
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record model="document.directory" id="dir_partner">
@@ -46,7 +46,7 @@
         <field name="domain">[('category_id','in',[active_id])]</field>
         <field name="ressource_type_id" search="[('model','=','res.partner')]" />
         <field name="ressource_parent_type_id" search="[('model','=','res.partner.category')]" />
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="ressource_id">0</field>
 
     </record>
@@ -62,7 +62,7 @@
 
     <record model="document.directory" id="dir_product">
         <field name="name">Products</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
@@ -70,7 +70,7 @@
 
     <record model="document.directory" id="dir_sale_order">
         <field name="name">Sales Order</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
@@ -78,7 +78,7 @@
 
     <record model="document.directory" id="dir_sale_order_all">
         <field name="name">All Sales Order</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_sale_order"/>
         <field name="ressource_id">0</field>
 
@@ -86,7 +86,7 @@
 
     <record model="document.directory" id="dir_sale_order_quote">
         <field name="name">Quotations</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_sale_order"/>
         <field name="ressource_id">0</field>
 
@@ -94,7 +94,7 @@
 
     <record model="document.directory" id="dir_project">
         <field name="name">Projects</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 91be819d430..30172b9e0a2 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -14,7 +14,7 @@
 
         <record model="lunch.cashbox" id="cashbox_cashbox">
             <field name="name">Cashbox</field>
-            <field name="manager" ref="base.user_admin"/>
+            <field name="manager" ref="base.user_root"/>
         </record>
     </data>
 </openerp>