From bb118fae427b05ab8c935d756aee5dafa14dec1b Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 6 Jul 2012 19:36:16 +0530
Subject: [PATCH 001/118] [IMP]hr_holidays : view are improved

bzr revid: hsa@tinyerp.com-20120706140616-nylt94v652w9k2eg
---
 addons/hr_holidays/hr_holidays.py       |  3 +-
 addons/hr_holidays/hr_holidays_view.xml | 70 ++++++++++---------------
 2 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a1ab0ae04f3..84bdab4ad99 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -111,7 +111,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Description', required=True, size=64),
+        'name': fields.text('Description'),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -125,7 +125,6 @@ class hr_holidays(osv.osv):
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'case_id': fields.many2one('crm.meeting', 'Meeting'),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1237cdb14f4..287ec8c83e6 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -112,39 +112,32 @@
                 <sheet string="Leave Request">
                     <group>
                         <group>
-                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                                <label for="number_of_days_temp" string="Duration"/>
+                                <group col="3">
+                                    <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
+                                    <label string="-"/>
+                                    <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
+                                    <div><field name="number_of_days_temp" nolabel="1" class="oe_inline"/> <label string="days" class="oe_inline"/></div>
+                                </group>
+                        </group>
+                        <group>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
+                    </group>
+                    <group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <label for="number_of_days_temp" string="Duration"/>
-                            <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
-                                <div>
-                                    <field name="number_of_days_temp" class="oe_inline"/> days
-                                </div>
-                            </div>
+                            <field name="double_validation" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group>
-                                <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
-                                    <field name="double_validation" invisible="1"/>
-                                </group>
-                                <group>
-                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    <newline/>
+                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -171,27 +164,21 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="name"/>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="number_of_days_temp"/>
+                        </group>
+                        <group>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
                             <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>
-                        <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="number_of_days_temp"/>
-                        </group>
                     </group>
-                    <notebook>
-                        <page string="General">
-                            <group col="4">
-                                <field name="double_validation" invisible="1"/>
-                                <field name="manager_id"/>
-                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                            </group>
-                            <field name="notes" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    <group>
+                        <field name="double_validation" invisible="1"/>
+                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                    </group>
+                    <field name="name"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -237,7 +224,6 @@
                         <field name="state"/>
                     </header>
                     <group col="4">
-                        <field name="name"/>
                         <field name="holiday_status_id"/>
                         <field name="type"/>
                         <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
@@ -245,7 +231,7 @@
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>
-                    <field name="notes"/>
+                    <field name="name"/>
                 </form>
             </field>
         </record>

From 1fdba1d67b3e7b0e1c04656c56615a496ae3825c Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 9 Jul 2012 10:30:40 +0530
Subject: [PATCH 002/118] [IMP]hr_holidays-view

bzr revid: pna@tinyerp.com-20120709050040-z6stbyyudbh341vy
---
 addons/hr_holidays/hr_holidays_demo.xml     |  5 +---
 addons/hr_holidays/hr_holidays_view.xml     | 27 +++++++++------------
 addons/hr_holidays/hr_holidays_workflow.xml |  2 +-
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 6ad5a442a38..fb89fc98185 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
       <field name="name">Trip with Family</field>
-      <field name="holiday_status_id" ref="holiday_status_cl"/>
+      <field name="holiday_status_id" ref="holiday_status_sl"/>
       <field eval="time.strftime('%Y-%m-01')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
@@ -52,13 +52,10 @@
       <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
   </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1237cdb14f4..4d23159be0a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -102,7 +102,6 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
@@ -111,30 +110,29 @@
                 </header>
                 <sheet string="Leave Request">
                     <group>
-                        <group>
-                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                        </group>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                <group col="3">
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline" /> 
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
                                 </div>
                             </div>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
+                        </group>
+                        <group>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
+                    <group colspan="4">
                             <group>
                                 <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
                                     <field name="double_validation" invisible="1"/>
                                 </group>
                                 <group>
@@ -143,8 +141,7 @@
                             </group>
                             <newline/>
                             <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    </group>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 7013d62a5ed..48f871618c3 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -53,7 +53,7 @@
     <record model="workflow.transition" id="t1">
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
-        <field name="signal">confirm</field>
+        <field name="signal"></field>
     </record>
 
     <record model="workflow.transition" id="t2">

From 34869c7348f30436f6312728c3e453eefc850f06 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 9 Jul 2012 11:18:43 +0530
Subject: [PATCH 003/118] [IMP]hr_holidays : view are improved and notes field
 removed

bzr revid: hsa@tinyerp.com-20120709054843-2k8p5jkkejl8rgbs
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 84bdab4ad99..35686ffa021 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -274,7 +274,7 @@ class hr_holidays(osv.osv):
                     'name': record.name,
                     'categ_id': record.holiday_status_id.categ_id.id,
                     'duration': record.number_of_days_temp * 8,
-                    'description': record.notes,
+                    'description': record.name,
                     'user_id': record.user_id.id,
                     'date': record.date_from,
                     'end_date': record.date_to,
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 287ec8c83e6..453e76fc4bb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -118,7 +118,10 @@
                                     <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
                                     <label string="-"/>
                                     <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" nolabel="1" class="oe_online"/>
-                                    <div><field name="number_of_days_temp" nolabel="1" class="oe_inline"/> <label string="days" class="oe_inline"/></div>
+                                    <div>
+                                        <field name="number_of_days_temp" nolabel="1" class="oe_inline"/> 
+                                        <label string="days" class="oe_inline"/>
+                                    </div>
                                 </group>
                         </group>
                         <group>

From fb377c440e245bb7c06325c8ffb3cfdedf4dd72d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 9 Jul 2012 15:53:03 +0530
Subject: [PATCH 004/118] [IMP] add placeholder and lit demo file changes

bzr revid: dbr@tinyerp.com-20120709102303-38nb5yg46f5q61wd
---
 addons/hr_holidays/hr_holidays_demo.xml | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index fb89fc98185..4c9d18683c7 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
       <field name="name">Trip with Family</field>
-      <field name="holiday_status_id" ref="holiday_status_sl"/>
+      <field name="holiday_status_id" ref="holiday_status_comp"/>
       <field eval="time.strftime('%Y-%m-01')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 01500d2fb63..9a6784bc8bc 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -140,7 +140,7 @@
                                 </group>
                             </group>
                             <newline/>
-                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" placeholder="Add a reason..."/>
                     </group>
                 </sheet>
                 <footer>
@@ -182,7 +182,7 @@
                         <field name="double_validation" invisible="1"/>
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                     </group>
-                    <field name="name"/>
+                    <field name="name" placeholder="Add a reason..."/>
                 </sheet>
                 <footer>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -235,7 +235,7 @@
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>
-                    <field name="name"/>
+                    <field name="name" placeholder="Add a reason..."/>
                 </form>
             </field>
         </record>

From 5beaabfe3bad6e56d5a9140bdae900f60cb00db6 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Jul 2012 10:36:39 +0530
Subject: [PATCH 005/118] [IMP]Improve on_change name

bzr revid: dbr@tinyerp.com-20120710050639-3f1mky0yfqgwowfm
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9a6784bc8bc..a3bf5f23b86 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -111,7 +111,7 @@
                 <sheet string="Leave Request">
                     <group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <group col="3">

From 5c84adc958e270d94adf3fb849099a639d9a37d7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Jul 2012 18:16:51 +0530
Subject: [PATCH 006/118] [IMP]hr_holiday: set name required for history remove
 submit to manager button from allocation view Improve onchange name

bzr revid: dbr@tinyerp.com-20120710124651-m9qrg23ci4gzp8nz
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a7456d1ceb4..1c4be1d732c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -112,7 +112,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.text('Description',states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'name': fields.text('Description', required=True,states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index a3bf5f23b86..f1025fa4637 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -158,7 +158,6 @@
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
@@ -168,7 +167,7 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>
                         <group>

From 5c55b2918c67ca387cadbc172bcdf948ab7efece Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Jul 2012 19:01:27 +0530
Subject: [PATCH 007/118] [IMP]hr_holiday: Set ir_rules for employee

bzr revid: dbr@tinyerp.com-20120710133127-xfjlf1qpj1pol2dx
---
 addons/hr_holidays/security/ir_rule.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 8e8c97bf7ea..fab12354bf4 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
-
+    <record id="property_rule_holidays_employee" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
   </data>
 </openerp>

From 65e6027d63700c49dd49c60d62b41b55849f96e8 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 11 Jul 2012 11:00:16 +0530
Subject: [PATCH 008/118] [ADD] module base gengo

bzr revid: jam@tinyerp.com-20120711053016-7i20l7l94f56sn9t
---
 addons/base_gengo/__init__.py    | 22 ++++++++++++++++++
 addons/base_gengo/__openerp__.py | 40 ++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 addons/base_gengo/__init__.py
 create mode 100644 addons/base_gengo/__openerp__.py

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
new file mode 100644
index 00000000000..6825dc22f47
--- /dev/null
+++ b/addons/base_gengo/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Openerp sa (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
new file mode 100644
index 00000000000..43a6e258418
--- /dev/null
+++ b/addons/base_gengo/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- 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': 'Automated Translations through Gengo API',
+    'version': '0.1',
+    'category': 'Tools',
+    'description': """
+Automated Translations through Gengo API
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'test': [],
+    'installable': True,
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ce21285d02b74e45e10db187c45cfb2daddabadf Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 11 Jul 2012 15:03:13 +0530
Subject: [PATCH 009/118] [IMP]hr_holiday: Remove extra messages and methods

bzr revid: dbr@tinyerp.com-20120711093313-a1bo5nfgxzt9bmr0
---
 addons/hr_holidays/hr_holidays.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 1c4be1d732c..223b697d5bc 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -153,7 +153,6 @@ class hr_holidays(osv.osv):
     
     def create(self, cr, uid, vals, context=None):
         obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
-        self.create_notificate(cr, uid, [obj_id], context=context)
         return obj_id
     
     def _create_resource_leave(self, cr, uid, leaves, context=None):
@@ -374,18 +373,11 @@ class hr_holidays(osv.osv):
             if obj.employee_id.parent_id and not obj.employee_id.parent_id.user_id.id in user_ids:
                 user_ids.append(obj.employee_id.parent_id.user_id.id)
         return user_ids
-        
-    def create_notificate(self, cr, uid, ids, context=None):
-        for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, ids, _('System notification'),
-                        _("The %s request has been <b>created</b> and is waiting confirmation")
-                        % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-        return True
     
     def holidays_confirm_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
             self.message_append_note(cr, uid, [obj.id], _('System notification'), 
-                    _("The %s request has been <b>confirmed</b> and is waiting for validation by the manager.")
+                    _("The %s request has been <b>submitted</b> and is waiting for validation by the manager.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
     
     def holidays_validate_notificate(self, cr, uid, ids, context=None):

From ebfa32cbe85ba868bd941cd8373643f31890e163 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 11 Jul 2012 15:21:58 +0530
Subject: [PATCH 010/118] [IMP]hr_holiday: Improve constraints message

bzr revid: dbr@tinyerp.com-20120711095158-fc8j3pibnwqt3asu
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 223b697d5bc..139ccb0504f 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -146,7 +146,7 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
     _sql_constraints = [
-        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category"),
+        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "My user has no employee."),
         ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]

From b592896f4ba0729ae4f75990db4b68a32af24e82 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 12 Jul 2012 11:47:40 +0530
Subject: [PATCH 011/118] [ADD]: Add state field for ir.translation

bzr revid: aja@tinyerp.com-20120712061740-4mo3l0d70wxthki2
---
 openerp/addons/base/ir/ir.xml            |  3 +++
 openerp/addons/base/ir/ir_translation.py | 26 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4de12d8bfeb..ff9ba292fe2 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1258,6 +1258,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Translations" version="7.0">
+                   <header>
+                        <field name="state" widget="statusbar" nolabel="1"/>
+                   </header>
                    <sheet>
                     <group>
                         <group>
diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 61e40e807d4..7693f95a7c8 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,14 +77,16 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-
+        state= "translated"
+        if not ddict['value']:
+            state = 'translate'
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
-                        imd_model, imd_module, imd_name, value)
-                VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s)""",
+                        imd_model, imd_module, imd_name, value,state)
+                VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""",
                 (ddict['name'], ddict['lang'], ddict.get('res_id'), ddict['src'], ddict['type'],
                     ddict.get('imd_model'), ddict.get('imd_module'), ddict.get('imd_name'),
-                    ddict['value']))
+                    ddict['value'],state))
 
     def finish(self):
         """ Transfer the data from the temp table to ir.translation
@@ -125,15 +127,16 @@ class ir_translation_import_cursor(object):
         # Step 2: update existing (matching) translations
         if self._overwrite:
             cr.execute("""UPDATE ONLY %s AS irt
-                SET value = ti.value 
+                SET value = ti.value,
+                state = 'translated' 
                 FROM %s AS ti
                 WHERE %s AND ti.value IS NOT NULL AND ti.value != ''
                 """ % (self._parent_table, self._table_name, find_expr))
 
         # Step 3: insert new translations
 
-        cr.execute("""INSERT INTO %s(name, lang, res_id, src, type, value)
-            SELECT name, lang, res_id, src, type, value
+        cr.execute("""INSERT INTO %s(name, lang, res_id, src, type, value,state)
+            SELECT name, lang, res_id, src, type, value,state
               FROM %s AS ti
               WHERE NOT EXISTS(SELECT 1 FROM ONLY %s AS irt WHERE %s);
               """ % (self._parent_table, self._table_name, self._parent_table, find_expr))
@@ -167,6 +170,11 @@ class ir_translation(osv.osv):
         'type': fields.selection(TRANSLATION_TYPE, string='Type', size=16, select=True),
         'src': fields.text('Source'),
         'value': fields.text('Translation Value'),
+        'state':fields.selection([('translate','To Translate'),('inprogress','Translation in Progress'),('translated','Translated')])
+    }
+    
+    _defaults = {
+        'state':'translated',
     }
     
     _sql_constraints = [ ('lang_fkey_res_lang', 'FOREIGN KEY(lang) REFERENCES res_lang(code)', 
@@ -297,6 +305,10 @@ class ir_translation(osv.osv):
         return ids
 
     def write(self, cursor, user, ids, vals, context=None):
+        if vals.get('src'):
+            result= vals.update({'state':'translate'})
+        if vals.get('value'):
+            result= vals.update({'state':'translated'})
         if not context:
             context = {}
         if isinstance(ids, (int, long)):

From 9eda964e6e165f35a77242cba0e57c3e73187b6a Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 13 Jul 2012 17:41:29 +0530
Subject: [PATCH 012/118] [IMP]Adding .py files in base_gengo module

bzr revid: tch@tinyerp.com-20120713121129-bw973p0ruwlvfm60
---
 addons/base_gengo/__init__.py    | 9 +++++++++
 addons/base_gengo/__openerp__.py | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index 6825dc22f47..e1537d7ab27 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -19,4 +19,13 @@
 #
 ##############################################################################
 
+import res_company
+import ir_translation
+
+
+
+
+
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 43a6e258418..4f1d296f856 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -30,7 +30,9 @@ Automated Translations through Gengo API
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': [],
+    'update_xml': [
+        'ir_translation.xml'  
+           ],
     'demo_xml': [],
     'test': [],
     'installable': True,

From 07f5aaf242b6a2f69d6242ce7cf8f9d77430ba2c Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 13 Jul 2012 17:49:35 +0530
Subject: [PATCH 013/118] [IMP]Adding .py files in base_gengo module

bzr revid: tch@tinyerp.com-20120713121935-8akpxoebe6i9j1ja
---
 addons/base_gengo/ir_translation.py  | 41 ++++++++++++++++++++++++++
 addons/base_gengo/ir_translation.xml | 17 +++++++++++
 addons/base_gengo/res_company.py     | 43 ++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 addons/base_gengo/ir_translation.py
 create mode 100644 addons/base_gengo/ir_translation.xml
 create mode 100644 addons/base_gengo/res_company.py

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
new file mode 100644
index 00000000000..7160d102970
--- /dev/null
+++ b/addons/base_gengo/ir_translation.py
@@ -0,0 +1,41 @@
+# -*- 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,orm
+import os
+import openerp 
+import tools
+
+class ir_translation(osv.osv):
+    _name = "ir.translation"
+    _description="Translation"
+    _inherit="ir.translation"
+    _columns = {
+        'gengo_comment':fields.text("comments", help="Comment for translators"),
+        'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
+        'gengo_control':fields.boolean('Active'),
+    
+    }
+    
+    _defaults = {
+        'gengo_control':False,
+    }
+
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
new file mode 100644
index 00000000000..72c6f99730d
--- /dev/null
+++ b/addons/base_gengo/ir_translation.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_translation_search" model="ir.ui.view">
+            <field name="name">Translations</field>
+            <field name="model">ir.translation</field>
+            <field name="inherit_id" ref="base.view_translation_search"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Translations">
+                     <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
+                     <filter string="In Control" domain="[('state','=','translated')]"></filter>
+                </search>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
new file mode 100644
index 00000000000..1fa07bb65e2
--- /dev/null
+++ b/addons/base_gengo/res_company.py
@@ -0,0 +1,43 @@
+# -*- 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,orm
+import os
+import openerp 
+import tools
+
+class res_company(osv.osv):
+    _name = "res.company"
+    _description = "companies"
+    _inherit = "res.company"
+    _columns = {
+           "gengo_private_key":fields.text("Gengo private key"),
+           "gengo_public_key":fields.text("Gengo public key"),
+           "gengo_tier":fields.selection([('machine','Machine'),
+                                          ('standard','Standard'),
+                                          ('pro','Pro'),
+                                          ('ultra','Ultra')],"Tier types", required=True),
+           "gengo_comment":fields.text("comments"),
+           "gengo_auto_approve":fields.boolean("Active"),
+           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id'),
+           
+    }
+

From 99f81a5d9723f931b2963dd1b26e673cd023457f Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Fri, 13 Jul 2012 18:38:03 +0530
Subject: [PATCH 014/118] [IMP]Adding .py files in base_gengo module

bzr revid: tch@tinyerp.com-20120713130803-slnbqdvlc9ypf14a
---
 addons/base_gengo/ir_translation.py | 7 ++-----
 addons/base_gengo/res_company.py    | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7160d102970..053f72f5c2c 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -19,12 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
-import os
-import openerp 
-import tools
+from osv import fields,osv
 
-class ir_translation(osv.osv):
+class ir_translation(osv.Model):
     _name = "ir.translation"
     _description="Translation"
     _inherit="ir.translation"
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 1fa07bb65e2..81ef413dbe0 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -19,12 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
-import os
-import openerp 
-import tools
+from osv import fields,osv
 
-class res_company(osv.osv):
+class res_company(osv.Model):
     _name = "res.company"
     _description = "companies"
     _inherit = "res.company"

From be6cb0c3cab8d52e86171d441ed5cc2cd41d625b Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 16 Jul 2012 18:11:35 +0530
Subject: [PATCH 015/118] [IMP]: Improve in base_gengo module

bzr revid: aja@tinyerp.com-20120716124135-k2gyo052r460c3fv
---
 addons/base_gengo/__openerp__.py       |  4 +--
 addons/base_gengo/ir_translation.py    |  3 +--
 addons/base_gengo/ir_translation.xml   | 21 ++++++++++++++-
 addons/base_gengo/res_company.py       | 12 +++++----
 addons/base_gengo/res_company_view.xml | 37 ++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 addons/base_gengo/res_company_view.xml

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 4f1d296f856..7afc573b0ca 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 {
     'name': 'Automated Translations through Gengo API',
     'version': '0.1',
@@ -31,7 +30,8 @@ Automated Translations through Gengo API
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
-        'ir_translation.xml'  
+        'ir_translation.xml',
+        'res_company_view.xml'
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 053f72f5c2c..46d48af87de 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,10 +26,9 @@ class ir_translation(osv.Model):
     _description="Translation"
     _inherit="ir.translation"
     _columns = {
-        'gengo_comment':fields.text("comments", help="Comment for translators"),
+        'gengo_comment':fields.text("Comments"),
         'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control':fields.boolean('Active'),
-    
     }
     
     _defaults = {
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 72c6f99730d..52b081cd7d6 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -9,9 +9,28 @@
             <field name="arch" type="xml">
                 <search string="Translations">
                      <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
-                     <filter string="In Control" domain="[('state','=','translated')]"></filter>
+                     <filter string="To Control" domain="[('state','=','translated')]"></filter>
                 </search>
             </field>
         </record>
+        
+        <!-- ir.translation form view -->
+        <record model="ir.ui.view" id="view_ir_translation_inherit_base_gengo_form">
+            <field name="name">ir.translation.form.inherit</field>
+            <field name="inherit_id" ref="base.view_translation_form"/>
+            <field name="model">ir.translation</field>           
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                 <xpath expr="//form[@string='Translations']/sheet" position="inside">
+                    <group string="comments" col="1">
+                        <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translation Job...."/>
+                    </group>
+                    <group col="4">
+                        <field name="gengo_translation" />
+                        <field name="gengo_control" />
+                    </group>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 81ef413dbe0..ddfb68f7141 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -23,7 +23,7 @@ from osv import fields,osv
 
 class res_company(osv.Model):
     _name = "res.company"
-    _description = "companies"
+    _description = "Companies"
     _inherit = "res.company"
     _columns = {
            "gengo_private_key":fields.text("Gengo private key"),
@@ -33,8 +33,10 @@ class res_company(osv.Model):
                                           ('pro','Pro'),
                                           ('ultra','Ultra')],"Tier types", required=True),
            "gengo_comment":fields.text("comments"),
-           "gengo_auto_approve":fields.boolean("Active"),
-           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id'),
-           
+           "gengo_auto_approve":fields.boolean("Active",help="Jobs are Automatically Approved by Gengo."),
+           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id','fields'),
+    }
+    
+    _defaults={
+        "gengo_tier":"machine",
     }
-
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
new file mode 100644
index 00000000000..a4f6ceffcce
--- /dev/null
+++ b/addons/base_gengo/res_company_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_company_inherit_base_gengo_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>           
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Gengo Parameters">
+                        <group col="2">
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" nolabel="1"/>
+                            </group>
+                            <group col="1" string="Public Key">
+                                <field name="gengo_public_key" nolabel="1"/>
+                            </group>
+                        </group>
+                        <group col="4">
+                            <field name="gengo_tier" />
+                            <field name="gengo_auto_approve"/>
+                        </group>
+                        <group string="Comments" col="1">
+                            <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translator...."/>
+                        </group>
+                        <group col="1">
+                            <field name="fields_ids" nolabel="1"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 70e73559d2f91e54215f6a2de779dce8a0f0580d Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 16 Jul 2012 18:36:51 +0530
Subject: [PATCH 016/118] [IMP]: change license in base_gengo module

bzr revid: aja@tinyerp.com-20120716130651-qk7z3c1uaypjr9z4
---
 addons/base_gengo/__init__.py       | 6 ------
 addons/base_gengo/ir_translation.py | 4 ++--
 addons/base_gengo/res_company.py    | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index e1537d7ab27..ca798adebee 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -22,10 +22,4 @@
 import res_company
 import ir_translation
 
-
-
-
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 46d48af87de..a658b935c93 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index ddfb68f7141..2a91d13f1b1 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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

From 28124a66f682faaecdfe6cf4db47f68d0af27bfd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 16 Jul 2012 22:35:12 +0200
Subject: [PATCH 017/118] [IMP] better form view: users, modules, preferences,
 wizards

bzr revid: fp@tinyerp.com-20120716203512-ic75m4qys1v0kid6
---
 .../base/ir/wizard/wizard_menu_view.xml       | 10 ++---
 openerp/addons/base/module/module.py          |  2 +
 openerp/addons/base/module/module_view.xml    | 36 +++++++--------
 .../wizard/base_export_language_view.xml      | 45 +++++++------------
 .../wizard/base_import_language_view.xml      | 10 ++---
 .../wizard/base_language_install_view.xml     | 44 +++++++-----------
 .../wizard/base_module_configuration_view.xml |  6 +--
 .../module/wizard/base_module_import_view.xml | 35 +++++----------
 .../module/wizard/base_module_scan_view.xml   |  6 +--
 .../module/wizard/base_module_update_view.xml | 34 +++++---------
 .../wizard/base_module_upgrade_view.xml       | 18 ++++----
 .../wizard/base_update_translations_view.xml  | 19 +++-----
 openerp/addons/base/res/res_users_view.xml    | 19 +++-----
 13 files changed, 109 insertions(+), 175 deletions(-)

diff --git a/openerp/addons/base/ir/wizard/wizard_menu_view.xml b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
index 58bd98ef785..9f5d912ed1a 100644
--- a/openerp/addons/base/ir/wizard/wizard_menu_view.xml
+++ b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="name"/>
                         <field name="menu_id" domain="[('parent_id','&lt;&gt;',False)]"/>
                     </group>
+                    <footer>
+                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 392850f7b77..dba1962ae26 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -80,6 +80,7 @@ class module_category(osv.osv):
 
 class module(osv.osv):
     _name = "ir.module.module"
+    _rec_name = "shortdesc"
     _description = "Module"
 
     @classmethod
@@ -177,6 +178,7 @@ class module(osv.osv):
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
         'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
+        'summary': fields.char('Summary', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index a9f3620fb57..5624c8ff58c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -113,36 +113,32 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module" version="7.0">
-                <header>
-                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
-                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
-                    <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
-                        confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
-                    <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
-                    <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
-                    <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
-                </header>
                 <sheet>
-                    <div class="oe_right oe_button_box">
-                        <field name="icon_image" widget="image"/>
-                    </div>
+                    <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1><field name="shortdesc"/></h1>
-                        <h2><field name="category_id" class="oe_inline"/></h2>
+                        <h2 class="oe_fade"><field name="summary"/></h2>
+                        <button name="button_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
+                        <button name="button_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
+                        <button name="button_uninstall" states="installed" string="Uninstall" type="object"
+                            confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                        <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
+                        <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
+                        <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
                     </div>
                     <group>
+                        <group>
+                            <field name="author"/>
+                            <field name="website" widget="url"/>
+                            <field name="category_id" widget="selection"/>
+                        </group>
                         <group>
                             <field name="name"/>
                             <field name="license"/>
                             <field name="installed_version"/>
                         </group>
-                        <group>
-                            <field name="author"/>
-                            <field name="website" widget="url"/>
-                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Description">
                             <field name="description"/>
                         </page>
@@ -150,7 +146,9 @@
                             <group col="4">
                                 <field name="demo"/>
                                 <field name="application"/>
+                                <field name="state"/>
                             </group>
+                            <label for="dependencies_id"/>
                             <field name="dependencies_id">
                                 <tree string="Dependencies">
                                     <field name="name"/>
diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index 4ed31c3af69..200ed549cbc 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -8,39 +8,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Export Translations" version="7.0">
-                    <header>
+                    <group colspan="4" states="choose">
+                        <separator colspan="4" string="Export Translation"/>
+                        <field name="lang"/>
+                        <field name="format" required="1"/>
+                        <field name="modules" nolabel="1"/>
+                        <field invisible="1" name="state"/>
+                    </group>
+                    <group colspan="4" states="get">
+                        <separator string="Export done" colspan="4"/>
+                        <field name="name" invisible="1" colspan="4"/>
+                        <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
+                        <field height="80" name="advice" nolabel="1" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight"/>
                         <label string="or" states="choose"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="OpenERP translations (core, modules, clients) are managed through Launchpad.net, our open source project management facility. We use their online interface to synchronize all translations efforts."/>
-                            <label colspan="4" width="220" string="To improve or expand the official translations, you should use directly Lauchpad's web interface (Rosetta). If you need to perform mass translation, Launchpad also allows uploading full .po files at once"/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="To browse official translations, you can start with these links:"/>
-                            <label colspan="4" width="220" string="https://help.launchpad.net/Translations"/>
-                            <label colspan="4" width="220" string="https://translations.launchpad.net/openobject"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <group colspan="4" states="choose">
-                                <separator colspan="4" string="Export Translation"/>
-                                <field name="lang"/>
-                                <field name="format" required="1"/>
-                                <field height="200" name="modules" nolabel="1" colspan="4"/>
-                                <field invisible="1" name="state"/>
-                            </group>
-                            <group colspan="4" states="get">
-                                <separator string="Export done" colspan="4"/>
-                                <field name="name" invisible="1" colspan="4"/>
-                                <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
-                                <field height="80" name="advice" nolabel="1" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml
index 3c6a34752c7..3b61e643399 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Translation" version="7.0">
-                    <header>
-                        <button name="import_lang" string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Import Translation" colspan="2"/>
                         <label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
@@ -23,6 +18,11 @@
                             <field name="overwrite"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="import_lang" string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index 166c1b05e70..64039177d5d 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -8,33 +8,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Load a Translation" version="7.0">
-                    <header>
+                    <separator string="Load a Translation"/>
+                    <field name="state" invisible="1"/>
+                    <group states="init">
+                        <field name="lang"/>
+                        <field name="overwrite" groups="base.group_no_one"/>
+                    </group>
+                    <group states="done" colspan="4">
+                        <label string="The selected language has been successfully installed.
+You must change the preferences of the user and open a new menu to view the changes."/>
+                    </group>
+                    <footer>
                         <button name="lang_install" string="Load" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group colspan="4" col="8">
-                        <group colspan="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" colspan="1" rowspan="12"/>
-                        <group colspan="6">
-                            <separator string="Load a Translation" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <field name="lang" colspan="4"/>
-                                <field name="overwrite" colspan="4" groups="base.group_no_one"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <label string="The selected language has been successfully installed.
-You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
            </field>
         </record>
@@ -49,10 +37,10 @@ You must change the preferences of the user and open a new menu to view the chan
         </record>
 
         <menuitem
-        name="Load a Translation"
-        action="action_view_base_language_install"
-        id="menu_view_base_language_install"
-        parent="menu_translation" sequence="2"/>
+            name="Load a Translation"
+            action="action_view_base_language_install"
+            id="menu_view_base_language_install"
+            parent="menu_translation" sequence="2"/>
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/module/wizard/base_module_configuration_view.xml b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
index 3174103ea4f..61f920b4333 100644
--- a/openerp/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
@@ -8,10 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Configuration Done" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
+                    <footer>
+                        <button string="Close" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml
index dc7d1df43e6..3201bd83e10 100644
--- a/openerp/addons/base/module/wizard/base_module_import_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_import_view.xml
@@ -8,35 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import module" version="7.0">
-                    <header>
+                    <field name="state" invisible="1"/>
+                    <separator string="Module Import" colspan="4"/>
+                    <group states="init" col="4">
+                        <label string="Select module package to import (.zip file):" colspan="4"/>
+                        <field name="module_file" colspan="4"/>
+                    </group>
+                    <group states="done" col="4">
+                        <label string="Module file successfully imported!" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="importzip" string="Import module" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
                         <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="8">
-                        <group colspan="3" col="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label width="220" string='This wizard helps you to import a new module to your OpenERP system.
-After importing a new module you can install it by clicking on the button "Install" from the form view.'/>
-                            <label width="220"/>
-                            <label width="220" string="Please be patient, this operation may take a few minutes..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="5"/>
-                        <group colspan="4">
-                            <separator string="Module Import" colspan="4"/>
-                            <group states="init" col="4">
-                                <label string="Select module package to import (.zip file):" colspan="4"/>
-                                <field name="module_file" colspan="4"/>
-                            </group>
-                            <group states="done" col="4">
-                                <label string="Module file successfully imported!" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_scan_view.xml b/openerp/addons/base/module/wizard/base_module_scan_view.xml
index fc9fae11a65..a885dcb60d8 100644
--- a/openerp/addons/base/module/wizard/base_module_scan_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_scan_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Scan for new modules" version="7.0">
-                <header>
+                <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
+                <footer>
                     <button name="watch_dir" string="Check new modules" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 2d1fa4b44f1..9a9f7efc00a 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -8,34 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Update Module List" version="7.0">
-                    <header>
+                    <field name="state" invisible="1"/>
+                    <separator string="Module Update Result" colspan="4"/>
+                    <group states="init" colspan="4">
+                        <label string="Click on Update below to start the process..." colspan="4"/>
+                    </group>
+                    <group states="done" colspan="4">
+                        <field name="update" colspan="4"/>
+                        <field name="add" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="update_module" string="Update" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
                         <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, as this operation may take a few seconds..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Module Update Result" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <label string="Click on Update below to start the process..." colspan="4"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <field name="update" colspan="4"/>
-                                <field name="add" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index b0316bdbf4b..f0dd5d83678 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Update" version="7.0">
-                    <header>
-                        <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <div><label string="Your system will be updated."/></div>
                     <div><label string="Note that this operation might take a few minutes."/></div>
                     <separator string="Modules to Update"/>
                     <field name="module_info"/>
+                    <footer>
+                        <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -45,13 +45,13 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Apply Scheduled Upgrades" version="7.0">
-                    <header>
+                    <div><label string="The selected modules have been updated / installed !"/></div>
+                    <div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
+                    <footer>
                         <button name="config" string="Start configuration" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <div><label string="The selected modules have been updated / installed !"/></div>
-                    <div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index b80259194de..47c6957ac21 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -7,23 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Synchronize Terms" version="7.0">
-                    <header>
+                    <group string="Synchronize Translation">
+                        <field name="lang"/>
+                    </group>
+                    <footer>
                         <button name="act_update" string="Update" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will detect new terms to translate in the application, so that you can then add translations manually or perform a complete export (as a template for a new language example)."/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Synchronize Translation" colspan="4"/>
-                            <field name="lang" colspan="4"/>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index a429c84ede7..051c4c00e74 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -81,9 +81,7 @@
                 <form string="Users" version="7.0">
                     <field name="id" invisible="1"/>
                     <sheet>
-                        <div class="oe_right">
-                            <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
-                        </div>
+                        <field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
@@ -194,24 +192,21 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users" version="7.0">
-                   <sheet>
-                    <div class="oe_right oe_avatar">
-                        <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
-                    </div>
+                <sheet>
+                    <field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1>
-                            <field name="name" readonly="1" class="oe_edit_only oe_inline"/>
-                            (<field name="login" readonly="1" class="oe_edit_only oe_inline"/>)
+                            <field name="name" readonly="1"/>
                         </h1>
-                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
                         <h2>
-                            <field name="company_id" widget="selection" readonly="0"
-                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+                            <field name="login" readonly="1"/>
                         </h2>
                     </div>
                     <group col="4" name="preferences" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
+                        <field name="company_id" widget="selection" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                     </group>
                     <group string="Email Preferences">
                         <field name="user_email" widget="email" readonly="0"/>

From 30ba281af0ace8c31862e9260339e6e4d321fb53 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Tue, 17 Jul 2012 09:51:52 +0200
Subject: [PATCH 018/118] [ADD] enable accesskeys (=shortcuts) They are
 translatable (changes in npybabel.py), a visual hint for the shortcuts to use
 will be added by a yet-to-be-written web module.

bzr revid: hbrunn@therp.nl-20120717075152-gz2ktbme3k388vd6
---
 addons/web/static/src/js/coresetup.js |  2 +-
 addons/web/static/src/xml/base.xml    | 11 ++++++-----
 npybabel.py                           | 11 ++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index a5a62b9bcc1..28969d3e152 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -600,7 +600,7 @@ instance.web.qweb.preprocess_node = function() {
             break;
         case 1:
             // Element
-            var attr, attrs = ['label', 'title', 'alt', 'placeholder'];
+            var attr, attrs = ['label', 'title', 'alt', 'placeholder', 'accesskey'];
             while (attr = attrs.pop()) {
                 if (this.attributes[attr]) {
                     this.attributes[attr] = instance.web._t(this.attributes[attr]);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2d9caa43bbd..a7b70a2f27b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -685,11 +685,11 @@
 <div t-name="FormView.buttons" class="oe_form_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <span class="oe_form_buttons_view">
-            <button type="button" class="oe_button oe_form_button_edit">Edit</button>
-            <button type="button" class="oe_button oe_form_button_create">Create</button>
+            <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
+            <button type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
         </span>
         <span class="oe_form_buttons_edit">
-            <button type="button" class="oe_button oe_form_button_save oe_highlight">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>
+            <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D">Discard</a>
         </span>
     </t>
 </div>
@@ -775,7 +775,7 @@
     <div class="oe_clear">
         <ul t-attf-class="oe_notebook #{classnames}">
             <li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers">
-                <a t-attf-href="##{page.id}">
+                <a t-attf-href="##{page.id}" t-att-accesskey="page.accesskey">
                     <t t-esc="page.string"/>
                 </a>
             </li>
@@ -1118,7 +1118,8 @@
     <button type="button" class="oe_button oe_form_button"
         t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
-        t-att-autofocus="widget.node.attrs.autofocus">
+        t-att-autofocus="widget.node.attrs.autofocus"
+        t-att-accesskey="widget.node.attrs.accesskey">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
diff --git a/npybabel.py b/npybabel.py
index 14ac115e338..f603791cb84 100755
--- a/npybabel.py
+++ b/npybabel.py
@@ -93,9 +93,10 @@ def extract_qweb(fileobj, keywords, comment_tags, options):
     :rtype: ``iterator``
     """
     result = []
-    def handle_text(text, lineno):
+    def handle_text(text, lineno, name=None):
         text = (text or "").strip()
-        if len(text) > 1: # Avoid mono-char tokens like ':' ',' etc.
+        if len(text) > 1 or name in ['accesskey']: 
+            # Avoid mono-char tokens like ':' ',' etc but keep accesskeys
             result.append((lineno, None, text, [TRANSLATION_FLAG_COMMENT]))
 
     # not using elementTree.iterparse because we need to skip sub-trees in case
@@ -106,10 +107,10 @@ def extract_qweb(fileobj, keywords, comment_tags, options):
             if "t-js" not in el.attrib and \
                     not ("t-jquery" in el.attrib and "t-operation" not in el.attrib) and \
                     not ("t-translation" in el.attrib and el.attrib["t-translation"].strip() == "off"):
-                handle_text(el.text, el.sourceline)
-                for att in ('title', 'alt', 'label', 'placeholder'):
+                handle_text(el.text, el.sourceline, el.tag)
+                for att in ('title', 'alt', 'label', 'placeholder', 'accesskey'):
                     if att in el.attrib:
-                        handle_text(el.attrib[att], el.sourceline)
+                        handle_text(el.attrib[att], el.sourceline, att)
                 iter_elements(el)
             handle_text(el.tail, el.sourceline)
 

From b5c626f6a2fe697d9444bbe2116889c2a9280eab Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 23 Jul 2012 19:26:20 +0530
Subject: [PATCH 019/118] [FIX]Fixed problem of date picker.

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

bzr revid: amb@tinyerp.com-20120723135620-67qunqvnyz0lj00e
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d6ed85fedad..9c1cf916a41 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2097,7 +2097,8 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
             changeMonth: true,
             changeYear: true,
             showWeek: true,
-            showButtonPanel: true
+            showButtonPanel: true,
+            firstDay: Date.CultureInfo.firstDayOfWeek
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (self.get("effective_readonly") || self.picker('widget').is(':visible')) {

From 2c9e0c2459be2421d4f30b25ed2ac2cd9b93272f Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Thu, 26 Jul 2012 17:57:02 +0530
Subject: [PATCH 020/118] [IMP]:reverted the changes for 'name' field

bzr revid: mtr@tinyerp.com-20120726122702-bbttyqkepqs0fdg6
---
 addons/hr_holidays/hr_holidays.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 9d10f08d590..54ab5f31a29 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -112,7 +112,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.text('Description', required=True,states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -126,6 +126,7 @@ class hr_holidays(osv.osv):
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
+        'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
@@ -267,7 +268,7 @@ class hr_holidays(osv.osv):
                     'name': record.name,
                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
-                    'description': record.name,
+                    'description': record.notes,
                     'user_id': record.user_id.id,
                     'date': record.date_from,
                     'end_date': record.date_to,

From 21df6496976a133d9bce53363233b8f41eef025e Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Thu, 26 Jul 2012 18:05:17 +0530
Subject: [PATCH 021/118] [IMP]:improved access rights and added ir.rule for
 HR/Officer

bzr revid: mtr@tinyerp.com-20120726123517-l9gc3tn9efl8wwep
---
 addons/hr_holidays/security/ir.model.access.csv | 2 +-
 addons/hr_holidays/security/ir_rule.xml         | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index d2e6c27cded..adb01b51e94 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -4,4 +4,4 @@ access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,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_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index fab12354bf4..33d1a2c107f 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -7,5 +7,13 @@
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
+    
+    <record id="property_rule_holidays_officer" model="ir.rule">
+        <field name="name">Holidays Officer</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.parent_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+    </record>
+    
   </data>
 </openerp>

From 095a0569f8bced160e2b86fc8dfabec27c479ca7 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Mon, 30 Jul 2012 16:01:39 +0530
Subject: [PATCH 022/118] [IMP]:can now delete a leave which are in 'draft',
 'cancel' and 'confirm' state

bzr revid: mtr@tinyerp.com-20120730103139-n1ni944evcny3dic
---
 addons/hr_holidays/hr_holidays.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 54ab5f31a29..0fcb8f41335 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -200,8 +200,8 @@ class hr_holidays(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
-            if rec.state<>'draft':
-                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft status !'))
+            if rec.state not in ['draft', 'cancel', 'confirm']:
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):

From e9cd4b6d8264c2f21d0b50277c676aebead88cd0 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 31 Jul 2012 11:55:40 +0530
Subject: [PATCH 023/118] [IMP]:round down the value of days

bzr revid: mtr@tinyerp.com-20120731062540-3iijbtj1d2671fvv
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0fcb8f41335..1ff3ce1a510 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -209,7 +209,7 @@ class hr_holidays(osv.osv):
         if date_to and date_from:
             diff_day = self._get_number_of_days(date_from, date_to)
             result['value'] = {
-                'number_of_days_temp': round(diff_day)+1
+                'number_of_days_temp': round(math.floor(diff_day))+1
             }
             return result
         result['value'] = {

From e31a2f86340c5f7dc9354bc86de4349dbacfe49a Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 31 Jul 2012 14:32:41 +0530
Subject: [PATCH 024/118] [IMP]:imported math module(library)

bzr revid: mtr@tinyerp.com-20120731090241-mvgydus04zrmnjvl
---
 addons/hr_holidays/hr_holidays.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 1ff3ce1a510..aaff2183050 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -25,6 +25,7 @@ import datetime, time
 from itertools import groupby
 from operator import itemgetter
 
+import math
 import netsvc
 from osv import fields, osv
 from tools.translate import _

From dbcd304455f599a1edb4d18903e291760518bceb Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 31 Jul 2012 16:02:15 +0530
Subject: [PATCH 025/118] [IMP]:changed the id,name from 'manager' to 'user'

bzr revid: mtr@tinyerp.com-20120731103215-vc0wx0kiy7d8x6ka
---
 addons/hr_holidays/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 7f386020ef7..3df2c61cf51 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -4,6 +4,6 @@ access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
-access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
+access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
 access_crm_meeting_type_manager,crm.meeting.type.manager,base_calendar.model_crm_meeting_type,base.group_hr_manager,1,1,1,1
 

From 0b6e36ef48de4b848dbdbf91cfa402d807edab4f Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Wed, 1 Aug 2012 18:10:44 +0530
Subject: [PATCH 026/118] [IMP]: set reqd=False on 'name' field and improved
 view

bzr revid: mtr@tinyerp.com-20120801124044-1asum92rkjnipnms
---
 addons/hr_holidays/hr_holidays.py       |  2 +-
 addons/hr_holidays/hr_holidays_view.xml | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index aaff2183050..0cf9d5db867 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -113,7 +113,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Description', required=True, size=64),
+        'name': fields.char('Description', size=64),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index adbf6b0e794..50e572fcbb9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -110,6 +110,10 @@
                 </header>
                 <sheet string="Leave Request">
                     <group>
+                    	<group col="3">
+                    		<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                    	</group>
+                        <newline></newline>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
@@ -139,8 +143,6 @@
                                     <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                                 </group>
                             </group>
-                            <newline/>
-                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" placeholder="Add a reason..."/>
                     </group>
                 </sheet>
                 <div class="oe_chatter">
@@ -166,6 +168,10 @@
                 </header>
                 <sheet>
                     <group>
+	                    <group>
+	                    	<field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+	                    </group>
+	                    <newline/>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
@@ -181,7 +187,8 @@
                         <field name="double_validation" invisible="1"/>
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                     </group>
-                    <field name="name" placeholder="Add a reason..."/>
+                    <newline/>
+                    <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>

From 903c783be0f50a65e8c9e18f7c720572c14786c3 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 3 Aug 2012 17:39:46 +0200
Subject: [PATCH 027/118] fixed padding in contact kanban view for companies

bzr revid: mit@openerp.com-20120803153946-5yi9vdtk58jx29bo
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 27caa708cb6..a0f70f5814b 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -177,7 +177,7 @@
                                             <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                <div class="oe_module_vignette">
+                                                <div>
                                                 <a type="edit">
                                                     <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
                                                 </a>

From e4a2ac99a71311ae06ecd1ba57f3da55088a7154 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 6 Aug 2012 13:10:35 +0530
Subject: [PATCH 028/118] [IMP]:Improve translation synchronization

bzr revid: aja@tinyerp.com-20120806074035-11pi9wal2psnvl6w
---
 addons/base_gengo/__init__.py                 |   5 +-
 addons/base_gengo/__openerp__.py              |   5 +-
 addons/base_gengo/ir_translation.py           |   5 +-
 addons/base_gengo/res_lang.py                 |  32 ++++
 addons/base_gengo/res_lang_view.xml           |  17 ++
 addons/base_gengo/wizard/__init__.py          |  26 +++
 .../base_gengo/wizard/alert_message_gengo.xml |  22 +++
 .../wizard/gengo_response_scheduler.xml       |  26 +++
 .../wizard/gengo_update_translation.py        | 142 ++++++++++++++++
 addons/base_gengo/wizard/wrap_object.py       | 159 ++++++++++++++++++
 10 files changed, 434 insertions(+), 5 deletions(-)
 create mode 100644 addons/base_gengo/res_lang.py
 create mode 100644 addons/base_gengo/res_lang_view.xml
 create mode 100644 addons/base_gengo/wizard/__init__.py
 create mode 100644 addons/base_gengo/wizard/alert_message_gengo.xml
 create mode 100644 addons/base_gengo/wizard/gengo_response_scheduler.xml
 create mode 100644 addons/base_gengo/wizard/gengo_update_translation.py
 create mode 100644 addons/base_gengo/wizard/wrap_object.py

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index ca798adebee..c434c6b1843 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -11,7 +11,7 @@
 #
 #    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
+#    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
@@ -21,5 +21,6 @@
 
 import res_company
 import ir_translation
-
+import wizard
+import res_lang
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 7afc573b0ca..e8fe7e0df17 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -31,7 +31,10 @@ Automated Translations through Gengo API
     'init_xml': [],
     'update_xml': [
         'ir_translation.xml',
-        'res_company_view.xml'
+        'res_company_view.xml',
+        'res_lang_view.xml',
+        'wizard/gengo_response_scheduler.xml',
+        'wizard/alert_message_gengo.xml',
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index a658b935c93..2c1740b9b04 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -11,7 +11,7 @@
 #
 #    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
+#    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
@@ -29,8 +29,9 @@ class ir_translation(osv.Model):
         'gengo_comment':fields.text("Comments"),
         'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control':fields.boolean('Active'),
+        'job_id':fields.char('Gengo Job Id',size=32),
     }
-    
+        
     _defaults = {
         'gengo_control':False,
     }
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
new file mode 100644
index 00000000000..48e5a6db995
--- /dev/null
+++ b/addons/base_gengo/res_lang.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class res_company(osv.Model):
+    _name = "res.lang"
+    _description = "Languages"
+    _inherit = "res.lang"
+
+    _columns = {
+        'gengo_sync':fields.boolean('Active', help='Synchronize Translation Periodically')
+    }
+    
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
new file mode 100644
index 00000000000..efdfeed671e
--- /dev/null
+++ b/addons/base_gengo/res_lang_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
+            <field name="name">res.lang.form.inherit</field>
+            <field name="inherit_id" ref="base.res_lang_form"/>
+            <field name="model">res.lang</field>           
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//sheet/group" position="inside">
+                    <field name="gengo_sync" />
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
new file mode 100644
index 00000000000..fe8452a5b64
--- /dev/null
+++ b/addons/base_gengo/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- 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 gengo_update_translation
+import wrap_object
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
new file mode 100644
index 00000000000..9b16c34552f
--- /dev/null
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
+            <field name="name">update.translations.serial.wizard.view</field>
+            <field name="inherit_id" ref="base.wizard_update_translations"/>
+            <field name="model">base.update.translations</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='Synchronize Translation']" position="inside">
+                        <group colspan="4">
+                            <field name="state" invisible="1"/>
+                            <label string="Your Request has been Successfully Send to Gengo" states="done" colspan="4"/>
+                        </group>
+                        <group colspan="4">
+                            <label string="This language is select as Active All Translation Request will be sent by System Automatically" states="inprogress" colspan="4"/>
+                        </group>                        
+                </xpath>
+            </field>
+        </record>    
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/gengo_response_scheduler.xml b/addons/base_gengo/wizard/gengo_response_scheduler.xml
new file mode 100644
index 00000000000..f924dc5e4ee
--- /dev/null
+++ b/addons/base_gengo/wizard/gengo_response_scheduler.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--Scheduler Gengo Response-->
+        <record id="gengo_response_scheduler" model="ir.cron">
+            <field name="name" >Run Gengo Response Scheduler</field>
+            <field eval="True" name="active"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'scheduler_get_gengo_response'" name="function"/>
+        </record>
+        
+        <!--Schedular Sync Request-->
+        <record id="gengo_sync_request_scheduler" model="ir.cron">
+            <field name="name" >Run Gengo Sync Request Scheduler</field>
+            <field eval="True" name="active"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'scheduler_get_gengo_sync_request'" name="function"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
new file mode 100644
index 00000000000..a5186b4ab6d
--- /dev/null
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -0,0 +1,142 @@
+    # -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import tools
+import cStringIO
+from tools.translate import _
+import wrap_object
+import logging
+_logger = logging.getLogger(__name__)
+
+class gengo_update_translation(osv.osv_memory):
+
+    def send_translation_terms(self, cr, uid, ids, context):
+        """Lasy Loading will be perform when user or cron send a bunch of request."""
+        
+        total_term=0
+        limit= 0
+        translation_list=context['translation_term_id']
+        range_jobs=1
+        
+        meta = self.pool.get('jobs.meta')
+        translation_pool=self.pool.get('ir.translation')
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        gengo = meta.gengo_authentication(cr,uid,ids,context)
+        job_length=len(context['translation_term_id'])
+        remain=len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
+        if len(context['translation_term_id']) > wrap_object.REQUEST_LIMIT:
+            if remain > 0:
+                range_jobs=(len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
+            else:
+                range_jobs=len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
+        for length in range(0,range_jobs):
+            trans_list=[]
+            if job_length > wrap_object.REQUEST_LIMIT:
+                job_length-=wrap_object.REQUEST_LIMIT
+                limit+=wrap_object.REQUEST_LIMIT
+            else:
+                limit+=remain
+            for key in translation_list[total_term:limit]:
+                trans_list.append(key)
+            total_term=limit
+            jobs = meta.pack_jobs_request(cr,uid,trans_list,context={'language_code':context['lang']})
+            result = gengo.postTranslationJobs(jobs = jobs) 
+            self.write(cr, uid, ids, {'state':'done'})
+            if user.company_id.gengo_tier == 'machine':
+                if result.get('opstat')=='ok':
+                     for job in result.get('response').get('jobs'):
+                        for translation_id,val in job.items():
+                            translation_pool.write(cr,uid,int(translation_id),{'value':
+                            val['body_tgt'],'state':'translated','gengo_control':True})
+            else:
+                for job in result.get('response').get('jobs'):
+                    for translation_id,val in job.items():
+                        translation_pool.write(cr,uid,int(translation_id),{'job_id':val['job_id']})
+        return
+        
+    def act_update(self, cr, uid, ids, context=None):
+        try:
+            language_pool=self.pool.get('res.lang')
+            this = self.browse(cr, uid, ids)[0]
+            translation_pool=self.pool.get('ir.translation')
+            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True),('code','=',this.lang)])
+            
+            if not lang_search_id:
+                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',this.lang)])
+                context.update({'lang':this.lang,'translation_term_id':translation_term_id})
+                self.send_translation_terms(cr,uid,ids,context)
+                return
+            else:
+                self.write(cr, uid, ids, {'state':'inprogress'})
+        except Exception, e:
+            raise osv.except_osv(_('Warning !'), _('%s') % e)
+    
+    def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
+        """Scheduler will be call to get response from gengo and all term will get 
+        by scheduler which terms are in reviewable state"""
+        
+        meta = self.pool.get('jobs.meta')
+        translation_pool=self.pool.get('ir.translation')
+        
+        gengo = meta.gengo_authentication(cr,uid,ids,context)
+        res = gengo.getTranslationJobs(status = "approved")
+        if res:
+            response = meta.unpack_jobs_response(res)
+            for job in response.response:
+                translation_id=translation_pool.search(cr,uid,[('job_id','=',job.job_id)],context)
+                response=gengo.getTranslationJob(id = job.job_id)
+                translation_pool.write(cr,uid,translation_id,{'value':response['response']['job']['body_tgt'],'state':'translated','gengo_control':True})
+        
+    def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
+        """This scheduler will send a job request to the gengo , which terms are 
+        in translate state and gengo_translation is true"""
+        
+        if context is None:
+            context={}
+        try:
+            language_pool=self.pool.get('res.lang')
+            translation_pool=self.pool.get('ir.translation')
+            
+            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True)])
+            lang_ids=language_pool.read(cr, uid,lang_search_id)
+            
+            for lang_id in lang_ids:
+                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',lang_id['code']),('job_id','=',False)])
+                context.update({'lang':lang_id['code'],'translation_term_id':translation_term_id})
+                if translation_term_id:
+                    self.send_translation_terms(cr, uid, ids, context)
+        except Exception, e:
+             _logger.warning('A Gengo Exception is occur:: %s',e)
+
+    _name = 'base.update.translations'
+    _inherit = "base.update.translations"
+    
+    _columns= {
+        'state':fields.selection([('init','init'),('inprogress','inprogress'),('done','done')], 'state'),
+    }
+    
+    _defaults= {
+        'state':'init',
+    }
+
+gengo_update_translation()
+
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
new file mode 100644
index 00000000000..51007bdbd71
--- /dev/null
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
+#
+##############################################################################
+
+from osv import orm, osv
+import tools
+from tools.translate import _
+from mygengo import MyGengo
+import re
+
+REQUEST_LIMIT=10
+
+LANG_MAPPING={
+    'ar':'Arabic',
+    'id':'Indonesian',
+    'nl':'Dutch',
+    'fr-ca':'French (Canada)',
+    'pl':'Polish',
+    'zh-tw':'Chinese (Traditional)',
+    'sv':'Swedish',
+    'ko':'Korean',
+    'pt':'Portuguese (Europe)',
+    'en':'English',
+    'ja':'Japanese',
+    'es':'Spanish (Spain)',
+    'zh':'Chinese (Simplified)',
+    'de':'German',
+    'fr':'French',
+    'ru':'Russian',
+    'it':'Italian',
+    'pt-br':'Portuguese (Brazil)',
+}
+
+LANG_CODE_MAPPING = {
+    'ar_SA':'ar',
+    'id_ID':'id',
+    'nl_NL':'nl',
+    'fr_CA':'fr-ca',
+    'pl':'pl',
+    'zh_TW':'zh-tw',
+    'sv_SE':'sv',
+    'ko_KR':'ko',
+    'pt_PT':'pt',
+    'en':'en',
+    'ja_JP':'ja',
+    'es_ES':'es',
+    'zh_CN':'zh',
+    'de_DE':'de',
+    'fr_FR':'fr',
+    'ru_RU':'ru',
+    'it_IT':'it',
+    'pt_BR':'pt-br'
+}
+
+class gengo_response(object):
+    """ 
+    """
+    def __init__(self, jobs):
+        response = jobs['response'] 
+        job = []
+        jobs_id=[]
+        if isinstance(response, list):
+            job = [ gengo_job(value) for value in response]
+        else:
+            job = [ gengo_job(value) for value in response.values()]
+        jobs.update({'response': job})
+        self._data = jobs
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+class gengo_job(object):
+    """ 
+    """
+    def __init__(self, job):
+        self._data = job
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+class JobsMeta(orm.AbstractModel):
+    
+    _name="jobs.meta"
+    
+    def gengo_authentication(self,cr,uid,ids,context=None):
+        ''' To Send Request and Get Response from Gengo User needs Public and Private
+         key for that user need to signup to gengo and get public and private 
+         key which is provided by gengo to authentic user '''
+    
+        gengo_parameter_pool=self.pool.get('res.users').browse(cr,uid,uid,context)
+        try:
+            gengo = MyGengo(
+                public_key = gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
+                private_key = gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
+                sandbox = True,
+            )
+            return gengo
+        except Exception, e:
+            raise osv.except_osv(_('Warning !'), _(e))
+             
+    def pack_jobs_request(self, cr, uid, translation_term_id, context):
+        jobs={}
+        auto_approve = 0
+        gengo_parameter_pool=self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool =self.pool.get('ir.translation')
+        
+        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
+            auto_approve=1
+
+        for key,value in LANG_CODE_MAPPING.items():
+            if key == context['language_code']:
+                for terms in translation_pool.read(cr, uid, translation_term_id, context=None):
+#                    translation_pool.write(cr,uid,translation_term_id,{'state':'inprogress'})
+                    if re.search(r"[a-z A-Z]",terms['src']):
+                        job = {'type':'text',
+                                'slug':'single::English to '+ LANG_MAPPING.get(value),
+                                'tier':gengo_parameter_pool.company_id.gengo_tier,
+                                'body_src':terms['src'],
+                                'lc_src':'en',
+                                'lc_tgt':value,     
+                                'auto_approve': auto_approve,   
+                                'comment':gengo_parameter_pool.company_id.gengo_comment ,
+                                }
+                        jobs.update({terms['id']: job})
+                return {'jobs': jobs}
+                
+    def unpack_jobs_response(self, jobs):
+        return gengo_response(jobs)
+        
+        

From 7187ef8bb4dad5cb6302f112e941139f68dcd0fa Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 6 Aug 2012 15:55:17 +0530
Subject: [PATCH 029/118] [IMP]: Improve in base_gengo as per pylint standard

bzr revid: aja@tinyerp.com-20120806102517-tretlbhm2ydwetxi
---
 addons/base_gengo/ir_translation.py           |  21 ++-
 addons/base_gengo/ir_translation.xml          |   4 +-
 addons/base_gengo/res_company.py              |  28 ++--
 addons/base_gengo/res_company_view.xml        |   2 +-
 addons/base_gengo/res_lang.py                 |   7 +-
 addons/base_gengo/res_lang_view.xml           |   2 +-
 addons/base_gengo/wizard/__init__.py          |   2 -
 .../base_gengo/wizard/alert_message_gengo.xml |   6 +-
 .../wizard/gengo_response_scheduler.xml       |   4 +-
 .../wizard/gengo_update_translation.py        | 133 +++++++--------
 addons/base_gengo/wizard/wrap_object.py       | 156 +++++++++---------
 11 files changed, 178 insertions(+), 187 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 2c1740b9b04..297e449ecdc 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -19,20 +19,19 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+
 
 class ir_translation(osv.Model):
     _name = "ir.translation"
-    _description="Translation"
-    _inherit="ir.translation"
+    _inherit = "ir.translation"
     _columns = {
-        'gengo_comment':fields.text("Comments"),
-        'gengo_translation':fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
-        'gengo_control':fields.boolean('Active'),
-        'job_id':fields.char('Gengo Job Id',size=32),
-    }
-        
-    _defaults = {
-        'gengo_control':False,
+        'gengo_comment': fields.text("Comments"),
+        'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
+        'gengo_control': fields.boolean('Active'),
+        'job_id': fields.char('Gengo Job Id', size=32),
     }
 
+    _defaults = {
+        'gengo_control': False,
+    }
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 52b081cd7d6..753c12c7e7d 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -13,12 +13,12 @@
                 </search>
             </field>
         </record>
-        
+
         <!-- ir.translation form view -->
         <record model="ir.ui.view" id="view_ir_translation_inherit_base_gengo_form">
             <field name="name">ir.translation.form.inherit</field>
             <field name="inherit_id" ref="base.view_translation_form"/>
-            <field name="model">ir.translation</field>           
+            <field name="model">ir.translation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 2a91d13f1b1..888e675e26b 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -19,24 +19,24 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+
 
 class res_company(osv.Model):
     _name = "res.company"
-    _description = "Companies"
     _inherit = "res.company"
     _columns = {
-           "gengo_private_key":fields.text("Gengo private key"),
-           "gengo_public_key":fields.text("Gengo public key"),
-           "gengo_tier":fields.selection([('machine','Machine'),
-                                          ('standard','Standard'),
-                                          ('pro','Pro'),
-                                          ('ultra','Ultra')],"Tier types", required=True),
-           "gengo_comment":fields.text("comments"),
-           "gengo_auto_approve":fields.boolean("Active",help="Jobs are Automatically Approved by Gengo."),
-           "fields_ids":fields.many2many('ir.model.fields','fields_company_rel','field_id','model_id','fields'),
+           "gengo_private_key": fields.text("Gengo private key"),
+           "gengo_public_key": fields.text("Gengo public key"),
+           "gengo_tier": fields.selection([('machine', 'Machine'),
+                                          ('standard', 'Standard'),
+                                          ('pro', 'Pro'),
+                                          ('ultra', 'Ultra')], "Tier types", required=True),
+           "gengo_comment": fields.text("comments"),
+           "gengo_auto_approve": fields.boolean("Active", help="Jobs are Automatically Approved by Gengo."),
+           "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
-    
-    _defaults={
-        "gengo_tier":"machine",
+
+    _defaults = {
+        "gengo_tier": "machine",
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index a4f6ceffcce..bfa0b1ddf95 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_company_inherit_base_gengo_form">
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>           
+            <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
index 48e5a6db995..e9c88c9fd29 100644
--- a/addons/base_gengo/res_lang.py
+++ b/addons/base_gengo/res_lang.py
@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+
 
 class res_company(osv.Model):
     _name = "res.lang"
-    _description = "Languages"
     _inherit = "res.lang"
 
     _columns = {
-        'gengo_sync':fields.boolean('Active', help='Synchronize Translation Periodically')
+        'gengo_sync': fields.boolean('Active', help='Synchronize Translation Periodically')
     }
-    
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
index efdfeed671e..e0c8edd11aa 100644
--- a/addons/base_gengo/res_lang_view.xml
+++ b/addons/base_gengo/res_lang_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
             <field name="name">res.lang.form.inherit</field>
             <field name="inherit_id" ref="base.res_lang_form"/>
-            <field name="model">res.lang</field>           
+            <field name="model">res.lang</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//sheet/group" position="inside">
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index fe8452a5b64..e7935ca8b1c 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -22,5 +22,3 @@
 import gengo_update_translation
 import wrap_object
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
index 9b16c34552f..304175db031 100644
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -7,16 +7,16 @@
             <field name="model">base.update.translations</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='Synchronize Translation']" position="inside">
+                <xpath expr="//group" position="inside">
                         <group colspan="4">
                             <field name="state" invisible="1"/>
                             <label string="Your Request has been Successfully Send to Gengo" states="done" colspan="4"/>
                         </group>
                         <group colspan="4">
                             <label string="This language is select as Active All Translation Request will be sent by System Automatically" states="inprogress" colspan="4"/>
-                        </group>                        
+                        </group>
                 </xpath>
             </field>
-        </record>    
+        </record>
     </data>
 </openerp>
diff --git a/addons/base_gengo/wizard/gengo_response_scheduler.xml b/addons/base_gengo/wizard/gengo_response_scheduler.xml
index f924dc5e4ee..544235d8a6f 100644
--- a/addons/base_gengo/wizard/gengo_response_scheduler.xml
+++ b/addons/base_gengo/wizard/gengo_response_scheduler.xml
@@ -6,12 +6,12 @@
             <field name="name" >Run Gengo Response Scheduler</field>
             <field eval="True" name="active"/>
             <field name="interval_number">1</field>
-            <field name="interval_type">minutes</field>
+            <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="'base.update.translations'" name="model"></field>
             <field eval="'scheduler_get_gengo_response'" name="function"/>
         </record>
-        
+
         <!--Schedular Sync Request-->
         <record id="gengo_sync_request_scheduler" model="ir.cron">
             <field name="name" >Run Gengo Sync Request Scheduler</field>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index a5186b4ab6d..1a5c90edb0a 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,123 +20,118 @@
 ##############################################################################
 
 from osv import osv, fields
-import tools
-import cStringIO
 from tools.translate import _
 import wrap_object
 import logging
 _logger = logging.getLogger(__name__)
 
+
 class gengo_update_translation(osv.osv_memory):
 
     def send_translation_terms(self, cr, uid, ids, context):
         """Lasy Loading will be perform when user or cron send a bunch of request."""
-        
-        total_term=0
-        limit= 0
-        translation_list=context['translation_term_id']
-        range_jobs=1
-        
+        total_term = 0
+        limit = 0
+        translation_list = context['translation_term_id']
+        range_jobs = 1
         meta = self.pool.get('jobs.meta')
-        translation_pool=self.pool.get('ir.translation')
+        translation_pool = self.pool.get('ir.translation')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        gengo = meta.gengo_authentication(cr,uid,ids,context)
-        job_length=len(context['translation_term_id'])
-        remain=len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
+        gengo = meta.gengo_authentication(cr, uid, ids, context)
+        job_length = len(context['translation_term_id'])
+        remain = len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
         if len(context['translation_term_id']) > wrap_object.REQUEST_LIMIT:
             if remain > 0:
-                range_jobs=(len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
+                range_jobs = (len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
             else:
-                range_jobs=len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
-        for length in range(0,range_jobs):
-            trans_list=[]
+                range_jobs = len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
+        for length in range(0, range_jobs):
+            trans_list = []
             if job_length > wrap_object.REQUEST_LIMIT:
-                job_length-=wrap_object.REQUEST_LIMIT
-                limit+=wrap_object.REQUEST_LIMIT
+                job_length -= wrap_object.REQUEST_LIMIT
+                limit += wrap_object.REQUEST_LIMIT
             else:
-                limit+=remain
+                limit += remain
             for key in translation_list[total_term:limit]:
                 trans_list.append(key)
-            total_term=limit
-            jobs = meta.pack_jobs_request(cr,uid,trans_list,context={'language_code':context['lang']})
-            result = gengo.postTranslationJobs(jobs = jobs) 
-            self.write(cr, uid, ids, {'state':'done'})
+            total_term = limit
+            jobs = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
+            result = gengo.postTranslationJobs(jobs=jobs)
+            self.write(cr, uid, ids, {'state': 'done'})
             if user.company_id.gengo_tier == 'machine':
-                if result.get('opstat')=='ok':
-                     for job in result.get('response').get('jobs'):
-                        for translation_id,val in job.items():
-                            translation_pool.write(cr,uid,int(translation_id),{'value':
-                            val['body_tgt'],'state':'translated','gengo_control':True})
+                if result.get('opstat') == 'ok':
+                    for job in result.get('response').get('jobs'):
+                        for translation_id, val in job.items():
+                            translation_pool.write(cr, uid, int(translation_id), {'value':
+                            val['body_tgt'], 'state': 'translated', 'gengo_control': True})
             else:
                 for job in result.get('response').get('jobs'):
-                    for translation_id,val in job.items():
-                        translation_pool.write(cr,uid,int(translation_id),{'job_id':val['job_id']})
+                    for translation_id, val in job.items():
+                        translation_pool.write(cr, uid, int(translation_id), {'job_id': val['job_id']})
         return
-        
+
     def act_update(self, cr, uid, ids, context=None):
         try:
-            language_pool=self.pool.get('res.lang')
+            language_pool = self.pool.get('res.lang')
             this = self.browse(cr, uid, ids)[0]
-            translation_pool=self.pool.get('ir.translation')
-            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True),('code','=',this.lang)])
-            
+            translation_pool = self.pool.get('ir.translation')
+            lang_search_id = language_pool.search(cr, uid,
+            [('gengo_sync', '=', True), ('code', '=', this.lang)])
+
             if not lang_search_id:
-                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',this.lang)])
-                context.update({'lang':this.lang,'translation_term_id':translation_term_id})
-                self.send_translation_terms(cr,uid,ids,context)
+                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', this.lang)])
+                context.update({'lang': this.lang, 'translation_term_id': translation_term_id})
+                self.send_translation_terms(cr, uid, ids, context)
                 return
             else:
-                self.write(cr, uid, ids, {'state':'inprogress'})
+                self.write(cr, uid, ids, {'state': 'inprogress'})
         except Exception, e:
             raise osv.except_osv(_('Warning !'), _('%s') % e)
-    
+
     def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
-        """Scheduler will be call to get response from gengo and all term will get 
+        """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in reviewable state"""
-        
+
         meta = self.pool.get('jobs.meta')
-        translation_pool=self.pool.get('ir.translation')
-        
-        gengo = meta.gengo_authentication(cr,uid,ids,context)
-        res = gengo.getTranslationJobs(status = "approved")
+        translation_pool = self.pool.get('ir.translation')
+        gengo = meta.gengo_authentication(cr, uid, ids, context)
+        res = gengo.getTranslationJobs(status="approved")
         if res:
             response = meta.unpack_jobs_response(res)
             for job in response.response:
-                translation_id=translation_pool.search(cr,uid,[('job_id','=',job.job_id)],context)
-                response=gengo.getTranslationJob(id = job.job_id)
-                translation_pool.write(cr,uid,translation_id,{'value':response['response']['job']['body_tgt'],'state':'translated','gengo_control':True})
-        
+                translation_id = translation_pool.search(cr, uid, [('job_id', '=', job.job_id)], context)
+                response = gengo.getTranslationJob(id=job.job_id)
+                translation_pool.write(cr, uid, translation_id, {'value': response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+
     def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
-        """This scheduler will send a job request to the gengo , which terms are 
+        """This scheduler will send a job request to the gengo , which terms are
         in translate state and gengo_translation is true"""
-        
+
         if context is None:
-            context={}
+            context = {}
         try:
-            language_pool=self.pool.get('res.lang')
-            translation_pool=self.pool.get('ir.translation')
-            
-            lang_search_id=language_pool.search(cr, uid, [('gengo_sync','=',True)])
-            lang_ids=language_pool.read(cr, uid,lang_search_id)
-            
+            language_pool = self.pool.get('res.lang')
+            translation_pool = self.pool.get('ir.translation')
+            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
+            lang_ids = language_pool.read(cr, uid, lang_search_id)
+
             for lang_id in lang_ids:
-                translation_term_id=translation_pool.search(cr,uid,[('state','=','translate'), ('gengo_translation','=','True'),('lang','=',lang_id['code']),('job_id','=',False)])
-                context.update({'lang':lang_id['code'],'translation_term_id':translation_term_id})
+                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code']), ('job_id', '=', False)])
+                context.update({'lang': lang_id['code'], 'translation_term_id':  translation_term_id})
                 if translation_term_id:
                     self.send_translation_terms(cr, uid, ids, context)
         except Exception, e:
-             _logger.warning('A Gengo Exception is occur:: %s',e)
+            _logger.warning('A Gengo Exception is occur:: %s', e)
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
-    
-    _columns= {
-        'state':fields.selection([('init','init'),('inprogress','inprogress'),('done','done')], 'state'),
+    _columns = {
+        'state': fields.selection([('init', 'init'), ('inprogress', 'inprogress'), ('done', 'done')], 'state'),
     }
-    
-    _defaults= {
-        'state':'init',
+
+    _defaults = {
+        'state': 'init',
     }
 
 gengo_update_translation()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
index 51007bdbd71..01368e5e2cb 100644
--- a/addons/base_gengo/wizard/wrap_object.py
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -20,66 +20,65 @@
 ##############################################################################
 
 from osv import orm, osv
-import tools
 from tools.translate import _
 from mygengo import MyGengo
 import re
 
-REQUEST_LIMIT=10
+REQUEST_LIMIT = 10
 
-LANG_MAPPING={
-    'ar':'Arabic',
-    'id':'Indonesian',
-    'nl':'Dutch',
-    'fr-ca':'French (Canada)',
-    'pl':'Polish',
-    'zh-tw':'Chinese (Traditional)',
-    'sv':'Swedish',
-    'ko':'Korean',
-    'pt':'Portuguese (Europe)',
-    'en':'English',
-    'ja':'Japanese',
-    'es':'Spanish (Spain)',
-    'zh':'Chinese (Simplified)',
-    'de':'German',
-    'fr':'French',
-    'ru':'Russian',
-    'it':'Italian',
-    'pt-br':'Portuguese (Brazil)',
+LANG_MAPPING = {
+    'ar': 'Arabic',
+    'id': 'Indonesian',
+    'nl': 'Dutch',
+    'fr-ca': 'French (Canada)',
+    'pl': 'Polish',
+    'zh-tw': 'Chinese (Traditional)',
+    'sv': 'Swedish',
+    'ko': 'Korean',
+    'pt': 'Portuguese (Europe)',
+    'en': 'English',
+    'ja': 'Japanese',
+    'es': 'Spanish (Spain)',
+    'zh': 'Chinese (Simplified)',
+    'de': 'German',
+    'fr': 'French',
+    'ru': 'Russian',
+    'it': 'Italian',
+    'pt-br': 'Portuguese (Brazil)',
 }
 
 LANG_CODE_MAPPING = {
-    'ar_SA':'ar',
-    'id_ID':'id',
-    'nl_NL':'nl',
-    'fr_CA':'fr-ca',
-    'pl':'pl',
-    'zh_TW':'zh-tw',
-    'sv_SE':'sv',
-    'ko_KR':'ko',
-    'pt_PT':'pt',
-    'en':'en',
-    'ja_JP':'ja',
-    'es_ES':'es',
-    'zh_CN':'zh',
-    'de_DE':'de',
-    'fr_FR':'fr',
-    'ru_RU':'ru',
-    'it_IT':'it',
-    'pt_BR':'pt-br'
+    'ar_SA': 'ar',
+    'id_ID': 'id',
+    'nl_NL': 'nl',
+    'fr_CA': 'fr-ca',
+    'pl': 'pl',
+    'zh_TW': 'zh-tw',
+    'sv_SE': 'sv',
+    'ko_KR': 'ko',
+    'pt_PT': 'pt',
+    'en': 'en',
+    'ja_JP': 'ja',
+    'es_ES': 'es',
+    'zh_CN': 'zh',
+    'de_DE': 'de',
+    'fr_FR': 'fr',
+    'ru_RU': 'ru',
+    'it_IT': 'it',
+    'pt_BR': 'pt-br'
 }
 
+
 class gengo_response(object):
-    """ 
+    """
     """
     def __init__(self, jobs):
-        response = jobs['response'] 
+        response = jobs['response']
         job = []
-        jobs_id=[]
         if isinstance(response, list):
-            job = [ gengo_job(value) for value in response]
+            job = [gengo_job(value) for value in response]
         else:
-            job = [ gengo_job(value) for value in response.values()]
+            job = [gengo_job(value) for value in response.values()]
         jobs.update({'response': job})
         self._data = jobs
 
@@ -92,8 +91,9 @@ class gengo_response(object):
         except KeyError, e:
             raise AttributeError(e)
 
+
 class gengo_job(object):
-    """ 
+    """
     """
     def __init__(self, job):
         self._data = job
@@ -107,53 +107,53 @@ class gengo_job(object):
         except KeyError, e:
             raise AttributeError(e)
 
+
 class JobsMeta(orm.AbstractModel):
-    
-    _name="jobs.meta"
-    
-    def gengo_authentication(self,cr,uid,ids,context=None):
+
+    _name = "jobs.meta"
+
+    def gengo_authentication(self, cr, uid, ids, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to signup to gengo and get public and private 
+         key for that user need to signup to gengo and get public and private
          key which is provided by gengo to authentic user '''
-    
-        gengo_parameter_pool=self.pool.get('res.users').browse(cr,uid,uid,context)
+
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         try:
             gengo = MyGengo(
-                public_key = gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
-                private_key = gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
-                sandbox = True,
+                public_key=gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
+                private_key=gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
             )
             return gengo
         except Exception, e:
             raise osv.except_osv(_('Warning !'), _(e))
-             
-    def pack_jobs_request(self, cr, uid, translation_term_id, context):
-        jobs={}
-        auto_approve = 0
-        gengo_parameter_pool=self.pool.get('res.users').browse(cr, uid, uid, context)
-        translation_pool =self.pool.get('ir.translation')
-        
-        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
-            auto_approve=1
 
-        for key,value in LANG_CODE_MAPPING.items():
+    def pack_jobs_request(self, cr, uid, translation_term_id, context):
+        jobs = {}
+        auto_approve = 0
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool = self.pool.get('ir.translation')
+
+        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
+            auto_approve = 1
+
+        for key, value in LANG_CODE_MAPPING.items():
             if key == context['language_code']:
                 for terms in translation_pool.read(cr, uid, translation_term_id, context=None):
-#                    translation_pool.write(cr,uid,translation_term_id,{'state':'inprogress'})
-                    if re.search(r"[a-z A-Z]",terms['src']):
-                        job = {'type':'text',
-                                'slug':'single::English to '+ LANG_MAPPING.get(value),
-                                'tier':gengo_parameter_pool.company_id.gengo_tier,
-                                'body_src':terms['src'],
-                                'lc_src':'en',
-                                'lc_tgt':value,     
-                                'auto_approve': auto_approve,   
-                                'comment':gengo_parameter_pool.company_id.gengo_comment ,
+                    translation_pool.write(cr, uid, translation_term_id, {'state': 'inprogress'})
+                    if re.search(r"[a-z A-Z]", terms['src']):
+                        job = {'type': 'text',
+                                'slug': 'single::English to' + LANG_MAPPING.get(value),
+                                'tier': gengo_parameter_pool.company_id.gengo_tier,
+                                'body_src': terms['src'],
+                                'lc_src': 'en',
+                                'lc_tgt': value,
+                                'auto_approve': auto_approve,
+                                'comment': gengo_parameter_pool.company_id.gengo_comment,
                                 }
                         jobs.update({terms['id']: job})
                 return {'jobs': jobs}
-                
+
     def unpack_jobs_response(self, jobs):
         return gengo_response(jobs)
-        
-        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1a459a100e34bd46b46458ac66dd39e9850f25cd Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 7 Aug 2012 15:54:51 +0530
Subject: [PATCH 030/118] [IMP]: set domain on the menu 'My Leave Request' to
 filter on user_id

bzr revid: mtr@tinyerp.com-20120807102451-1bc8zsdn1bt40tio
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5b63883ce0a..5dee35fc11f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -295,7 +295,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="context">{}</field>
-            <field name="domain">[('type','=','remove')]</field>
+            <field name="domain">[('type','=','remove'),('employee_id.user_id','=', uid)]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -329,7 +329,7 @@
             <field name="view_id" ref="view_holiday_new_calendar"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
-
+        
         <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">

From fb6158254833e1f918776975a1b35f0509f451ce Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 7 Aug 2012 15:59:05 +0530
Subject: [PATCH 031/118] [IMP]: changed ir.rule for HR/Officer to see all
 Leave/Allocation request

bzr revid: mtr@tinyerp.com-20120807102905-bws5jn24hy9ucjnh
---
 addons/hr_holidays/security/ir_rule.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 33d1a2c107f..ff0270026a4 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -11,7 +11,7 @@
     <record id="property_rule_holidays_officer" model="ir.rule">
         <field name="name">Holidays Officer</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('employee_id.parent_id.user_id','=',user.id)]</field>
+        <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
     

From e9992a5a17ed7bada5a91a7f66b7593122ddf2d2 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 7 Aug 2012 16:54:28 +0530
Subject: [PATCH 032/118] [IMP]: reorganised 'Descripton' field in the
 view,removed from the group

bzr revid: mtr@tinyerp.com-20120807112428-othm98knqk73gs2s
---
 addons/hr_holidays/hr_holidays_view.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5dee35fc11f..1f269f88f86 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -102,11 +102,8 @@
                 </header>
                 <sheet string="Leave Request">
                     <group>
-                    	<group col="3">
-                    		<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    	</group>
-                        <newline></newline>
                         <group>
+                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
@@ -160,11 +157,8 @@
                 </header>
                 <sheet>
                     <group>
-	                    <group>
-	                    	<field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-	                    </group>
-	                    <newline/>
                         <group>
+                            <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>

From f517411cc746b2ea1afbf8243d20921dc50bb65c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 9 Aug 2012 16:59:26 +0200
Subject: [PATCH 033/118] imp

bzr revid: fp@tinyerp.com-20120809145926-7rocmvgxefm9w5w1
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5c6e02d7461..8550fc415e0 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -179,7 +179,7 @@
                                             <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                <div>
+                                                <div class="oe_module_vignette">
                                                 <a type="edit">
                                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>

From 81a44cef8e3d09c77739d91d86f8b367414652c7 Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 14 Aug 2012 11:14:25 +0530
Subject: [PATCH 034/118] [IMP]: provided static string for crm.meeting if desc
 is not provided on Leave Req

bzr revid: mtr@tinyerp.com-20120814054425-eqej763roe0qf60i
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e36083c335d..d3021cf4c39 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -266,7 +266,7 @@ class hr_holidays(osv.osv):
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
-                    'name': record.name,
+                    'name': record.name or _('Leave Request'),
                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
                     'description': record.notes,

From 0c20817c37e166893d5e0d02d5a299e38c0f634b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 14 Aug 2012 17:50:50 +0530
Subject: [PATCH 035/118] [IMP] hr_holidays: clean workflow of hr_holidays

bzr revid: hmo@tinyerp.com-20120814122050-8pax7b6e06urcyvv
---
 addons/hr_holidays/hr_holidays.py           | 57 +++++++------
 addons/hr_holidays/hr_holidays_view.xml     | 23 +-----
 addons/hr_holidays/hr_holidays_workflow.xml | 88 ++++++++++++++-------
 3 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index d3021cf4c39..a2c9324914b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -124,8 +124,6 @@ class hr_holidays(osv.osv):
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
@@ -135,8 +133,8 @@ class hr_holidays(osv.osv):
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
-        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
         'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
     }
@@ -244,25 +242,26 @@ class hr_holidays(osv.osv):
             self.unlink(cr, uid, to_unlink, context=context)
         return True
 
-    def holidays_validate(self, cr, uid, ids, context=None):
+    def holidays_first_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        self.holidays_validate_notificate(cr, uid, ids, context=context)
+        self.holidays_first_validate_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
 
-    def holidays_validate2(self, cr, uid, ids, context=None):
+    def holidays_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
         self.write(cr, uid, ids, {'state':'validate'})
         data_holiday = self.browse(cr, uid, ids)
-        holiday_ids = []
         for record in data_holiday:
-            if record.holiday_status_id.double_validation:
-                holiday_ids.append(record.id)
+            if record.double_validation:
+                self.write(cr, uid, [record.id], {'manager_id2': manager})
+            else:
+                self.write(cr, uid, [record.id], {'manager_id': manager})
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
@@ -301,9 +300,7 @@ class hr_holidays(osv.osv):
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
-        if holiday_ids:
-            self.holidays_valid2_notificate(cr, uid, holiday_ids, context=context)
-            self.write(cr, uid, holiday_ids, {'manager_id2': manager})
+        self.holidays_validate_notificate(cr, uid, ids, context=context)
         return True
 
     def holidays_confirm(self, cr, uid, ids, context=None):
@@ -311,15 +308,16 @@ class hr_holidays(osv.osv):
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
-    def holidays_refuse(self, cr, uid, ids, approval, context=None):
+    def holidays_refuse(self, cr, uid, ids, context=None):
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        if approval == 'first_approval':
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
-        else:
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
-        self.holidays_refuse_notificate(cr, uid, ids, approval, context=context)
+        for holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.state == 'validate1':
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id': manager})
+            else:
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id2': manager})
+        self.holidays_refuse_notificate(cr, uid, ids, context=context)
         self.holidays_cancel(cr, uid, ids, context=context)
         return True
 
@@ -333,7 +331,7 @@ class hr_holidays(osv.osv):
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
             for request in record.linked_request_ids or []:
-                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
+                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
 
         self._remove_resource_leave(cr, uid, ids, context=context)
         return True
@@ -355,7 +353,7 @@ class hr_holidays(osv.osv):
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
         result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'confirm' and obj.employee_id.parent_id:
+            if obj.state == 'confirm' and obj.holiday_type == 'employee' and obj.employee_id.parent_id:
                 result[obj.id] = [obj.employee_id.parent_id.user_id.id]
             elif obj.state == 'validate1':
                 # get group_hr_manager: everyone will be warned of second validation
@@ -389,24 +387,25 @@ class hr_holidays(osv.osv):
                     _("The %s request has been <b>submitted</b> and is waiting for validation by the manager.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
     
+    def holidays_first_validate_notificate(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids):
+            self.message_append_note(cr, uid, [obj.id], _('System notification'),
+                _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
+                % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+            
     def holidays_validate_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            if obj.holiday_status_id.double_validation:
+            if obj.double_validation:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
+                    _("The %s request has been <b>double validated</b>. The validation process is now over.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
             else:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
                     _("The %s request has been <b>approved</b>. The validation process is now over.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
     
-    def holidays_valid2_notificate(self, cr, uid, ids, context=None):
-        for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>double validated</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
     
-    def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
+    def holidays_refuse_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
             self.message_append_note(cr, uid, [obj.id], _('System notification'),
                     _("The %s request has been <b>refused</b>. The validation process is now over.")
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1f269f88f86..66a3e8cb62f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -96,7 +96,7 @@
                 <header>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
@@ -123,16 +123,6 @@
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <group colspan="4">
-                            <group>
-                                <group>
-                                    <field name="double_validation" invisible="1"/>
-                                </group>
-                                <group>
-                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                                </group>
-                            </group>
-                    </group>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -163,17 +153,12 @@
                             <field name="number_of_days_temp"/>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
-                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
+                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>
                         </group>
                     </group>
-                    <group>
-                        <field name="double_validation" invisible="1"/>
-                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                    </group>
-                    <newline/>
                     <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 9cf13f0e8d7..a2e1d54f96c 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,7 +2,16 @@
 <openerp>
 <data>
 
-    <!-- Workflow definition -->
+    <!-- Workflow definition 
+        1. draft->submitted (no signal)
+        2. submitted->accepted (validate signal) if not double_validation
+        2. submitted -> first_accepted (validate signal) if double_validation
+        2. submitted->refused (refuse signal)
+        3. accepted->refused (refuse signal)
+        4. first_accepted -> accepted (second_validate  signal)
+        4. first_accepted -> refused (refuse signal)
+
+    -->
 
     <record model="workflow" id="wkf_holidays">
         <field name="name">hr.wkf.holidays</field>
@@ -10,13 +19,13 @@
         <field name="on_create">True</field>
     </record>
 
-    <record model="workflow.activity" id="act_draft">
+    <record model="workflow.activity" id="act_draft"> <!-- draft -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="flow_start">True</field>
         <field name="name">draft</field>
     </record>
 
-    <record model="workflow.activity" id="act_confirm">
+    <record model="workflow.activity" id="act_confirm"> <!-- submitted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">confirm</field>
         <field name="kind">function</field>
@@ -24,73 +33,94 @@
         <field name="split_mode">OR</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate">
+    <record model="workflow.activity" id="act_validate"> <!-- accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">validate</field>
         <field name="kind">function</field>
         <field name="action">holidays_validate()</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate1">
+    <record model="workflow.activity" id="act_validate1"> <!-- first_accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">second_validate</field>
+        <field name="name">first_validate</field>
         <field name="kind">function</field>
-        <field name="action">holidays_validate2()</field>
+        <field name="action">holidays_first_validate()</field>
+        <field name="split_mode">OR</field>
     </record>
 
 
-    <record model="workflow.activity" id="act_refuse">
+    <record model="workflow.activity" id="act_refuse"> <!-- refused -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
         <field name="flow_stop">True</field>
-        <field name="kind">stopall</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_refuse()</field>
     </record>
 
     <!--
         workflow transition
     -->
 
-    <record model="workflow.transition" id="t1">
+    <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (no signal) -->
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
     </record>
 
-    <record model="workflow.transition" id="t2">
+    <record model="workflow.transition" id="holiday_confirm2validate"> <!-- 2. submitted->accepted (validate signal) if not double_validation-->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
+        <field name="condition">not double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="holiday_confirm2validate1"> <!-- 2. submitted -> first_accepted (validate signal) if double_validation-->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="condition">double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+
+    <record model="workflow.transition" id="holiday_confirm2refuse"> <!-- 2. submitted->refused (refuse signal) -->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
         <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t3">
-        <field name="act_from" ref="act_confirm" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('first_approval')</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t4">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('second_approval')</field>
+        <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t8">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+
+    <record model="workflow.transition" id="holiday_validate1_validate"> <!-- 4. first_accepted -> accepted (second_validate  signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_validate" />
+        <field name="condition">True</field>
         <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_manager" />
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
-        <field name="condition">not holiday_status_id.double_validation</field>
-        <field name="signal" eval="False"/>
+    <record model="workflow.transition" id="holiday_validate1_refuse"> <!-- 4. first_accepted->refused (refuse signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
 </data>

From b3079507cd79db087192fff373296702b51ccd01 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 17 Aug 2012 11:57:30 +0530
Subject: [PATCH 036/118] [IMP]: Improve in gengo_update_translation  method

bzr revid: aja@tinyerp.com-20120817062730-r3mfsyinj3acdxqn
---
 addons/base_gengo/ir_translation.py           |  1 -
 addons/base_gengo/wizard/__init__.py          |  1 +
 .../base_gengo/wizard/alert_message_gengo.xml | 20 +++---
 .../base_gengo/wizard/gengo_update_message.py | 44 +++++++++++++
 .../wizard/gengo_update_translation.py        | 65 ++++++++++---------
 5 files changed, 87 insertions(+), 44 deletions(-)
 create mode 100644 addons/base_gengo/wizard/gengo_update_message.py

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 297e449ecdc..e4ba7716686 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -29,7 +29,6 @@ class ir_translation(osv.Model):
         'gengo_comment': fields.text("Comments"),
         'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control': fields.boolean('Active'),
-        'job_id': fields.char('Gengo Job Id', size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index e7935ca8b1c..ef9652d93a6 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 import gengo_update_translation
 import wrap_object
+import gengo_update_message
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
index 304175db031..84bfc7bb484 100644
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Update Message Form View -->
         <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
-            <field name="name">update.translations.serial.wizard.view</field>
-            <field name="inherit_id" ref="base.wizard_update_translations"/>
-            <field name="model">base.update.translations</field>
+            <field name="name">gengo.update.message.form</field>
+            <field name="model">gengo.update.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="//group" position="inside">
-                        <group colspan="4">
-                            <field name="state" invisible="1"/>
-                            <label string="Your Request has been Successfully Send to Gengo" states="done" colspan="4"/>
-                        </group>
-                        <group colspan="4">
-                            <label string="This language is select as Active All Translation Request will be sent by System Automatically" states="inprogress" colspan="4"/>
-                        </group>
-                </xpath>
+                <form string="Update Gengo Data" version="7.0">
+                    <group>
+                        <field name='name'/>
+                    </group>
+                </form>
             </field>
         </record>
     </data>
diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
new file mode 100644
index 00000000000..214b9978a19
--- /dev/null
+++ b/addons/base_gengo/wizard/gengo_update_message.py
@@ -0,0 +1,44 @@
+# -*- 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 osv
+from osv import fields
+
+
+class gengo_update_message(osv.osv):
+    """Update Message"""
+
+    _name = "gengo.update.message"
+    _description = "Update Message"
+    _columns = {
+        'name': fields.text('Message', readonly=True),
+        }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context == None:
+            context = {}
+        res = super(gengo_update_message, self).default_get(cr, uid, fields, context=context)
+        res.update({'name': context.get('message')})
+        return res
+
+gengo_update_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 1a5c90edb0a..76ac7baa980 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -1,4 +1,4 @@
-    # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Business Applications
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-from tools.translate import _
+from osv import osv
 import wrap_object
 import logging
 _logger = logging.getLogger(__name__)
@@ -55,22 +54,19 @@ class gengo_update_translation(osv.osv_memory):
             for key in translation_list[total_term:limit]:
                 trans_list.append(key)
             total_term = limit
-            jobs = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
-            result = gengo.postTranslationJobs(jobs=jobs)
-            self.write(cr, uid, ids, {'state': 'done'})
+            request = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
+            result = gengo.postTranslationJobs(jobs=request)
             if user.company_id.gengo_tier == 'machine':
-                if result.get('opstat') == 'ok':
-                    for job in result.get('response').get('jobs'):
-                        for translation_id, val in job.items():
-                            translation_pool.write(cr, uid, int(translation_id), {'value':
-                            val['body_tgt'], 'state': 'translated', 'gengo_control': True})
-            else:
-                for job in result.get('response').get('jobs'):
-                    for translation_id, val in job.items():
-                        translation_pool.write(cr, uid, int(translation_id), {'job_id': val['job_id']})
-        return
+                response = meta.unpack_jobs_response(result)
+                for job in response.response[1]:
+                    for jobs in job:
+                        translation_term_id = translation_pool.search(cr, uid, [('src', '=', job[jobs]['body_src'])])
+                        translation_pool.write(cr, uid, translation_term_id, {'value': job[jobs]['body_tgt'], 'state': 'translated', 'gengo_control': True})
+            return
 
     def act_update(self, cr, uid, ids, context=None):
+        if context == None:
+            context={}
         try:
             language_pool = self.pool.get('res.lang')
             this = self.browse(cr, uid, ids)[0]
@@ -82,16 +78,29 @@ class gengo_update_translation(osv.osv_memory):
                 translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', this.lang)])
                 context.update({'lang': this.lang, 'translation_term_id': translation_term_id})
                 self.send_translation_terms(cr, uid, ids, context)
-                return
+                msg = "Your Request has been Successfully Send to Gengo"
             else:
-                self.write(cr, uid, ids, {'state': 'inprogress'})
+                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
+
         except Exception, e:
-            raise osv.except_osv(_('Warning !'), _('%s') % e)
+            msg = '%s' % e
+        context.update({'message': msg})
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'gengo.update.message',
+                'views': [(resource_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+               'context': context,
+            }
 
     def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
         """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in reviewable state"""
-
         meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
         gengo = meta.gengo_authentication(cr, uid, ids, context)
@@ -99,9 +108,10 @@ class gengo_update_translation(osv.osv_memory):
         if res:
             response = meta.unpack_jobs_response(res)
             for job in response.response:
-                translation_id = translation_pool.search(cr, uid, [('job_id', '=', job.job_id)], context)
-                response = gengo.getTranslationJob(id=job.job_id)
-                translation_pool.write(cr, uid, translation_id, {'value': response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+                job_response=gengo.getTranslationJob(id=job['job_id'])
+                jobs_response = meta.unpack_jobs_response(job_response)
+                translation_id = translation_pool.search(cr, uid, [('src', '=', jobs_response.response[0]['body_src'])], context)
+                translation_pool.write(cr, uid, translation_id, {'value': jobs_response.response[0]['body_tgt'], 'state': 'translated', 'gengo_control': True})
 
     def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
         """This scheduler will send a job request to the gengo , which terms are
@@ -116,7 +126,7 @@ class gengo_update_translation(osv.osv_memory):
             lang_ids = language_pool.read(cr, uid, lang_search_id)
 
             for lang_id in lang_ids:
-                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code']), ('job_id', '=', False)])
+                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code'])])
                 context.update({'lang': lang_id['code'], 'translation_term_id':  translation_term_id})
                 if translation_term_id:
                     self.send_translation_terms(cr, uid, ids, context)
@@ -125,13 +135,6 @@ class gengo_update_translation(osv.osv_memory):
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
-    _columns = {
-        'state': fields.selection([('init', 'init'), ('inprogress', 'inprogress'), ('done', 'done')], 'state'),
-    }
-
-    _defaults = {
-        'state': 'init',
-    }
 
 gengo_update_translation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a4ae69e9ee5ea482029dc9b42fd1a7920cdcc60b Mon Sep 17 00:00:00 2001
From: Meera Trambadia <mtr@tinyerp.com>
Date: Tue, 21 Aug 2012 15:20:17 +0530
Subject: [PATCH 037/118] [IMP] hr_holidays: Now only 'Refuse' button is there
 on approved state

bzr revid: mtr@tinyerp.com-20120821095017-a5f98ihyooe6a344
---
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cf98d0eebc..c975fb40119 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -94,7 +94,7 @@
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
+                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
@@ -138,8 +138,8 @@
                 <header>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" />
+                    <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>

From 1641bc490aef59d15e14b96febed2ca0afbfd048 Mon Sep 17 00:00:00 2001
From: Patrik <>
Date: Wed, 22 Aug 2012 16:07:07 +0530
Subject: [PATCH 038/118] [FIX] Solve the problem of read method of res.user
 when id in long

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

bzr revid: jir@tinyerp.com-20120822103707-zkucpqtalyi8ncpt
---
 openerp/addons/base/res/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index cddc02673b8..7427a0d2717 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -188,7 +188,7 @@ class res_users(osv.osv):
         result = super(res_users, self).read(cr, uid, ids, fields, context, load)
         canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', False)
         if not canwrite:
-            if isinstance(ids, (int, float)):
+            if isinstance(ids, (int, long)):
                 result = override_password(result)
             else:
                 result = map(override_password, result)

From bc0b3c6cc5ed58c141989d547613ae353afe7750 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 23 Aug 2012 19:12:57 +0530
Subject: [PATCH 039/118] [IMP]: improve in base_gengo sync and add schedular
 for response and request of terms

bzr revid: aja@tinyerp.com-20120823134257-37tzof2yiwfnsr1e
---
 addons/base_gengo/__openerp__.py              |   4 +-
 .../base_gengo/gengo_sync_schedular_data.xml  |  26 +++
 addons/base_gengo/ir_translation.py           |   1 +
 .../wizard/gengo_response_scheduler.xml       |  26 ---
 .../wizard/gengo_update_translation.py        | 159 ++++++++----------
 addons/base_gengo/wizard/wrap_object.py       |  51 +++---
 6 files changed, 120 insertions(+), 147 deletions(-)
 create mode 100644 addons/base_gengo/gengo_sync_schedular_data.xml
 delete mode 100644 addons/base_gengo/wizard/gengo_response_scheduler.xml

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index e8fe7e0df17..1173d513493 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -28,12 +28,12 @@ Automated Translations through Gengo API
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'init_xml': ['gengo_sync_schedular_data.xml'],
     'update_xml': [
         'ir_translation.xml',
         'res_company_view.xml',
         'res_lang_view.xml',
-        'wizard/gengo_response_scheduler.xml',
+
         'wizard/alert_message_gengo.xml',
            ],
     'demo_xml': [],
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
new file mode 100644
index 00000000000..ab78b59e0b8
--- /dev/null
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--Scheduler sync Receive Request-->
+        <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Response)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'_sync_response'" name="function"/>
+        </record>
+
+        <!--Schedular Sync Send Request-->
+        <record id="gengo_sync_send_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Request)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'_sync_request'" name="function"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index e4ba7716686..7bda5023592 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -29,6 +29,7 @@ class ir_translation(osv.Model):
         'gengo_comment': fields.text("Comments"),
         'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control': fields.boolean('Active'),
+        'job_id':fields.char('Gengo Job Id',size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/wizard/gengo_response_scheduler.xml b/addons/base_gengo/wizard/gengo_response_scheduler.xml
deleted file mode 100644
index 544235d8a6f..00000000000
--- a/addons/base_gengo/wizard/gengo_response_scheduler.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--Scheduler Gengo Response-->
-        <record id="gengo_response_scheduler" model="ir.cron">
-            <field name="name" >Run Gengo Response Scheduler</field>
-            <field eval="True" name="active"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
-            <field eval="'scheduler_get_gengo_response'" name="function"/>
-        </record>
-
-        <!--Schedular Sync Request-->
-        <record id="gengo_sync_request_scheduler" model="ir.cron">
-            <field name="name" >Run Gengo Sync Request Scheduler</field>
-            <field eval="True" name="active"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
-            <field eval="'scheduler_get_gengo_sync_request'" name="function"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 76ac7baa980..d54358c32d9 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,121 +20,104 @@
 ##############################################################################
 
 from osv import osv
-import wrap_object
+import wrap_object as local
 import logging
 _logger = logging.getLogger(__name__)
 
+cron_vals = {
+'name': 'Gengo Sync',
+'active': True,
+'interval_number': 30,
+'interval_type': 'minutes',
+'numbercall': -1,
+'model': "'base.update.translations'",
+'function': ""
+}
 
-class gengo_update_translation(osv.osv_memory):
 
-    def send_translation_terms(self, cr, uid, ids, context):
-        """Lasy Loading will be perform when user or cron send a bunch of request."""
-        total_term = 0
-        limit = 0
-        translation_list = context['translation_term_id']
-        range_jobs = 1
-        meta = self.pool.get('jobs.meta')
+class base_update_translation(osv.osv_memory):
+    def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
+        for jobs in response['jobs']:
+            vals = {}
+            for t_id, res in jobs.items():
+                if tier == "machine":
+                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
+                else:
+                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+                translation_pool.write(cr, uid, [t_id], vals, context)
+        return
+
+
+    def _send_translation_terms(self, cr, uid, ids, trg_lang, term_ids, context):
+        """
+        Lazy Polling will be perform when user or cron request for the trnalstion.
+        """
+        meta = self.pool.get('jobs.meta')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         gengo = meta.gengo_authentication(cr, uid, ids, context)
-        job_length = len(context['translation_term_id'])
-        remain = len(context['translation_term_id']) % wrap_object.REQUEST_LIMIT
-        if len(context['translation_term_id']) > wrap_object.REQUEST_LIMIT:
-            if remain > 0:
-                range_jobs = (len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT) + 1
-            else:
-                range_jobs = len(context['translation_term_id']) / wrap_object.REQUEST_LIMIT
-        for length in range(0, range_jobs):
-            trans_list = []
-            if job_length > wrap_object.REQUEST_LIMIT:
-                job_length -= wrap_object.REQUEST_LIMIT
-                limit += wrap_object.REQUEST_LIMIT
-            else:
-                limit += remain
-            for key in translation_list[total_term:limit]:
-                trans_list.append(key)
-            total_term = limit
-            request = meta.pack_jobs_request(cr, uid, trans_list, context={'language_code': context['lang']})
-            result = gengo.postTranslationJobs(jobs=request)
-            if user.company_id.gengo_tier == 'machine':
-                response = meta.unpack_jobs_response(result)
-                for job in response.response[1]:
-                    for jobs in job:
-                        translation_term_id = translation_pool.search(cr, uid, [('src', '=', job[jobs]['body_src'])])
-                        translation_pool.write(cr, uid, translation_term_id, {'value': job[jobs]['body_tgt'], 'state': 'translated', 'gengo_control': True})
-            return
+        request = meta.pack_jobs_request(cr, uid, term_ids, trg_lang, context)
+        result = gengo.postTranslationJobs(jobs=request)
+        if result['opstat'] == 'ok':
+            self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+        return True
+
+    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+        cron_pool = self.pool.get('ir.cron')
+        try:
+            res = self.pool.get('ir.model.data')._get_id(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], {'active': True}, context)
+        except:
+            cron_vals.update({'name': name, "function": fn})
+            return cron_pool.create(cr, uid, cron_vals, context)
 
     def act_update(self, cr, uid, ids, context=None):
         if context == None:
-            context={}
-        try:
-            language_pool = self.pool.get('res.lang')
-            this = self.browse(cr, uid, ids)[0]
-            translation_pool = self.pool.get('ir.translation')
-            lang_search_id = language_pool.search(cr, uid,
-            [('gengo_sync', '=', True), ('code', '=', this.lang)])
+            context = {}
+        lang_pool = self.pool.get('res.lang')
+        for res in self.browse(cr, uid, ids, context):
+            lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
+            lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
+        res = super(base_update_translation, self).act_update(cr, uid, ids, context)
+        self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_request', context)
+        self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_response', context)
+        return {}
 
-            if not lang_search_id:
-                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', this.lang)])
-                context.update({'lang': this.lang, 'translation_term_id': translation_term_id})
-                self.send_translation_terms(cr, uid, ids, context)
-                msg = "Your Request has been Successfully Send to Gengo"
-            else:
-                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
-
-        except Exception, e:
-            msg = '%s' % e
-        context.update({'message': msg})
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'gengo.update.message',
-                'views': [(resource_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-               'context': context,
-            }
-
-    def scheduler_get_gengo_response(self, cr, uid, ids=0, context=None):
+    def _sync_response(self, cr, uid, ids=0, context=None):
         """Scheduler will be call to get response from gengo and all term will get
-        by scheduler which terms are in reviewable state"""
+        by scheduler which terms are in approved state"""
         meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
         gengo = meta.gengo_authentication(cr, uid, ids, context)
-        res = gengo.getTranslationJobs(status="approved")
-        if res:
-            response = meta.unpack_jobs_response(res)
-            for job in response.response:
-                job_response=gengo.getTranslationJob(id=job['job_id'])
-                jobs_response = meta.unpack_jobs_response(job_response)
-                translation_id = translation_pool.search(cr, uid, [('src', '=', jobs_response.response[0]['body_src'])], context)
-                translation_pool.write(cr, uid, translation_id, {'value': jobs_response.response[0]['body_tgt'], 'state': 'translated', 'gengo_control': True})
+        translation_id = translation_pool.search(cr, uid, [('job_id', '!=', False), ('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
+        for trns in translation_pool.browse(cr, uid, translation_id, context):
+            job_response = gengo.getTranslationJob(id=trns.job_id)
+            if job_response['response']['job']['status'] == 'approved':
+                translation_pool.write(cr, uid, translation_id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+        return True
 
-    def scheduler_get_gengo_sync_request(self, cr, uid, ids=0, context=None):
+    def _sync_request(self, cr, uid, ids=0, context=None):
         """This scheduler will send a job request to the gengo , which terms are
         in translate state and gengo_translation is true"""
-
         if context is None:
             context = {}
         try:
             language_pool = self.pool.get('res.lang')
+            trg_lang = self.browse(cr, uid, ids)[0]
             translation_pool = self.pool.get('ir.translation')
-            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
-            lang_ids = language_pool.read(cr, uid, lang_search_id)
-
-            for lang_id in lang_ids:
-                translation_term_id = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', 'True'), ('lang', '=', lang_id['code'])])
-                context.update({'lang': lang_id['code'], 'translation_term_id':  translation_term_id})
-                if translation_term_id:
-                    self.send_translation_terms(cr, uid, ids, context)
+            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True), ('code', '=', trg_lang.lang)])
+            if not lang_search_id:
+                term_ids = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', 'True'), ('lang', '=', trg_lang.lang)], limit=local.LIMIT)
+                self._send_translation_terms(cr, uid, ids, trg_lang.lang, term_ids, context)
+                msg = "Your Request has been Successfully Send to Gengo"
+            else:
+                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
+            context.update({'message': msg})
         except Exception, e:
-            _logger.warning('A Gengo Exception is occur:: %s', e)
+            _logger.warning("%s", e)
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
 
-gengo_update_translation()
+base_update_translation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
index 01368e5e2cb..3ded7af12b1 100644
--- a/addons/base_gengo/wizard/wrap_object.py
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -24,7 +24,7 @@ from tools.translate import _
 from mygengo import MyGengo
 import re
 
-REQUEST_LIMIT = 10
+LIMIT = 20
 
 LANG_MAPPING = {
     'ar': 'Arabic',
@@ -73,13 +73,6 @@ class gengo_response(object):
     """
     """
     def __init__(self, jobs):
-        response = jobs['response']
-        job = []
-        if isinstance(response, list):
-            job = [gengo_job(value) for value in response]
-        else:
-            job = [gengo_job(value) for value in response.values()]
-        jobs.update({'response': job})
         self._data = jobs
 
     def __getitem__(self, name):
@@ -123,37 +116,33 @@ class JobsMeta(orm.AbstractModel):
                 public_key=gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
                 private_key=gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
                 sandbox=True,
-            )
+            )   
             return gengo
         except Exception, e:
             raise osv.except_osv(_('Warning !'), _(e))
 
-    def pack_jobs_request(self, cr, uid, translation_term_id, context):
+    def pack_jobs_request(self, cr, uid, term_ids, trg_lang, context):
         jobs = {}
         auto_approve = 0
         gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
-
-        if gengo_parameter_pool.company_id.gengo_auto_approve == True:
+        if gengo_parameter_pool.company_id.gengo_auto_approve:
             auto_approve = 1
+        g_lang = LANG_CODE_MAPPING.get(trg_lang)
+        if g_lang:
+            for terms in translation_pool.browse(cr, uid, term_ids, context):
+                #NOTE: Discard none string and only special char string 
+                if re.search(r"[a-z A-Z]", terms.src) and terms.src:
+                    job = {'type': 'text',
+                            'slug': 'single::English to' + LANG_MAPPING.get(g_lang),
+                            'tier': gengo_parameter_pool.company_id.gengo_tier,
+                            'body_src': terms.src,
+                            'lc_src': 'en',
+                            'lc_tgt': g_lang,
+                            'auto_approve': auto_approve,
+                            'comment': gengo_parameter_pool.company_id.gengo_comment,
+                            }
+                    jobs.update({terms.id: job})
+        return {'jobs': jobs}
 
-        for key, value in LANG_CODE_MAPPING.items():
-            if key == context['language_code']:
-                for terms in translation_pool.read(cr, uid, translation_term_id, context=None):
-                    translation_pool.write(cr, uid, translation_term_id, {'state': 'inprogress'})
-                    if re.search(r"[a-z A-Z]", terms['src']):
-                        job = {'type': 'text',
-                                'slug': 'single::English to' + LANG_MAPPING.get(value),
-                                'tier': gengo_parameter_pool.company_id.gengo_tier,
-                                'body_src': terms['src'],
-                                'lc_src': 'en',
-                                'lc_tgt': value,
-                                'auto_approve': auto_approve,
-                                'comment': gengo_parameter_pool.company_id.gengo_comment,
-                                }
-                        jobs.update({terms['id']: job})
-                return {'jobs': jobs}
-
-    def unpack_jobs_response(self, jobs):
-        return gengo_response(jobs)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From fedd324e6d6cc774bbcc315096a6388b2e0eb2f7 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 24 Aug 2012 18:51:25 +0530
Subject: [PATCH 040/118] [IMP]: Improve send and receive queue

bzr revid: aja@tinyerp.com-20120824132125-a74lw82hm77al1zh
---
 .../wizard/gengo_update_translation.py        | 121 ++++++++++++------
 addons/base_gengo/wizard/wrap_object.py       |  73 +++++++----
 2 files changed, 125 insertions(+), 69 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index d54358c32d9..61bf9b5ed7d 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -25,17 +25,18 @@ import logging
 _logger = logging.getLogger(__name__)
 
 cron_vals = {
-'name': 'Gengo Sync',
-'active': True,
-'interval_number': 30,
-'interval_type': 'minutes',
-'numbercall': -1,
-'model': "'base.update.translations'",
-'function': ""
+    'name': 'Gengo Sync',
+    'active': True,
+    'interval_number': 30,
+    'interval_type': 'minutes',
+    'numbercall': -1,
+    'model': "'base.update.translations'",
+    'function': ""
 }
 
 
 class base_update_translation(osv.osv_memory):
+
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:
@@ -48,25 +49,30 @@ class base_update_translation(osv.osv_memory):
                 translation_pool.write(cr, uid, [t_id], vals, context)
         return
 
-
-    def _send_translation_terms(self, cr, uid, ids, trg_lang, term_ids, context):
+    def _send_translation_terms(self, cr, uid, ids, term_ids, context):
         """
         Lazy Polling will be perform when user or cron request for the trnalstion.
         """
         meta = self.pool.get('jobs.meta')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        gengo = meta.gengo_authentication(cr, uid, ids, context)
-        request = meta.pack_jobs_request(cr, uid, term_ids, trg_lang, context)
-        result = gengo.postTranslationJobs(jobs=request)
-        if result['opstat'] == 'ok':
-            self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        if flag:
+
+            request = meta.pack_jobs_request(cr, uid, term_ids, context)
+            if request:
+                result = gengo.postTranslationJobs(jobs=request)
+                if result['opstat'] == 'ok':
+                    self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+        else:
+            _logger.error(gengo)
         return True
 
     def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
         cron_pool = self.pool.get('ir.cron')
         try:
-            res = self.pool.get('ir.model.data')._get_id(cr, uid, 'base_gengo', xml_id)
-            cron_pool.write(cr, uid, [res], {'active': True}, context)
+            res = []
+            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
             cron_vals.update({'name': name, "function": fn})
             return cron_pool.create(cr, uid, cron_vals, context)
@@ -75,46 +81,77 @@ class base_update_translation(osv.osv_memory):
         if context == None:
             context = {}
         lang_pool = self.pool.get('res.lang')
-        for res in self.browse(cr, uid, ids, context):
-            lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
-            lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-        res = super(base_update_translation, self).act_update(cr, uid, ids, context)
-        self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_request', context)
-        self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'gengo_sync_send_request_scheduler', '_sync_response', context)
-        return {}
+        super(base_update_translation, self).act_update(cr, uid, ids, context)
+        msg = "1. Translation file loaded succesfully.\n2. Processing Gengo Translation:\n"
+        meta = self.pool.get('jobs.meta')
+        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        if not flag:
+            msg += gengo
+        else:
+            for res in self.browse(cr, uid, ids, context):
+                lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
+                lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True),
+                ('id', '=', lang_id[0])])
+                if lang_search:
+                    msg += 'This language %s is alreay in queue for processing.' % (res.lang)
+                else:
+                    msg += "Translation for language %s is queued for processing." % (res.lang)
+                    lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
+                    _logger.info("Your translation request for language '%s' has been send sucessfully.", res.lang)
 
-    def _sync_response(self, cr, uid, ids=0, context=None):
+                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
+                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
+                self._sync_request(cr, uid, ids, context)
+        context.update({'message': msg})
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
+        view_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                 'view_type': 'form',
+                 'view_mode': 'form',
+                 'res_model': 'gengo.update.message',
+                 'views': [(view_id, 'form')],
+                 'type': 'ir.actions.act_window',
+                 'target': 'new',
+                 'context': context,
+             }
+
+    def _sync_response(self, cr, uid, ids=False, context=None):
         """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in approved state"""
         meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
-        gengo = meta.gengo_authentication(cr, uid, ids, context)
-        translation_id = translation_pool.search(cr, uid, [('job_id', '!=', False), ('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
-        for trns in translation_pool.browse(cr, uid, translation_id, context):
-            job_response = gengo.getTranslationJob(id=trns.job_id)
-            if job_response['response']['job']['status'] == 'approved':
-                translation_pool.write(cr, uid, translation_id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        if not flag:
+            _logger.warning("%s", gengo)
+        else:
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
+            for trns in translation_pool.browse(cr, uid, translation_id, context):
+                if trns.job_id:
+                    job_response = gengo.getTranslationJob(id=trns.job_id)
+                    if job_response['response']['job']['status'] == 'approved':
+                        translation_pool.write(cr, uid, trns.id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
         return True
 
-    def _sync_request(self, cr, uid, ids=0, context=None):
+    def _sync_request(self, cr, uid, ids=False, context=None):
         """This scheduler will send a job request to the gengo , which terms are
         in translate state and gengo_translation is true"""
         if context is None:
             context = {}
+        language_pool = self.pool.get('res.lang')
+        translation_pool = self.pool.get('ir.translation')
         try:
-            language_pool = self.pool.get('res.lang')
-            trg_lang = self.browse(cr, uid, ids)[0]
-            translation_pool = self.pool.get('ir.translation')
-            lang_search_id = language_pool.search(cr, uid, [('gengo_sync', '=', True), ('code', '=', trg_lang.lang)])
-            if not lang_search_id:
-                term_ids = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', 'True'), ('lang', '=', trg_lang.lang)], limit=local.LIMIT)
-                self._send_translation_terms(cr, uid, ids, trg_lang.lang, term_ids, context)
-                msg = "Your Request has been Successfully Send to Gengo"
+            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
+            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
+            langs = self.pool.get('jobs.meta').check_lang_support(cr, uid, langs)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=local.LIMIT)
+            if term_ids:
+                self._send_translation_terms(cr, uid, ids, term_ids, context)
+                _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))
             else:
-                msg = "This language is select as Active All Translation Request will be sent by System Automatically"
-            context.update({'message': msg})
+                _logger.info('No Translation terms to process.')
         except Exception, e:
-            _logger.warning("%s", e)
+            _logger.error("%s", e)
 
     _name = 'base.update.translations'
     _inherit = "base.update.translations"
diff --git a/addons/base_gengo/wizard/wrap_object.py b/addons/base_gengo/wizard/wrap_object.py
index 3ded7af12b1..2679d080d9d 100644
--- a/addons/base_gengo/wizard/wrap_object.py
+++ b/addons/base_gengo/wizard/wrap_object.py
@@ -19,10 +19,9 @@
 #
 ##############################################################################
 
-from osv import orm, osv
-from tools.translate import _
+from osv import orm
+import tools
 from mygengo import MyGengo
-import re
 
 LIMIT = 20
 
@@ -57,12 +56,13 @@ LANG_CODE_MAPPING = {
     'sv_SE': 'sv',
     'ko_KR': 'ko',
     'pt_PT': 'pt',
-    'en': 'en',
+    'en_US': 'en',
     'ja_JP': 'ja',
     'es_ES': 'es',
     'zh_CN': 'zh',
     'de_DE': 'de',
     'fr_FR': 'fr',
+    'fr_BE': 'fr',
     'ru_RU': 'ru',
     'it_IT': 'it',
     'pt_BR': 'pt-br'
@@ -105,44 +105,63 @@ class JobsMeta(orm.AbstractModel):
 
     _name = "jobs.meta"
 
-    def gengo_authentication(self, cr, uid, ids, context=None):
+    def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
          key for that user need to signup to gengo and get public and private
          key which is provided by gengo to authentic user '''
 
-        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
         try:
             gengo = MyGengo(
-                public_key=gengo_parameter_pool.company_id.gengo_public_key.encode('ascii'),
-                private_key=gengo_parameter_pool.company_id.gengo_private_key.encode('ascii'),
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
                 sandbox=True,
-            )   
-            return gengo
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
         except Exception, e:
-            raise osv.except_osv(_('Warning !'), _(e))
+            return (False, "Gengo Connection Error\n"+e.message)
 
-    def pack_jobs_request(self, cr, uid, term_ids, trg_lang, context):
+    def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
         auto_approve = 0
         gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
         if gengo_parameter_pool.company_id.gengo_auto_approve:
             auto_approve = 1
-        g_lang = LANG_CODE_MAPPING.get(trg_lang)
-        if g_lang:
-            for terms in translation_pool.browse(cr, uid, term_ids, context):
-                #NOTE: Discard none string and only special char string 
-                if re.search(r"[a-z A-Z]", terms.src) and terms.src:
-                    job = {'type': 'text',
-                            'slug': 'single::English to' + LANG_MAPPING.get(g_lang),
-                            'tier': gengo_parameter_pool.company_id.gengo_tier,
-                            'body_src': terms.src,
-                            'lc_src': 'en',
-                            'lc_tgt': g_lang,
-                            'auto_approve': auto_approve,
-                            'comment': gengo_parameter_pool.company_id.gengo_comment,
-                            }
-                    jobs.update({terms.id: job})
+        for term in translation_pool.browse(cr, uid, term_ids, context):
+            if term.src and term.src != "":
+                job = {'type': 'text',
+                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
+                jobs.update({term.id: job})
         return {'jobs': jobs}
 
+    def check_lang_support(self, cr, uid, langs, context=None):
+        new_langs = []
+        flag, gengo = self.gengo_authentication(cr, uid, context)
+        if not flag:
+            return []
+        else:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            tier = user.company_id.gengo_tier
+            if tier == "machine":
+                tier = "nonprofit"
+
+            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            if lang_pair['opstat'] == 'ok':
+                for g_lang in lang_pair['response']:
+                    for l in langs:
+                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                            new_langs.append(l)
+            return list(set(new_langs))
+JobsMeta()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a1d8ce709f3b1806abe83631afe18c7c158a0be9 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 24 Aug 2012 19:01:15 +0530
Subject: [PATCH 041/118] [ADD] Added new wrapper file and security dir

bzr revid: jam@tinyerp.com-20120824133115-70143pldvvmk2v8y
---
 addons/base_gengo/wizard/abstract_wrapper.py | 167 +++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 addons/base_gengo/wizard/abstract_wrapper.py

diff --git a/addons/base_gengo/wizard/abstract_wrapper.py b/addons/base_gengo/wizard/abstract_wrapper.py
new file mode 100644
index 00000000000..2679d080d9d
--- /dev/null
+++ b/addons/base_gengo/wizard/abstract_wrapper.py
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
+#
+##############################################################################
+
+from osv import orm
+import tools
+from mygengo import MyGengo
+
+LIMIT = 20
+
+LANG_MAPPING = {
+    'ar': 'Arabic',
+    'id': 'Indonesian',
+    'nl': 'Dutch',
+    'fr-ca': 'French (Canada)',
+    'pl': 'Polish',
+    'zh-tw': 'Chinese (Traditional)',
+    'sv': 'Swedish',
+    'ko': 'Korean',
+    'pt': 'Portuguese (Europe)',
+    'en': 'English',
+    'ja': 'Japanese',
+    'es': 'Spanish (Spain)',
+    'zh': 'Chinese (Simplified)',
+    'de': 'German',
+    'fr': 'French',
+    'ru': 'Russian',
+    'it': 'Italian',
+    'pt-br': 'Portuguese (Brazil)',
+}
+
+LANG_CODE_MAPPING = {
+    'ar_SA': 'ar',
+    'id_ID': 'id',
+    'nl_NL': 'nl',
+    'fr_CA': 'fr-ca',
+    'pl': 'pl',
+    'zh_TW': 'zh-tw',
+    'sv_SE': 'sv',
+    'ko_KR': 'ko',
+    'pt_PT': 'pt',
+    'en_US': 'en',
+    'ja_JP': 'ja',
+    'es_ES': 'es',
+    'zh_CN': 'zh',
+    'de_DE': 'de',
+    'fr_FR': 'fr',
+    'fr_BE': 'fr',
+    'ru_RU': 'ru',
+    'it_IT': 'it',
+    'pt_BR': 'pt-br'
+}
+
+
+class gengo_response(object):
+    """
+    """
+    def __init__(self, jobs):
+        self._data = jobs
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+
+class gengo_job(object):
+    """
+    """
+    def __init__(self, job):
+        self._data = job
+
+    def __getitem__(self, name):
+        return self._data[name]
+
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError, e:
+            raise AttributeError(e)
+
+
+class JobsMeta(orm.AbstractModel):
+
+    _name = "jobs.meta"
+
+    def gengo_authentication(self, cr, uid, context=None):
+        ''' To Send Request and Get Response from Gengo User needs Public and Private
+         key for that user need to signup to gengo and get public and private
+         key which is provided by gengo to authentic user '''
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
+        try:
+            gengo = MyGengo(
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
+        except Exception, e:
+            return (False, "Gengo Connection Error\n"+e.message)
+
+    def pack_jobs_request(self, cr, uid, term_ids, context):
+        jobs = {}
+        auto_approve = 0
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool = self.pool.get('ir.translation')
+        if gengo_parameter_pool.company_id.gengo_auto_approve:
+            auto_approve = 1
+        for term in translation_pool.browse(cr, uid, term_ids, context):
+            if term.src and term.src != "":
+                job = {'type': 'text',
+                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
+                jobs.update({term.id: job})
+        return {'jobs': jobs}
+
+    def check_lang_support(self, cr, uid, langs, context=None):
+        new_langs = []
+        flag, gengo = self.gengo_authentication(cr, uid, context)
+        if not flag:
+            return []
+        else:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            tier = user.company_id.gengo_tier
+            if tier == "machine":
+                tier = "nonprofit"
+
+            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            if lang_pair['opstat'] == 'ok':
+                for g_lang in lang_pair['response']:
+                    for l in langs:
+                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                            new_langs.append(l)
+            return list(set(new_langs))
+JobsMeta()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 862c582ba8b1f8d457811ba8d8f87194e832b112 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 24 Aug 2012 19:10:12 +0530
Subject: [PATCH 042/118] [FIX] Added missing udpate btn

bzr revid: jam@tinyerp.com-20120824134012-gu4wefjbdeuw1mw8
---
 .../addons/base/module/wizard/base_update_translations_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index 1fe52511ebb..392994178f7 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -10,6 +10,8 @@
                         <field name="lang"/>
                     </group>
                     <footer>
+                        <button name="act_update" string="Update" type="object" class="oe_highlight"/> 
+                        or
                         <button name="act_cancel" special="cancel" string="Cancel" type="object"/>
                     </footer>
                 </form>

From ac0566a8564e75aa23c99e0de5227a427c8d1fb5 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 27 Aug 2012 12:22:18 +0530
Subject: [PATCH 043/118] [FIX] base_gengo: remove warning

bzr revid: aja@tinyerp.com-20120827065218-3ztowz1icyc6jv82
---
 addons/base_gengo/wizard/__init__.py          |   1 -
 addons/base_gengo/wizard/abstract_wrapper.py  | 167 ------------------
 .../base_gengo/wizard/gengo_update_message.py |   2 +-
 .../wizard/gengo_update_translation.py        | 126 +++++++++++--
 4 files changed, 116 insertions(+), 180 deletions(-)
 delete mode 100644 addons/base_gengo/wizard/abstract_wrapper.py

diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index 7bde4753da6..3e6c687d9de 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -20,6 +20,5 @@
 ##############################################################################
 
 import gengo_update_translation
-import abstract_wrapper
 import gengo_update_message
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/abstract_wrapper.py b/addons/base_gengo/wizard/abstract_wrapper.py
deleted file mode 100644
index 2679d080d9d..00000000000
--- a/addons/base_gengo/wizard/abstract_wrapper.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
-#
-##############################################################################
-
-from osv import orm
-import tools
-from mygengo import MyGengo
-
-LIMIT = 20
-
-LANG_MAPPING = {
-    'ar': 'Arabic',
-    'id': 'Indonesian',
-    'nl': 'Dutch',
-    'fr-ca': 'French (Canada)',
-    'pl': 'Polish',
-    'zh-tw': 'Chinese (Traditional)',
-    'sv': 'Swedish',
-    'ko': 'Korean',
-    'pt': 'Portuguese (Europe)',
-    'en': 'English',
-    'ja': 'Japanese',
-    'es': 'Spanish (Spain)',
-    'zh': 'Chinese (Simplified)',
-    'de': 'German',
-    'fr': 'French',
-    'ru': 'Russian',
-    'it': 'Italian',
-    'pt-br': 'Portuguese (Brazil)',
-}
-
-LANG_CODE_MAPPING = {
-    'ar_SA': 'ar',
-    'id_ID': 'id',
-    'nl_NL': 'nl',
-    'fr_CA': 'fr-ca',
-    'pl': 'pl',
-    'zh_TW': 'zh-tw',
-    'sv_SE': 'sv',
-    'ko_KR': 'ko',
-    'pt_PT': 'pt',
-    'en_US': 'en',
-    'ja_JP': 'ja',
-    'es_ES': 'es',
-    'zh_CN': 'zh',
-    'de_DE': 'de',
-    'fr_FR': 'fr',
-    'fr_BE': 'fr',
-    'ru_RU': 'ru',
-    'it_IT': 'it',
-    'pt_BR': 'pt-br'
-}
-
-
-class gengo_response(object):
-    """
-    """
-    def __init__(self, jobs):
-        self._data = jobs
-
-    def __getitem__(self, name):
-        return self._data[name]
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError, e:
-            raise AttributeError(e)
-
-
-class gengo_job(object):
-    """
-    """
-    def __init__(self, job):
-        self._data = job
-
-    def __getitem__(self, name):
-        return self._data[name]
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError, e:
-            raise AttributeError(e)
-
-
-class JobsMeta(orm.AbstractModel):
-
-    _name = "jobs.meta"
-
-    def gengo_authentication(self, cr, uid, context=None):
-        ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to signup to gengo and get public and private
-         key which is provided by gengo to authentic user '''
-
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
-        try:
-            gengo = MyGengo(
-                public_key=user.company_id.gengo_public_key.encode('ascii'),
-                private_key=user.company_id.gengo_private_key.encode('ascii'),
-                sandbox=True,
-            )
-            gengo.getAccountStats()
-            return (True, gengo)
-        except Exception, e:
-            return (False, "Gengo Connection Error\n"+e.message)
-
-    def pack_jobs_request(self, cr, uid, term_ids, context):
-        jobs = {}
-        auto_approve = 0
-        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
-        translation_pool = self.pool.get('ir.translation')
-        if gengo_parameter_pool.company_id.gengo_auto_approve:
-            auto_approve = 1
-        for term in translation_pool.browse(cr, uid, term_ids, context):
-            if term.src and term.src != "":
-                job = {'type': 'text',
-                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
-                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
-                        'body_src': term.src,
-                        'lc_src': 'en',
-                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
-                        'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment,
-                }
-                jobs.update({term.id: job})
-        return {'jobs': jobs}
-
-    def check_lang_support(self, cr, uid, langs, context=None):
-        new_langs = []
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            return []
-        else:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            tier = user.company_id.gengo_tier
-            if tier == "machine":
-                tier = "nonprofit"
-
-            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
-            if lang_pair['opstat'] == 'ok':
-                for g_lang in lang_pair['response']:
-                    for l in langs:
-                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
-                            new_langs.append(l)
-            return list(set(new_langs))
-JobsMeta()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
index 214b9978a19..88fb0283825 100644
--- a/addons/base_gengo/wizard/gengo_update_message.py
+++ b/addons/base_gengo/wizard/gengo_update_message.py
@@ -23,7 +23,7 @@ from osv import osv
 from osv import fields
 
 
-class gengo_update_message(osv.osv):
+class gengo_update_message(osv.osv_memory):
     """Update Message"""
 
     _name = "gengo.update.message"
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 9cb5f0696f5..a6db51f870d 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,9 +20,58 @@
 ##############################################################################
 
 from osv import osv
-import abstract_wrapper as local
 import logging
+import tools
 _logger = logging.getLogger(__name__)
+try:
+    from mygengo import MyGengo
+except ImportError:
+    raise osv.except_osv(_('Gengo ImportError'),_('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
+LIMIT = 20
+
+LANG_MAPPING = {
+    'ar': 'Arabic',
+    'id': 'Indonesian',
+    'nl': 'Dutch',
+    'fr-ca': 'French (Canada)',
+    'pl': 'Polish',
+    'zh-tw': 'Chinese (Traditional)',
+    'sv': 'Swedish',
+    'ko': 'Korean',
+    'pt': 'Portuguese (Europe)',
+    'en': 'English',
+    'ja': 'Japanese',
+    'es': 'Spanish (Spain)',
+    'zh': 'Chinese (Simplified)',
+    'de': 'German',
+    'fr': 'French',
+    'ru': 'Russian',
+    'it': 'Italian',
+    'pt-br': 'Portuguese (Brazil)',
+}
+
+LANG_CODE_MAPPING = {
+    'ar_SA': 'ar',
+    'id_ID': 'id',
+    'nl_NL': 'nl',
+    'fr_CA': 'fr-ca',
+    'pl': 'pl',
+    'zh_TW': 'zh-tw',
+    'sv_SE': 'sv',
+    'ko_KR': 'ko',
+    'pt_PT': 'pt',
+    'en_US': 'en',
+    'ja_JP': 'ja',
+    'es_ES': 'es',
+    'zh_CN': 'zh',
+    'de_DE': 'de',
+    'fr_FR': 'fr',
+    'fr_BE': 'fr',
+    'ru_RU': 'ru',
+    'it_IT': 'it',
+    'pt_BR': 'pt-br'
+}
 
 cron_vals = {
     'name': 'Gengo Sync',
@@ -37,6 +86,64 @@ cron_vals = {
 
 class base_update_translation(osv.osv_memory):
 
+    def gengo_authentication(self, cr, uid, context=None):
+        ''' To Send Request and Get Response from Gengo User needs Public and Private
+         key for that user need to signup to gengo and get public and private
+         key which is provided by gengo to authentic user '''
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
+        try:
+            gengo = MyGengo(
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
+        except Exception, e:
+            return (False, "Gengo Connection Error\n"+e.message)
+
+    def pack_jobs_request(self, cr, uid, term_ids, context):
+        jobs = {}
+        auto_approve = 0
+        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
+        translation_pool = self.pool.get('ir.translation')
+        if gengo_parameter_pool.company_id.gengo_auto_approve:
+            auto_approve = 1
+        for term in translation_pool.browse(cr, uid, term_ids, context):
+            if term.src and term.src != "":
+                job = {'type': 'text',
+                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
+                jobs.update({term.id: job})
+        return {'jobs': jobs}
+
+    def check_lang_support(self, cr, uid, langs, context=None):
+        new_langs = []
+        flag, gengo = self.gengo_authentication(cr, uid, context)
+        if not flag:
+            return []
+        else:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            tier = user.company_id.gengo_tier
+            if tier == "machine":
+                tier = "nonprofit"
+
+            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            if lang_pair['opstat'] == 'ok':
+                for g_lang in lang_pair['response']:
+                    for l in langs:
+                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                            new_langs.append(l)
+            return list(set(new_langs))
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:
@@ -53,12 +160,11 @@ class base_update_translation(osv.osv_memory):
         """
         Lazy Polling will be perform when user or cron request for the trnalstion.
         """
-        meta = self.pool.get('jobs.meta')
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context)
         if flag:
 
-            request = meta.pack_jobs_request(cr, uid, term_ids, context)
+            request = self.pack_jobs_request(cr, uid, term_ids, context)
             if request:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
@@ -83,8 +189,7 @@ class base_update_translation(osv.osv_memory):
         lang_pool = self.pool.get('res.lang')
         super(base_update_translation, self).act_update(cr, uid, ids, context)
         msg = "1. Translation file loaded succesfully.\n2. Processing Gengo Translation:\n"
-        meta = self.pool.get('jobs.meta')
-        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             msg += gengo
         else:
@@ -119,13 +224,12 @@ class base_update_translation(osv.osv_memory):
     def _sync_response(self, cr, uid, ids=False, context=None):
         """Scheduler will be call to get response from gengo and all term will get
         by scheduler which terms are in approved state"""
-        meta = self.pool.get('jobs.meta')
         translation_pool = self.pool.get('ir.translation')
-        flag, gengo = meta.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             _logger.warning("%s", gengo)
         else:
-            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=local.LIMIT, context=context)
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=LIMIT, context=context)
             for trns in translation_pool.browse(cr, uid, translation_id, context):
                 if trns.job_id:
                     job_response = gengo.getTranslationJob(id=trns.job_id)
@@ -143,8 +247,8 @@ class base_update_translation(osv.osv_memory):
         try:
             lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
-            langs = self.pool.get('jobs.meta').check_lang_support(cr, uid, langs)
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=local.LIMIT)
+            langs = self.check_lang_support(cr, uid, langs)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
             if term_ids:
                 self._send_translation_terms(cr, uid, ids, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))

From 6ad7a5a4b0cb8d8c23d45d0b4ed3fdb40888df70 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 12:57:43 +0530
Subject: [PATCH 044/118] [FIX/USA] Usabality Impovments ans Import error fixed

bzr revid: jam@tinyerp.com-20120827072743-v022e5obnd06csoy
---
 addons/base_gengo/res_company.py                     | 2 +-
 addons/base_gengo/res_company_view.xml               | 8 ++++----
 addons/base_gengo/wizard/gengo_update_translation.py | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 888e675e26b..8e26f406f30 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -33,7 +33,7 @@ class res_company(osv.Model):
                                           ('pro', 'Pro'),
                                           ('ultra', 'Ultra')], "Tier types", required=True),
            "gengo_comment": fields.text("comments"),
-           "gengo_auto_approve": fields.boolean("Active", help="Jobs are Automatically Approved by Gengo."),
+           "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
            "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
 
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index bfa0b1ddf95..f51ee4d4f95 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -11,11 +11,11 @@
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string="Gengo Parameters">
                         <group col="2">
-                            <group col="1" string="Private Key">
-                                <field name="gengo_private_key" nolabel="1"/>
-                            </group>
                             <group col="1" string="Public Key">
-                                <field name="gengo_public_key" nolabel="1"/>
+                                <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
+                            </group>
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index a6db51f870d..33e90384275 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -22,6 +22,8 @@
 from osv import osv
 import logging
 import tools
+from tools.translate import _
+
 _logger = logging.getLogger(__name__)
 try:
     from mygengo import MyGengo

From 0072333206e790f5031f207b3cfcfd99b58b5fde Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 15:10:27 +0530
Subject: [PATCH 045/118] [FIX]Import error fixed

bzr revid: jam@tinyerp.com-20120827094027-jgmwf8wrb76epj8q
---
 addons/base_gengo/wizard/gengo_update_translation.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 33e90384275..e2734f04cbe 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,15 +20,17 @@
 ##############################################################################
 
 from osv import osv
+try:
+    from mygengo import MyGeng
+except ImportError:
+    raise osv.except_osv(_('Gengo ImportError'), _('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
 import logging
 import tools
 from tools.translate import _
 
 _logger = logging.getLogger(__name__)
-try:
-    from mygengo import MyGengo
-except ImportError:
-    raise osv.except_osv(_('Gengo ImportError'),_('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
 
 LIMIT = 20
 

From d1595a063545ca1aed0b2cb73265e7a55c9d4a9c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 15:11:37 +0530
Subject: [PATCH 046/118] [FIX]_ error fixed

bzr revid: jam@tinyerp.com-20120827094137-vw9ztsn1vv31egy4
---
 addons/base_gengo/wizard/gengo_update_translation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index e2734f04cbe..9ac023bdbbd 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -20,8 +20,9 @@
 ##############################################################################
 
 from osv import osv
+from tools.translate import _
 try:
-    from mygengo import MyGeng
+    from mygengo import MyGengo
 except ImportError:
     raise osv.except_osv(_('Gengo ImportError'), _('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
 

From e112222207c33c093686fc91d709905121ebdbe0 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 27 Aug 2012 16:24:13 +0530
Subject: [PATCH 047/118] [ADD]base_gengo:Get comment from gengo and add to
 openerp

bzr revid: aja@tinyerp.com-20120827105413-usu1a5wqxjx8j71s
---
 .../wizard/gengo_update_translation.py        | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 33e90384275..fe2460d55e0 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -22,6 +22,7 @@
 from osv import osv
 import logging
 import tools
+import time
 from tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -88,6 +89,9 @@ cron_vals = {
 
 class base_update_translation(osv.osv_memory):
 
+    _name = 'base.update.translations'
+    _inherit = "base.update.translations"
+
     def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
          key for that user need to signup to gengo and get public and private
@@ -224,19 +228,36 @@ class base_update_translation(osv.osv_memory):
              }
 
     def _sync_response(self, cr, uid, ids=False, context=None):
-        """Scheduler will be call to get response from gengo and all term will get
-        by scheduler which terms are in approved state"""
+        """
+        This method  will be call by cron services to get translation from
+        gengo for translation terms which are posted to be translated. It will
+        read translated terms and comments from gengo and will update respective
+        translation in openerp """
         translation_pool = self.pool.get('ir.translation')
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             _logger.warning("%s", gengo)
         else:
             translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=LIMIT, context=context)
-            for trns in translation_pool.browse(cr, uid, translation_id, context):
-                if trns.job_id:
-                    job_response = gengo.getTranslationJob(id=trns.job_id)
+            for term in translation_pool.browse(cr, uid, translation_id, context):
+                if term.job_id:
+                    vals={}
+                    job_response = gengo.getTranslationJob(id=term.job_id)
+                    if job_response['opstat'] != 'ok':
+                        _logger.warning("Invalid Response Skeeping translation Terms for 'id' %s."%(term.job_id))
+                        continue
                     if job_response['response']['job']['status'] == 'approved':
-                        translation_pool.write(cr, uid, trns.id, {'value': job_response['response']['job']['body_tgt'], 'state': 'translated', 'gengo_control': True})
+                        vals.update({'state': 'translated',
+                            'value': job_response['response']['job']['body_tgt'],
+                            'gengo_control': True})
+                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
+                    if job_comment['opstat']=='ok':
+                        gengo_comments=""
+                        for comment in job_comment['response']['thread']:
+                            gengo_comments+='%s by %s at %s. \n'    %(comment['body'],comment['author'],time.ctime(comment['ctime']))
+                        vals.update({'gengo_comment':gengo_comments})
+                    if vals:
+                        translation_pool.write(cr, uid, term.id,vals)
         return True
 
     def _sync_request(self, cr, uid, ids=False, context=None):
@@ -259,8 +280,4 @@ class base_update_translation(osv.osv_memory):
         except Exception, e:
             _logger.error("%s", e)
 
-    _name = 'base.update.translations'
-    _inherit = "base.update.translations"
-
-base_update_translation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cd52658a64b4dc63a5b2369ca435f7ee9be4d877 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 16:36:40 +0530
Subject: [PATCH 048/118] [FIX] removed the view type field

bzr revid: jam@tinyerp.com-20120827110640-cjtmztups89c8exs
---
 addons/base_gengo/ir_translation.xml             | 2 --
 addons/base_gengo/res_company_view.xml           | 1 -
 addons/base_gengo/res_lang_view.xml              | 1 -
 addons/base_gengo/wizard/alert_message_gengo.xml | 1 -
 4 files changed, 5 deletions(-)

diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 753c12c7e7d..30108c882b5 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -5,7 +5,6 @@
             <field name="name">Translations</field>
             <field name="model">ir.translation</field>
             <field name="inherit_id" ref="base.view_translation_search"/>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
                      <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
@@ -19,7 +18,6 @@
             <field name="name">ir.translation.form.inherit</field>
             <field name="inherit_id" ref="base.view_translation_form"/>
             <field name="model">ir.translation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
                     <group string="comments" col="1">
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index f51ee4d4f95..3606fbf58da 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -6,7 +6,6 @@
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string="Gengo Parameters">
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
index e0c8edd11aa..38e6b995163 100644
--- a/addons/base_gengo/res_lang_view.xml
+++ b/addons/base_gengo/res_lang_view.xml
@@ -6,7 +6,6 @@
             <field name="name">res.lang.form.inherit</field>
             <field name="inherit_id" ref="base.res_lang_form"/>
             <field name="model">res.lang</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//sheet/group" position="inside">
                     <field name="gengo_sync" />
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
index 84bfc7bb484..c2121b8ce6d 100644
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ b/addons/base_gengo/wizard/alert_message_gengo.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
             <field name="name">gengo.update.message.form</field>
             <field name="model">gengo.update.message</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Update Gengo Data" version="7.0">
                     <group>

From 72a2c0f0aba16ccfabfe6647b16f7043af561abb Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 27 Aug 2012 19:07:59 +0530
Subject: [PATCH 049/118] [IMP]: Improve lang_code_mapping

bzr revid: aja@tinyerp.com-20120827133759-resjxxg7w772ntj7
---
 addons/base_gengo/__init__.py                 |   1 +
 .../base_gengo/gengo_sync_schedular_data.xml  |   2 +-
 addons/base_gengo/ir_translation.py           |   2 +-
 addons/base_gengo/res_company.py              |   2 +-
 addons/base_gengo/res_company_view.xml        |   3 -
 addons/base_gengo/wizard/__init__.py          |   1 +
 .../wizard/gengo_update_translation.py        | 108 +++++++-----------
 7 files changed, 49 insertions(+), 70 deletions(-)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index c434c6b1843..b4fd54acd21 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -23,4 +23,5 @@ import res_company
 import ir_translation
 import wizard
 import res_lang
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index ab78b59e0b8..2a12626713c 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -12,7 +12,7 @@
             <field eval="'_sync_response'" name="function"/>
         </record>
 
-        <!--Schedular Sync Send Request-->
+        <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
             <field eval="False" name="active"/>
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7bda5023592..297e449ecdc 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -29,7 +29,7 @@ class ir_translation(osv.Model):
         'gengo_comment': fields.text("Comments"),
         'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
         'gengo_control': fields.boolean('Active'),
-        'job_id':fields.char('Gengo Job Id',size=32),
+        'job_id': fields.char('Gengo Job Id', size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 8e26f406f30..9062095bb87 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -34,9 +34,9 @@ class res_company(osv.Model):
                                           ('ultra', 'Ultra')], "Tier types", required=True),
            "gengo_comment": fields.text("comments"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
-           "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
 
     _defaults = {
         "gengo_tier": "machine",
+        "gengo_auto_approve": True,
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index 3606fbf58da..60cd767b140 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -24,9 +24,6 @@
                         <group string="Comments" col="1">
                             <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translator...."/>
                         </group>
-                        <group col="1">
-                            <field name="fields_ids" nolabel="1"/>
-                        </group>
                     </page>
                 </xpath>
             </field>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index 3e6c687d9de..f661b3b8114 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 import gengo_update_translation
 import gengo_update_message
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 9ac023bdbbd..e3a147f9306 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -21,6 +21,7 @@
 
 from osv import osv
 from tools.translate import _
+import re
 try:
     from mygengo import MyGengo
 except ImportError:
@@ -28,54 +29,30 @@ except ImportError:
 
 import logging
 import tools
-from tools.translate import _
-
 _logger = logging.getLogger(__name__)
 
-
 LIMIT = 20
 
-LANG_MAPPING = {
-    'ar': 'Arabic',
-    'id': 'Indonesian',
-    'nl': 'Dutch',
-    'fr-ca': 'French (Canada)',
-    'pl': 'Polish',
-    'zh-tw': 'Chinese (Traditional)',
-    'sv': 'Swedish',
-    'ko': 'Korean',
-    'pt': 'Portuguese (Europe)',
-    'en': 'English',
-    'ja': 'Japanese',
-    'es': 'Spanish (Spain)',
-    'zh': 'Chinese (Simplified)',
-    'de': 'German',
-    'fr': 'French',
-    'ru': 'Russian',
-    'it': 'Italian',
-    'pt-br': 'Portuguese (Brazil)',
-}
-
 LANG_CODE_MAPPING = {
-    'ar_SA': 'ar',
-    'id_ID': 'id',
-    'nl_NL': 'nl',
-    'fr_CA': 'fr-ca',
-    'pl': 'pl',
-    'zh_TW': 'zh-tw',
-    'sv_SE': 'sv',
-    'ko_KR': 'ko',
-    'pt_PT': 'pt',
-    'en_US': 'en',
-    'ja_JP': 'ja',
-    'es_ES': 'es',
-    'zh_CN': 'zh',
-    'de_DE': 'de',
-    'fr_FR': 'fr',
-    'fr_BE': 'fr',
-    'ru_RU': 'ru',
-    'it_IT': 'it',
-    'pt_BR': 'pt-br'
+    'ar_SA': ('ar', 'Arabic'),
+    'id_ID': ('id', 'Indonesian'),
+    'nl_NL': ('nl', 'Dutch'),
+    'fr_CA': ('fr-ca', 'French (Canada)'),
+    'pl': ('Polish'),
+    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+    'sv_SE': ('sv', 'Swedish'),
+    'ko_KR': ('ko', 'Korean'),
+    'pt_PT': ('pt', 'Portuguese (Europe)'),
+    'en_US': ('en', 'English'),
+    'ja_JP': ('ja', 'Japanese'),
+    'es_ES': ('es', 'Spanish (Spain)'),
+    'zh_CN': ('zh', 'Chinese (Simplified)'),
+    'de_DE': ('de', 'German'),
+    'fr_FR': ('fr', 'French'),
+    'fr_BE': ('fr', 'French'),
+    'ru_RU': ('ru', 'Russian'),
+    'it_IT': ('it', 'Italian'),
+    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
 }
 
 cron_vals = {
@@ -93,12 +70,12 @@ class base_update_translation(osv.osv_memory):
 
     def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to signup to gengo and get public and private
+         key for that user need to sign up to gengo and get public and private
          key which is provided by gengo to authentic user '''
 
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "Invalid gengo configuration.\nEither pulic key or private key is missing.")
+            return (False, "Invalid gengo configuration.\n Either public key or private key is missing.")
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -108,7 +85,7 @@ class base_update_translation(osv.osv_memory):
             gengo.getAccountStats()
             return (True, gengo)
         except Exception, e:
-            return (False, "Gengo Connection Error\n"+e.message)
+            return (False, "Gengo Connection Error\n" + e.message)
 
     def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
@@ -118,17 +95,18 @@ class base_update_translation(osv.osv_memory):
         if gengo_parameter_pool.company_id.gengo_auto_approve:
             auto_approve = 1
         for term in translation_pool.browse(cr, uid, term_ids, context):
-            if term.src and term.src != "":
-                job = {'type': 'text',
-                        'slug': 'single::English to' + LANG_CODE_MAPPING[term.lang],
-                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
-                        'body_src': term.src,
-                        'lc_src': 'en',
-                        'lc_tgt': LANG_CODE_MAPPING[term.lang],
-                        'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment,
-                }
-                jobs.update({term.id: job})
+            if term.src:
+                if re.search(r"\w",term.src):
+                    job = {'type': 'text',
+                            'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
+                            'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                            'body_src': term.src,
+                            'lc_src': 'en',
+                            'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
+                            'auto_approve': auto_approve,
+                            'comment': gengo_parameter_pool.company_id.gengo_comment,
+                    }
+                    jobs.update({term.id: job})
         return {'jobs': jobs}
 
     def check_lang_support(self, cr, uid, langs, context=None):
@@ -146,9 +124,10 @@ class base_update_translation(osv.osv_memory):
             if lang_pair['opstat'] == 'ok':
                 for g_lang in lang_pair['response']:
                     for l in langs:
-                        if LANG_CODE_MAPPING[l] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
+                        if LANG_CODE_MAPPING[l][0] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
                             new_langs.append(l)
             return list(set(new_langs))
+
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:
@@ -163,17 +142,18 @@ class base_update_translation(osv.osv_memory):
 
     def _send_translation_terms(self, cr, uid, ids, term_ids, context):
         """
-        Lazy Polling will be perform when user or cron request for the trnalstion.
+        Lazy Polling will be perform when user or cron request for the translation.
         """
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if flag:
-
             request = self.pack_jobs_request(cr, uid, term_ids, context)
-            if request:
+            if request['jobs']:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
                     self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+            else:
+                _logger.info('')
         else:
             _logger.error(gengo)
         return True
@@ -193,7 +173,7 @@ class base_update_translation(osv.osv_memory):
             context = {}
         lang_pool = self.pool.get('res.lang')
         super(base_update_translation, self).act_update(cr, uid, ids, context)
-        msg = "1. Translation file loaded succesfully.\n2. Processing Gengo Translation:\n"
+        msg = "1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n"
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             msg += gengo
@@ -203,11 +183,11 @@ class base_update_translation(osv.osv_memory):
                 lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True),
                 ('id', '=', lang_id[0])])
                 if lang_search:
-                    msg += 'This language %s is alreay in queue for processing.' % (res.lang)
+                    msg += 'This language %s is already in queue for processing.' % (res.lang)
                 else:
                     msg += "Translation for language %s is queued for processing." % (res.lang)
                     lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                    _logger.info("Your translation request for language '%s' has been send sucessfully.", res.lang)
+                    _logger.info("Your translation request for language '%s' has been send successfully.", res.lang)
 
                 self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
                 self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)

From 381676051e91e3d56a71ec02d6dfc53b7ba020ad Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 27 Aug 2012 16:47:56 +0200
Subject: [PATCH 050/118] [IMP] hide the auth_signup_template_user_id field
 when auth_signup_uninvited isn't checked

bzr revid: abo@openerp.com-20120827144756-wp8b4ss07kag4dzj
---
 addons/auth_signup/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 49669d36618..f09e9155b0e 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -12,7 +12,7 @@
                         <field name="auth_signup_uninvited" class="oe_inline"/>
                         <label for="auth_signup_uninvited"/>
                     </div>
-                    <div>
+                    <div attrs="{'invisible':[('auth_signup_uninvited','=',False)]}">
                         <label for="auth_signup_template_user_id"/>
                         <field name="auth_signup_template_user_id" class="oe_inline"/>
                     </div>

From b9320999214d88ea63cee12d0cc7a1309682c49c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 27 Aug 2012 18:34:58 +0200
Subject: [PATCH 051/118] [:'(] remove the so-cute image of Chell from the
 portal's demo data

bzr revid: abo@openerp.com-20120827163458-uxan9ylsnrw0p0ym
---
 addons/portal/portal_demo.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index ab2cf22ffb7..a07709cd0d5 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -7,7 +7,6 @@
             <field name="name">Demo Portal User</field>
             <field name="login">portal</field>
             <field name="password">portal</field>
-            <field name="image">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ODdBREI1PC94bXBNTTpJbnN0YW5jZUlEPgogIDx4bXBNTTpEb2N1bWVudElEIHJkZjpyZXNvdXJjZT0neG1wLmRpZDoyMTUxMUFDRjU4NzBFMDExQjE4OEJBMDcwREM1NDg5MicgLz4KICA8eG1wTU06T3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MjE1MTFBQ0Y1ODcwRTAxMUIxODhCQTA3MERDNTQ4OTI8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICA8eG1wTU06SGlzdG9yeT4KICAgPHJkZjpTZXE+CiAgIDwvcmRmOlNlcT4KICA8L3htcE1NOkhpc3Rvcnk+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOmRjPSdodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyc+CiAgPGRjOmZvcm1hdD5pbWFnZS9qcGVnPC9kYzpmb3JtYXQ+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnBob3Rvc2hvcD0naHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyc+CiAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogPC9yZGY6RGVzY3JpcHRpb24+CgogPHJkZjpEZXNjcmlwdGlvbiB4bWxuczp0aWZmPSdodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyc+CiAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgPHRpZmY6WVJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOllSZXNvbHV0aW9uPgogIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgPHRpZmY6TmF0aXZlRGlnZXN0PjI1NiwyNTcsMjU4LDI1OSwyNjIsMjc0LDI3NywyODQsNTMwLDUzMSwyODIsMjgzLDI5NiwzMDEsMzE4LDMxOSw1MjksNTMyLDMwNiwyNzAsMjcxLDI3MiwzMDUsMzE1LDMzNDMyO0Q1MDVBNEM2MDlBQzIyNUVGMzcwM0UwMTE0NkQ4RTYzPC90aWZmOk5hdGl2ZURpZ2VzdD4KIDwvcmRmOkRlc2NyaXB0aW9uPgoKIDxyZGY6RGVzY3JpcHRpb24geG1sbnM6ZXhpZj0naHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8nPgogIDxleGlmOlBpeGVsWERpbWVuc2lvbj4yNTA8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogIDxleGlmOlBpeGVsWURpbWVuc2lvbj4zNzA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogIDxleGlmOk5hdGl2ZURpZ2VzdD4zNjg2NCw0MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0MDk2NCwzNjg2NywzNjg2OCwzMzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3NywzNzM3OCwzNzM3OSwzNzM4MCwzNzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0MTQ4Myw0MTQ4NCw0MTQ4Niw0MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0MTczMCw0MTk4NSw0MTk4Niw0MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0MTk5NCw0MTk5NSw0MTk5Niw0MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYsMTcsMTgsMjAsMjIsMjMsMjQsMjUsMjYsMjcsMjgsMzA7MTM3NUU3MDc1MjVBMTE0RjBBRkNBNzg4RTM2QzAyN0I8L2V4aWY6TmF0aXZlRGlnZXN0PgogPC9yZGY6RGVzY3JpcHRpb24+Cgo8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSdyJz8+Cv/iDFhJQ0NfUFJPRklM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</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
             <field name="partner_id" eval="ref('base.res_partner_1')"/>

From b8f2de2f97899385ee633615a182e17e1b883903 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 28 Aug 2012 14:10:36 +0530
Subject: [PATCH 052/118] [IMP]:clean code in gengo_update_translation

bzr revid: aja@tinyerp.com-20120828084036-9kxv2axis35vb8sv
---
 .../wizard/gengo_update_translation.py        | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index e3a147f9306..0b9ccd05658 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -38,7 +38,7 @@ LANG_CODE_MAPPING = {
     'id_ID': ('id', 'Indonesian'),
     'nl_NL': ('nl', 'Dutch'),
     'fr_CA': ('fr-ca', 'French (Canada)'),
-    'pl': ('Polish'),
+    'pl_PL': ('pl', 'Polish'),
     'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
     'sv_SE': ('sv', 'Swedish'),
     'ko_KR': ('ko', 'Korean'),
@@ -55,7 +55,7 @@ LANG_CODE_MAPPING = {
     'pt_BR': ('pt-br', 'Portuguese (Brazil)')
 }
 
-cron_vals = {
+CRON_VALS = {
     'name': 'Gengo Sync',
     'active': True,
     'interval_number': 30,
@@ -75,7 +75,7 @@ class base_update_translation(osv.osv_memory):
 
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "Invalid gengo configuration.\n Either public key or private key is missing.")
+            return (False, "Invalid gengo configuration.\nEither public key or private key is missing.")
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -85,7 +85,7 @@ class base_update_translation(osv.osv_memory):
             gengo.getAccountStats()
             return (True, gengo)
         except Exception, e:
-            return (False, "Gengo Connection Error\n" + e.message)
+            return (False, "Gengo Connection Error\n%s"%e)
 
     def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
@@ -96,7 +96,7 @@ class base_update_translation(osv.osv_memory):
             auto_approve = 1
         for term in translation_pool.browse(cr, uid, term_ids, context):
             if term.src:
-                if re.search(r"\w",term.src):
+                if re.search(r"\w", term.src):
                     job = {'type': 'text',
                             'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
                             'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
@@ -109,7 +109,7 @@ class base_update_translation(osv.osv_memory):
                     jobs.update({term.id: job})
         return {'jobs': jobs}
 
-    def check_lang_support(self, cr, uid, langs, context=None):
+    def check_lang_support(self, cr, uid, langs, context=None):s
         new_langs = []
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
@@ -152,8 +152,6 @@ class base_update_translation(osv.osv_memory):
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
                     self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
-            else:
-                _logger.info('')
         else:
             _logger.error(gengo)
         return True
@@ -165,8 +163,8 @@ class base_update_translation(osv.osv_memory):
             model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
             cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
-            cron_vals.update({'name': name, "function": fn})
-            return cron_pool.create(cr, uid, cron_vals, context)
+            CRON_VALS.update({'name': name, "function": fn})
+            return cron_pool.create(cr, uid, CRON_VALS, context)
 
     def act_update(self, cr, uid, ids, context=None):
         if context == None:
@@ -180,18 +178,23 @@ class base_update_translation(osv.osv_memory):
         else:
             for res in self.browse(cr, uid, ids, context):
                 lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
-                lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True),
-                ('id', '=', lang_id[0])])
-                if lang_search:
-                    msg += 'This language %s is already in queue for processing.' % (res.lang)
-                else:
-                    msg += "Translation for language %s is queued for processing." % (res.lang)
-                    lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                    _logger.info("Your translation request for language '%s' has been send successfully.", res.lang)
+                lang_name = self._get_lang_name(cr, uid, res.lang)
+                try:
+                    if LANG_CODE_MAPPING[res.lang][0]:
+                        lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
+                    if lang_search:
+                        msg += 'This language " %s " is already in queue for processing.' % (lang_name)
+                    else:
+                        msg += 'Translation for language " %s " is queued for processing.' % (lang_name)
+                        lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
+                        _logger.info('Your translation request for language " %s " has been send successfully.', lang_name)
+
+                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
+                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
+                    self._sync_request(cr, uid, ids, context)
+                except:
+                    msg +='Language " %s " is not supported by MyGengo.'%(lang_name)
 
-                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
-                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
-                self._sync_request(cr, uid, ids, context)
         context.update({'message': msg})
         obj_model = self.pool.get('ir.model.data')
         model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])

From b6617ff6ba4822ae12874f5ae797a6683f4a4475 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:03:05 +0530
Subject: [PATCH 053/118] [FIX] Fixed the usablity of cancel btn

bzr revid: jam@tinyerp.com-20120828093305-w2olgo9wkyu7903p
---
 .../addons/base/module/wizard/base_update_translations_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index 392994178f7..4a20ef30bee 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -12,7 +12,7 @@
                     <footer>
                         <button name="act_update" string="Update" type="object" class="oe_highlight"/> 
                         or
-                        <button name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/>
                     </footer>
                 </form>
             </field>

From 0fb11f25c455908664023effdff8fa571de58ad9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 28 Aug 2012 11:53:45 +0200
Subject: [PATCH 054/118] [FIX] account: when generating objects from
 templates, set the default taxes as a super user + use of set_default()
 instead of deprecated set(key='default') (on ir.values)

bzr revid: qdp-launchpad@openerp.com-20120828095345-erwdm59r3wspqbah
---
 addons/account/account.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 907e6207380..5a61f73b6c1 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3345,13 +3345,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         # Install all the templates objects and generate the real objects
         acc_template_ref, taxes_ref, tax_code_ref = self._install_template(cr, uid, obj_wizard.chart_template_id.id, company_id, code_digits=obj_wizard.code_digits, obj_wizard=obj_wizard, context=context)
 
-        # write values of default taxes for product
+        # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
+            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-                ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
+            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)

From d27721f480340446bc5405523b35febabf1770da Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:45:59 +0530
Subject: [PATCH 055/118] [REN] Renamed the state field key value

bzr revid: jam@tinyerp.com-20120828101559-l2zbivjzlmu7baq2
---
 openerp/addons/base/ir/ir_translation.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 7693f95a7c8..f0a0ccc91e8 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,9 +77,9 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-        state= "translated"
-        if not ddict['value']:
-            state = 'translate'
+        state = ddict['value'] and "to_translate" or "translated" 
+        if not :
+            state = 
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)
@@ -170,7 +170,7 @@ class ir_translation(osv.osv):
         'type': fields.selection(TRANSLATION_TYPE, string='Type', size=16, select=True),
         'src': fields.text('Source'),
         'value': fields.text('Translation Value'),
-        'state':fields.selection([('translate','To Translate'),('inprogress','Translation in Progress'),('translated','Translated')])
+        'state':fields.selection([('to_translate','To Translate'),('inprogress','Translation in Progress'),('translated','Translated')])
     }
     
     _defaults = {
@@ -305,14 +305,14 @@ class ir_translation(osv.osv):
         return ids
 
     def write(self, cursor, user, ids, vals, context=None):
-        if vals.get('src'):
-            result= vals.update({'state':'translate'})
-        if vals.get('value'):
-            result= vals.update({'state':'translated'})
         if not context:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if vals.get('src'):
+            result = vals.update({'state':'to_translate'})
+        if vals.get('value'):
+            result = vals.update({'state':'translated'})
         result = super(ir_translation, self).write(cursor, user, ids, vals, context=context)
         for trans_obj in self.read(cursor, user, ids, ['name','type','res_id','src','lang'], context=context):
             self._get_source.clear_cache(self, user, trans_obj['name'], trans_obj['type'], trans_obj['lang'], trans_obj['src'])

From a4dae41a49327ea40773dbe90f823c602466ffde Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:47:23 +0530
Subject: [PATCH 056/118] [FIX] Removed the unused wrong code

bzr revid: jam@tinyerp.com-20120828101723-d6qdm3bqpx3gcqbe
---
 openerp/addons/base/ir/ir_translation.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index f0a0ccc91e8..40facb34699 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -78,8 +78,6 @@ class ir_translation_import_cursor(object):
         """Feed a translation, as a dictionary, into the cursor
         """
         state = ddict['value'] and "to_translate" or "translated" 
-        if not :
-            state = 
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)

From 5022cdd8c7fc703d475a86b73df062591aac70e3 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:48:16 +0530
Subject: [PATCH 057/118] [FIX] Impoeved the message

bzr revid: jam@tinyerp.com-20120828101816-hh5qgj5x1gu1oooc
---
 addons/base_gengo/res_company_view.xml        |  2 +-
 .../wizard/gengo_update_translation.py        | 41 ++++++++-----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index 60cd767b140..d49d35d4b1f 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -14,7 +14,7 @@
                                 <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
                             </group>
                             <group col="1" string="Private Key">
-                                <field name="gengo_private_key" nolabel="1" placeholder="Add Gengo login Private Key..."/>
+                                <field name="gengo_private_key" widget="password" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index f75ea44f8b9..4eb9c514d63 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -94,23 +94,20 @@ class base_update_translation(osv.osv_memory):
 
     def pack_jobs_request(self, cr, uid, term_ids, context):
         jobs = {}
-        auto_approve = 0
         gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
-        if gengo_parameter_pool.company_id.gengo_auto_approve:
-            auto_approve = 1
+        auto_approve = gengo_parameter_pool.company_id.gengo_auto_approve and 1 or 0
         for term in translation_pool.browse(cr, uid, term_ids, context):
-            if term.src:
-                if re.search(r"\w", term.src):
-                    job = {'type': 'text',
-                            'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
-                            'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
-                            'body_src': term.src,
-                            'lc_src': 'en',
-                            'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
-                            'auto_approve': auto_approve,
-                            'comment': gengo_parameter_pool.company_id.gengo_comment}
-                    jobs.update({term.id: job})
+            if re.search(r"\w", term.src or ""):
+                job = {'type': 'text',
+                        'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
+                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
+                        'auto_approve': auto_approve,
+                        'comment': gengo_parameter_pool.company_id.gengo_comment}
+                jobs.update({term.id: job})
         return {'jobs': jobs}
 
     def check_lang_support(self, cr, uid, langs, context=None):
@@ -123,7 +120,6 @@ class base_update_translation(osv.osv_memory):
             tier = user.company_id.gengo_tier
             if tier == "machine":
                 tier = "nonprofit"
-
             lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
             if lang_pair['opstat'] == 'ok':
                 for g_lang in lang_pair['response']:
@@ -134,9 +130,9 @@ class base_update_translation(osv.osv_memory):
 
     def _update_terms(self, cr, uid, ids, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
-        for jobs in response['jobs']:
-            vals = {}
+        for jobs in response['jobs']:        
             for t_id, res in jobs.items():
+                vals = {}
                 if tier == "machine":
                     vals.update({'value': res['body_tgt'], 'state': 'translated'})
                 else:
@@ -187,17 +183,16 @@ class base_update_translation(osv.osv_memory):
                     if LANG_CODE_MAPPING[res.lang][0]:
                         lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
                     if lang_search:
-                        msg += '\t- This language " %s " is already in queue for processing.' % (lang_name)
+                        msg += '  - This language `%s` is already in queue for translation.' % (lang_name)
                     else:
-                        msg += '\t- Translation for language " %s " is queued for processing.' % (lang_name)
+                        msg += '  - The language `%s` is queued for translation through Gengo translation.' % (lang_name)
                         lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                        _logger.info('Your translation request for language " %s " has been send successfully.', lang_name)
-
+                        _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
                     self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
                     self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
                     self._sync_request(cr, uid, ids, context)
                 except:
-                    msg +='\t- Language " %s " is not supported by MyGengo.'%(lang_name)
+                    msg +='  - The Language `%s` is not supported by Gengo Traditional Service.'%(lang_name)
 
         context.update({'message': msg})
         obj_model = self.pool.get('ir.model.data')
@@ -230,7 +225,7 @@ class base_update_translation(osv.osv_memory):
                     vals={}
                     job_response = gengo.getTranslationJob(id=term.job_id)
                     if job_response['opstat'] != 'ok':
-                        _logger.warning("Invalid Response Skeeping translation Terms for 'id' %s."%(term.job_id))
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s."%(term.job_id))
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',

From 26406e3b0dc0b475f43ac8bdd6c2804f7414b222 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 15:50:46 +0530
Subject: [PATCH 058/118] [REN] Renamed the state field access key names

bzr revid: jam@tinyerp.com-20120828102046-rcedv72s3u1mtl7i
---
 addons/base_gengo/wizard/gengo_update_message.py     | 3 +--
 addons/base_gengo/wizard/gengo_update_translation.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
index 88fb0283825..45d54ffc54b 100644
--- a/addons/base_gengo/wizard/gengo_update_message.py
+++ b/addons/base_gengo/wizard/gengo_update_message.py
@@ -30,7 +30,7 @@ class gengo_update_message(osv.osv_memory):
     _description = "Update Message"
     _columns = {
         'name': fields.text('Message', readonly=True),
-        }
+    }
 
     def default_get(self, cr, uid, fields, context=None):
         if context == None:
@@ -39,6 +39,5 @@ class gengo_update_message(osv.osv_memory):
         res.update({'name': context.get('message')})
         return res
 
-gengo_update_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 4eb9c514d63..e1b2c31f029 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -252,7 +252,7 @@ class base_update_translation(osv.osv_memory):
             lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
             langs = self.check_lang_support(cr, uid, langs)
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
             if term_ids:
                 self._send_translation_terms(cr, uid, ids, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))

From 9464f474a4d99ff0ddcf9d0bc4a36016f0fb0b33 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 16:08:59 +0530
Subject: [PATCH 059/118] [FIX] State Condition

bzr revid: jam@tinyerp.com-20120828103859-jp22lgwzlucc55gl
---
 openerp/addons/base/ir/ir_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 40facb34699..72c0c0b9208 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,7 +77,7 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-        state = ddict['value'] and "to_translate" or "translated" 
+        state = ddict['value'] and "translated"  or "to_translate"
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)

From 3e682f4ef6c49e82f04e07bbe565559c1857f9d7 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 16:13:35 +0530
Subject: [PATCH 060/118] [FIX] Imrpoved the tooltiop and renmed conflicts
 label

bzr revid: jam@tinyerp.com-20120828104335-e9p9xoxu4rfg6dqf
---
 addons/base_gengo/res_company_view.xml | 2 +-
 addons/base_gengo/res_lang.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index d49d35d4b1f..d78470c8b14 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -14,7 +14,7 @@
                                 <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
                             </group>
                             <group col="1" string="Private Key">
-                                <field name="gengo_private_key" widget="password" nolabel="1" placeholder="Add Gengo login Private Key..."/>
+                                <field name="gengo_private_key" password="True" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
index e9c88c9fd29..43b867c4f76 100644
--- a/addons/base_gengo/res_lang.py
+++ b/addons/base_gengo/res_lang.py
@@ -27,5 +27,5 @@ class res_company(osv.Model):
     _inherit = "res.lang"
 
     _columns = {
-        'gengo_sync': fields.boolean('Active', help='Synchronize Translation Periodically')
+        'gengo_sync': fields.boolean('Gengo Auto Synchronize ?', help='If checked the language will be automatically synchronize translation periodically using gengo translation services.')
     }

From 13bcfc30e022d726462527556076119831d7af6d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 16:34:26 +0530
Subject: [PATCH 061/118] [IMP] Added limit flaxibility via schedular service
 to raise request response limit portable

bzr revid: jam@tinyerp.com-20120828110426-w10cikelphjuijg9
---
 .../base_gengo/gengo_sync_schedular_data.xml  |  6 +++--
 .../wizard/gengo_update_translation.py        | 26 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index 2a12626713c..78d2c602ac5 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -5,22 +5,24 @@
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
             <field eval="False" name="active"/>
-            <field name="interval_number">30</field>
+            <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="'base.update.translations'" name="model"></field>
             <field eval="'_sync_response'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
         </record>
 
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
             <field eval="False" name="active"/>
-            <field name="interval_number">30</field>
+            <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="'base.update.translations'" name="model"></field>
             <field eval="'_sync_request'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index e1b2c31f029..cb11e3bf2d7 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -33,8 +33,6 @@ import time
 
 _logger = logging.getLogger(__name__)
 
-LIMIT = 20
-
 LANG_CODE_MAPPING = {
     'ar_SA': ('ar', 'Arabic'),
     'id_ID': ('id', 'Indonesian'),
@@ -60,11 +58,12 @@ LANG_CODE_MAPPING = {
 CRON_VALS = {
     'name': 'Gengo Sync',
     'active': True,
-    'interval_number': 30,
+    'interval_number': 20,
     'interval_type': 'minutes',
     'numbercall': -1,
     'model': "'base.update.translations'",
-    'function': ""
+    'function': "",
+    'args': "'(20,)'",
 }
 
 
@@ -190,7 +189,7 @@ class base_update_translation(osv.osv_memory):
                         _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
                     self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
                     self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
-                    self._sync_request(cr, uid, ids, context)
+                    self._sync_request(cr, uid, limit=20)
                 except:
                     msg +='  - The Language `%s` is not supported by Gengo Traditional Service.'%(lang_name)
 
@@ -208,18 +207,19 @@ class base_update_translation(osv.osv_memory):
                  'context': context,
              }
 
-    def _sync_response(self, cr, uid, ids=False, context=None):
+    def _sync_response(self, cr, uid, limit=20, context=None):
         """
         This method  will be call by cron services to get translation from
         gengo for translation terms which are posted to be translated. It will
         read translated terms and comments from gengo and will update respective
-        translation in openerp """
+        translation in openerp.
+        """
         translation_pool = self.pool.get('ir.translation')
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             _logger.warning("%s", gengo)
         else:
-            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=LIMIT, context=context)
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=limit, context=context)
             for term in translation_pool.browse(cr, uid, translation_id, context):
                 if term.job_id:
                     vals={}
@@ -241,9 +241,11 @@ class base_update_translation(osv.osv_memory):
                         translation_pool.write(cr, uid, term.id,vals)
         return True
 
-    def _sync_request(self, cr, uid, ids=False, context=None):
-        """This scheduler will send a job request to the gengo , which terms are
-        in translate state and gengo_translation is true"""
+    def _sync_request(self, cr, uid, limit=20, context=None):
+        """
+        This scheduler will send a job request to the gengo , which terms are
+        in translate state and gengo_translation is true
+        """
         if context is None:
             context = {}
         language_pool = self.pool.get('res.lang')
@@ -252,7 +254,7 @@ class base_update_translation(osv.osv_memory):
             lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
             langs = self.check_lang_support(cr, uid, langs)
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=LIMIT)
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
             if term_ids:
                 self._send_translation_terms(cr, uid, ids, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))

From 3d326bec9bd21c4593e3deab30b34ba0fa6bee36 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 28 Aug 2012 16:49:31 +0530
Subject: [PATCH 062/118] [FIX] hr_holiday: add manager as a followers in leave
 request

bzr revid: hmo@tinyerp.com-20120828111931-fnrpc07v2upp0y8n
---
 addons/hr_holidays/hr_holidays.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index af0c572b431..24e1f66023b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -367,8 +367,7 @@ class hr_holidays(osv.osv):
     def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
         """ Add 'user_id' and 'manager' to the monitored fields """
         res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        # TODO: add manager
-        return res + ['user_id']
+        return res + ['user_id', 'manager_id', 'manager_id2']
         
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):

From 768d9cdb7ec65800ba6d5649a16556426a1b2a63 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 28 Aug 2012 13:21:16 +0200
Subject: [PATCH 063/118] [IMP] account: Merge the opening_control and
 closing_control flags in cash_control [IMP] account: In the case where the
 bank statement is a cash register, we can get the coins of the last register.
 [IMP] account: Hide the 'Available Coins' if the journal hasn't the
 cash_control flag. [FIX] account: Use some default values for the profit/loss
 and internal account. [IMP] point_of_sale: Avoid to have two payment methods
 with the cash_control in a pos.config object. [REF] point_of_sale: Refactor
 the computation code of the cash_journal, cash_register and cash_control
 flags. [IMP] point_of_sale: Store the difference in the right account if the
 journal of the statement is a cash_control or nota. [FIX] point_of_sale: Use
 the session name instead of the order name for the
 account.bank.statement.line . [IMP] point_of_sale: [DEMO] Define the default
 payment_methods for the pos.config.

bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
---
 addons/account/account.py                     |  2 +
 addons/account/account_cash_statement.py      | 17 +++-
 addons/account/account_view.xml               |  7 +-
 addons/account/demo/account_minimal.xml       |  4 +
 .../point_of_sale/account_bank_statement.py   |  6 +-
 .../point_of_sale/account_statement_view.xml  | 34 -------
 addons/point_of_sale/point_of_sale.py         | 94 ++++++++-----------
 addons/point_of_sale/point_of_sale_demo.xml   |  6 +-
 addons/point_of_sale/point_of_sale_view.xml   | 18 ++--
 .../point_of_sale/point_of_sale_workflow.xml  |  8 +-
 .../wizard/pos_open_statement.py              |  2 +-
 11 files changed, 83 insertions(+), 115 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 907e6207380..31fe7dbfb12 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -746,9 +746,11 @@ class account_journal(osv.osv):
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
+        'cash_control' : fields.boolean('Cash Control', help='If you want the journal should be control at opening/closing, check this option'),
     }
 
     _defaults = {
+        'cash_control' : False,
         'with_last_closing_balance' : False,
         'user_id': lambda self, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 9af0dcf60f4..17fa05d5f24 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -194,12 +194,27 @@ class account_cash_statement(osv.osv):
             journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context)
         if journal and (journal.type == 'cash') and not vals.get('details_ids'):
             vals['details_ids'] = []
+
+            last_pieces = None
+
+            if journal.with_last_closing_balance == True:
+                domain = [('journal_id', '=', journal.id),
+                          ('state', '=', 'confirm')]
+                last_bank_statement_ids = self.search(cr, uid, domain, limit=1, order='create_date desc', context=context)
+                if last_bank_statement_ids:
+                    last_bank_statement = self.browse(cr, uid, last_bank_statement_ids[0], context=context)
+
+                    last_pieces = dict(
+                        (line.pieces, line.number_closing) for line in last_bank_statement.details_ids
+                    )
+
             for value in journal.cashbox_line_ids:
                 nested_values = {
                     'number_closing' : 0,
-                    'number_opening' : 0,
+                    'number_opening' : last_pieces.get(value.pieces, 0) if isinstance(last_pieces, dict) else 0,
                     'pieces' : value.pieces
                 }
+
                 vals['details_ids'].append([0, False, nested_values])
 
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5bf45aab487..81e683e1cfd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -515,7 +515,7 @@
                             <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
                             <field colspan="4" name="account_control_ids" nolabel="1"/>
                         </page>
-                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                        <page string="Cash Registers">
                             <group>
                                 <group string="Accounts">
                                     <field name="profit_account_id"/>
@@ -524,10 +524,11 @@
                                 </group>
                                 <group string="Miscellaneous">
                                     <field name="with_last_closing_balance"/>
+                                    <field name="cash_control"/>
                                 </group>
                             </group>
-                            <separator string="Available Coins" colspan="4" />
-                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                            <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <tree string="CashBox Lines" editable="bottom">
                                     <field name="pieces" />
                                 </tree>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index baa94450f02..0c62d5cf021 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -381,6 +381,10 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <field name="type">cash</field>
+            <field name="profit_account_id" model="account.account" ref="rsa" />
+            <field name="loss_account_id" model="account.account" ref="rsa" />
+            <field name="internal_account_id" model="account.account" ref="chart0" />
+            <field name="cash_control" eval="True" />
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index eb7d791ebf9..06fe1d4a1f8 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -27,15 +27,10 @@ class account_journal(osv.osv):
     _columns = {
         'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."),
 
-        'opening_control': fields.boolean('Opening Control', help="If you want the journal should be control at opening, check this option"),
-        'closing_control': fields.boolean('Closing Control', help="If you want the journal should be control at closing, check this option"),
-
         'amount_authorized_diff' : fields.float('Amount Authorized Difference'),
         'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'),
     }
     _defaults = {
-        'opening_control' : False,
-        'closing_control' : False,
         'self_checkout_payment_method' : False,
     }
 
@@ -46,6 +41,7 @@ class account_cash_statement(osv.osv):
     _columns = {
         'pos_session_id' : fields.many2one('pos.session'),
     }
+
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index d7f3be2a8d6..86fc8fec164 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -10,8 +10,6 @@
                     <page string="Point of Sale">
                         <group col="4" colspan="4">
                             <field name="journal_user"/>
-                            <field name="opening_control"/>
-                            <field name="closing_control"/>
                             <field name="amount_authorized_diff"/>
                             <field name="self_checkout_payment_method" />
                         </group>
@@ -113,37 +111,5 @@
             <field name="view_id" ref="account.view_bank_statement_form2"/>
             <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
         </record>
-
-        <!--
-        <menuitem name="Cash Register Management" parent="point_of_sale.menu_point_root"
-            id="menu_point_open_config" sequence="10"/>
-        <menuitem
-            name="Open Cash Registers" parent="menu_point_open_config"
-            string="Open Cash Registers"
-            action="action_pos_open_statement"
-            id="menu_open_statement" sequence="1" />
-
-        <menuitem
-            name="Close Cash Registers" parent="menu_point_open_config"
-            string="Close Cash Registers"
-            action="action_pos_close_statement"
-            id="menu_close_statement" sequence="2" />
-
-        <menuitem
-            parent="menu_point_open_config"
-            action="action_pos_confirm"
-            id="menu_wizard_pos_confirm" sequence="8" />
-
-
-        <menuitem
-            name="List of Cash Registers"
-            parent="menu_point_open_config"
-            action="action_new_bank_statement_all_tree"
-            id="menu_all_menu_all_register"
-            sequence="4"
-        />
-    -->
-
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f4d32985688..7d8a3ab0015 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -74,6 +74,17 @@ class pos_config(osv.osv):
         'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"),
     }
 
+    def _check_cash_control(self, cr, uid, ids, context=None):
+        return all(
+            (sum(int(journal.cash_control) for journal in record.journal_ids) <= 1)
+            for record in self.browse(cr, uid, ids, context=context)
+        )
+
+    _constraints = [
+        (_check_cash_control, "You cannot have two cash controls in one Point Of Sale !", ['journal_ids']),
+    ]
+
+
     def name_get(self, cr, uid, ids, context=None):
         result = []
         states = {
@@ -90,11 +101,6 @@ class pos_config(osv.osv):
             result.append((record.id, record.name + ' ('+session.user_id.name+')')) #, '+states[session.state]+')'))
         return result
 
-
-    def _default_payment_journal(self, cr, uid, context=None):
-        res = self.pool.get('account.journal').search(cr, uid, [('type', 'in', ('bank','cash'))], limit=2)
-        return res or []
-
     def _default_sale_journal(self, cr, uid, context=None):
         res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1)
         return res and res[0] or False
@@ -107,7 +113,6 @@ class pos_config(osv.osv):
         'state' : POS_CONFIG_STATE[0][0],
         'shop_id': _default_shop,
         'journal_id': _default_sale_journal,
-        'journal_ids': _default_payment_journal,
         'group_by' : True,
     }
 
@@ -148,45 +153,20 @@ class pos_session(osv.osv):
         ('closed', 'Closed & Posted'),
     ]
 
-    def _compute_cash_journal_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.journal_id.id
-                    break
-        return result
-
-    def _compute_cash_register_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.id
-                    break
-        return result
-
-    def _compute_controls(self, cr, uid, ids, fieldnames, args, context=None):
-        result = {}
+    def _compute_cash_all(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict()
 
         for record in self.browse(cr, uid, ids, context=context):
-            has_opening_control = False
-            has_closing_control = False
-
-            for journal in record.config_id.journal_ids:
-                if journal.opening_control == True:
-                    has_opening_control = True
-                if journal.closing_control == True:
-                    has_closing_control = True
-
-                if has_opening_control and has_closing_control:
-                    break
-
-            values = {
-                'has_opening_control': has_opening_control,
-                'has_closing_control': has_closing_control,
+            result[record.id] = {
+                'cash_journal_id' : False,
+                'cash_register_id' : False,
+                'cash_control' : False,
             }
-            result[record.id] = values
+            for st in record.statement_ids:
+                if st.journal_id.cash_control == True:
+                    result[record.id]['cash_control'] = True
+                    result[record.id]['cash_journal_id'] = st.journal_id.id
+                    result[record.id]['cash_register_id'] = st.id
 
         return result
 
@@ -212,12 +192,17 @@ class pos_session(osv.osv):
                 required=True, readonly=True,
                 select=1),
 
-        'cash_journal_id' : fields.function(_compute_cash_journal_id, method=True, 
-                type='many2one', relation='account.journal',
-                string='Cash Journal', store=True),
-        'cash_register_id' : fields.function(_compute_cash_register_id, method=True, 
-                type='many2one', relation='account.bank.statement',
-                string='Cash Register', store=True),
+        'cash_control' : fields.function(_compute_cash_all,
+                                         multi='cash',
+                                         type='boolean', string='Has Cash Control'),
+        'cash_journal_id' : fields.function(_compute_cash_all,
+                                            multi='cash',
+                                            type='many2one', relation='account.journal',
+                                            string='Cash Journal', store=True),
+        'cash_register_id' : fields.function(_compute_cash_all,
+                                             multi='cash',
+                                             type='many2one', relation='account.bank.statement',
+                                             string='Cash Register', store=True),
 
         'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids', 
                 type='one2many', relation='account.cashbox.line',
@@ -261,8 +246,6 @@ class pos_session(osv.osv):
         'order_ids' : fields.one2many('pos.order', 'session_id', 'Orders'),
 
         'statement_ids' : fields.one2many('account.bank.statement', 'pos_session_id', 'Bank Statement', readonly=True),
-        'has_opening_control' : fields.function(_compute_controls, string='Has Opening Control', multi='control', type='boolean'),
-        'has_closing_control' : fields.function(_compute_controls, string='Has Closing Control', multi='control', type='boolean'),
     }
 
     _defaults = {
@@ -372,10 +355,8 @@ class pos_session(osv.osv):
     def wkf_action_closing_control(self, cr, uid, ids, context=None):
         for session in self.browse(cr, uid, ids, context=context):
             for statement in session.statement_ids:
-                if statement.id <> session.cash_register_id.id:
-                    if statement.balance_end<>statement.balance_end_real:
-                        self.pool.get('account.bank.statement').write(cr, uid,
-                            [statement.id], {'balance_end_real': statement.balance_end})
+                if statement != session.cash_register_id and statement.balance_end != statement.balance_end_real:
+                    self.pool.get('account.bank.statement').write(cr, uid, [statement.id], {'balance_end_real': statement.balance_end})
         return self.write(cr, uid, ids, {'state' : 'closing_control', 'stop_at' : time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
     def wkf_action_close(self, cr, uid, ids, context=None):
@@ -388,7 +369,7 @@ class pos_session(osv.osv):
                     if not self.pool.get('ir.model.access').check_groups(cr, uid, "point_of_sale.group_pos_manager"):
                         raise osv.except_osv( _('Error!'),
                             _("Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
-                if st.difference:
+                if st.difference and st.journal_id.cash_control == True:
                     if st.difference > 0.0:
                         name= _('Point of Sale Profit')
                         account_id = st.journal_id.profit_account_id.id
@@ -695,7 +676,7 @@ class pos_order(osv.osv):
         }
         if 'payment_date' in data:
             args['date'] = data['payment_date']
-        args['name'] = order.name
+        args['name'] = order.session_id.name
         if data.get('payment_name', False):
             args['name'] = args['name'] + ': ' + data['payment_name']
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -1084,6 +1065,7 @@ class account_bank_statement_line(osv.osv):
     _columns= {
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
+
 account_bank_statement_line()
 
 class pos_order_line(osv.osv):
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index db8caaadf3b..47256279c59 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -8,7 +8,7 @@
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
             <field name="ean13">0410200000005</field>
         </record>
-    	  <record id="account.cash_journal" model="account.journal">
+        <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
         <record id="base.user_jsmith" model="res.users">
@@ -36,6 +36,10 @@
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
         </record>
 
+        <record model="pos.config" id="pos_config_main">
+            <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal')])]" />
+        </record>
+
         <!-- Resource: pos.category -->
 
         <record id="beverage" model="pos.category">
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index dce19ab77b6..c543be89d66 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -791,8 +791,7 @@
                                 <field name="code" />
                                 <field name="name" />
                                 <field name="type" />
-                                <field name="opening_control" />
-                                <field name="closing_control" />
+                                <field name="cash_control" />
                             </tree>
                         </field>
                         <group string="Material Interfaces" >
@@ -878,10 +877,10 @@
                     <header>
                         <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
                         <button name="cashbox_control" type="workflow" string="End of Session"
-                            attrs="{'invisible' : [('has_closing_control', '=', False),('state', '=', 'opened')]}" 
+                            attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '!=', 'opened')]}" 
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries"
-                            attrs="{'invisible' : [('has_closing_control', '=', True),('state', '=', 'opened')]}"
+                            attrs="{'invisible' : ['|', ('cash_control', '=', True),('state', '!=', 'opened')]}"
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
                             class="oe_highlight" />
@@ -900,8 +899,7 @@
                             <field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
                         </h1>
                         <group>
-                            <field name="has_opening_control" invisible="1" />
-                            <field name="has_closing_control" invisible="1" />
+                            <field name="cash_control" invisible="1" />
                             <group>
                                 <field name="user_id"/>
                                 <field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
@@ -912,20 +910,20 @@
                             </group>
                             <newline/>
 
-                            <group string="Opening Cash Control">
+                            <group string="Opening Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening)" />
+                                        <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
                                         <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '=', 'opening_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '!=', 'closing_control')]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_closing"/>
+                                        <field name="number_closing" />
                                         <field name="subtotal_closing"/>
                                     </tree>
                                 </field>
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index 87deb7f18fb..601fbae4d23 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -126,14 +126,14 @@
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_opening_control" />
       <field name="signal" eval="False" /> <!-- >start_to_opening_control</field> -->
-      <field name="condition">has_opening_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_start_to_open">
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_open" />
       <field name="signal" eval="False" />
-      <field name="condition">has_opening_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
     <!-- state:opening_control -> signal:open -> state:opened -> signal:cashbox_control -> state:closing_control -> signal:close -> state:close -->
 
@@ -147,14 +147,14 @@
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_closing_control" />
       <field name="signal">cashbox_control</field>
-      <field name="condition">has_closing_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_open_to_close">
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_close" />
       <field name="signal">close</field>
-      <field name="condition">has_closing_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
 
     <record model="workflow.transition" id="trans_closing_control_to_close">
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 572f6470c34..2219f711b93 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -65,7 +65,7 @@ class pos_open_statement(osv.osv_memory):
             statement_id = statement_obj.create(cr, uid, data, context=context)
             st_ids.append(int(statement_id))
 
-            if journal.opening_control:
+            if journal.cash_control:
                 statement_obj.button_open(cr, uid, [statement_id], context)
 
         tree_res = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_cash_statement_pos_tree')

From baad695095254e3cffca74d51195cc7c524db9fb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 28 Aug 2012 13:23:29 +0200
Subject: [PATCH 064/118] [FIX] account: company isn't a kwarg for set_default.
 company_id is

bzr revid: qdp-launchpad@openerp.com-20120828112329-g5y9n2e18bvci9r5
---
 addons/account/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5a61f73b6c1..7e0a6170bdb 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3347,9 +3347,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company=company_id)
+            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company=company_id)
+            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)

From 9c0ee11cbb5b8a097f2634cacba7fc2b94a06a14 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 28 Aug 2012 17:07:55 +0530
Subject: [PATCH 065/118] [FIX/IMP] Impoved the code and updated the usabality

bzr revid: jam@tinyerp.com-20120828113755-eaazn33wrdrw17xb
---
 addons/base_gengo/ir_translation.py                |  8 ++++----
 addons/base_gengo/ir_translation.xml               |  4 ++--
 addons/base_gengo/res_company.py                   |  4 ++--
 addons/base_gengo/res_company_view.xml             |  4 ++--
 .../base_gengo/wizard/gengo_update_translation.py  | 14 +++++++++-----
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 297e449ecdc..edf939b3851 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,10 +26,10 @@ class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_comment': fields.text("Comments"),
-        'gengo_translation': fields.boolean("Translation", help='This term has to be translated by Gengo automatically'),
-        'gengo_control': fields.boolean('Active'),
-        'job_id': fields.char('Gengo Job Id', size=32),
+        'gengo_comment': fields.text("Comments & Activity"),
+        'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
+        'gengo_control': fields.boolean('Gengo Traslated', help="If Term is translated using Gengo Service, the check box will be checked.", readonly=True),
+        'job_id': fields.char('Gengo JobId', size=32),
     }
 
     _defaults = {
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 30108c882b5..8a0e6a238b8 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -20,8 +20,8 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
-                    <group string="comments" col="1">
-                        <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translation Job...."/>
+                    <group string="Gengo Comments &amp; Activity" col="1">
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..."/>
                     </group>
                     <group col="4">
                         <field name="gengo_translation" />
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 9062095bb87..058a12bd6e8 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -31,8 +31,8 @@ class res_company(osv.Model):
            "gengo_tier": fields.selection([('machine', 'Machine'),
                                           ('standard', 'Standard'),
                                           ('pro', 'Pro'),
-                                          ('ultra', 'Ultra')], "Tier types", required=True),
-           "gengo_comment": fields.text("comments"),
+                                          ('ultra', 'Ultra')], "Tier Type", required=True),
+           "gengo_comment": fields.text("Comments"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index d78470c8b14..fdc0c8833a6 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -21,8 +21,8 @@
                             <field name="gengo_tier" />
                             <field name="gengo_auto_approve"/>
                         </group>
-                        <group string="Comments" col="1">
-                            <field name="gengo_comment" nolabel="1" placeholder="Add Your comments here for Translator...."/>
+                        <group string="Comments for Translator" col="1">
+                            <field name="gengo_comment" nolabel="1" placeholder="Add your comments here for translator...."/>
                         </group>
                     </page>
                 </xpath>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index cb11e3bf2d7..52c6e5b7fd8 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -127,7 +127,7 @@ class base_update_translation(osv.osv_memory):
                             new_langs.append(l)
             return list(set(new_langs))
 
-    def _update_terms(self, cr, uid, ids, response, tier, context):
+    def _update_terms(self, cr, uid, response, tier, context):
         translation_pool = self.pool.get('ir.translation')
         for jobs in response['jobs']:        
             for t_id, res in jobs.items():
@@ -139,7 +139,7 @@ class base_update_translation(osv.osv_memory):
                 translation_pool.write(cr, uid, [t_id], vals, context)
         return
 
-    def _send_translation_terms(self, cr, uid, ids, term_ids, context):
+    def _send_translation_terms(self, cr, uid,  term_ids, context):
         """
         Lazy Polling will be perform when user or cron request for the translation.
         """
@@ -150,7 +150,7 @@ class base_update_translation(osv.osv_memory):
             if request['jobs']:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
-                    self._update_terms(cr, uid, ids, result['response'], user.company_id.gengo_tier, context)
+                    self._update_terms(cr, uid, result['response'], user.company_id.gengo_tier, context)
         else:
             _logger.error(gengo)
         return True
@@ -221,6 +221,7 @@ class base_update_translation(osv.osv_memory):
         else:
             translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=limit, context=context)
             for term in translation_pool.browse(cr, uid, translation_id, context):
+                up_term = up_comment = 0
                 if term.job_id:
                     vals={}
                     job_response = gengo.getTranslationJob(id=term.job_id)
@@ -231,14 +232,17 @@ class base_update_translation(osv.osv_memory):
                         vals.update({'state': 'translated',
                             'value': job_response['response']['job']['body_tgt'],
                             'gengo_control': True})
+                        up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':
                         gengo_comments=""
                         for comment in job_comment['response']['thread']:
-                            gengo_comments+='%s by %s at %s. \n'    %(comment['body'],comment['author'],time.ctime(comment['ctime']))
+                            gengo_comments+='%s Commented on %s by %s. \n'%(comment['body'], time.ctime(comment['ctime']), comment['author'])
                         vals.update({'gengo_comment':gengo_comments})
+                        up_comment +=1
                     if vals:
                         translation_pool.write(cr, uid, term.id,vals)
+                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms."%(up_term, up_comment ))
         return True
 
     def _sync_request(self, cr, uid, limit=20, context=None):
@@ -256,7 +260,7 @@ class base_update_translation(osv.osv_memory):
             langs = self.check_lang_support(cr, uid, langs)
             term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
             if term_ids:
-                self._send_translation_terms(cr, uid, ids, term_ids, context)
+                self._send_translation_terms(cr, uid, term_ids, context)
                 _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))
             else:
                 _logger.info('No Translation terms to process.')

From 2606c563c476d88acc264544a71eed9b8479d31a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 28 Aug 2012 14:47:54 +0200
Subject: [PATCH 066/118] [IMP] add a template user to the portal and use it as
 default value in the external users config

bzr revid: abo@openerp.com-20120828124754-j2b5m7m58pdv6k0y
---
 addons/auth_signup/res_config.py  | 11 +++++++++++
 addons/auth_signup/res_config.xml |  2 +-
 addons/portal/portal_data.xml     | 12 ++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 6afd1c5b581..faa20d7a593 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -29,13 +29,24 @@ class base_config_settings(osv.TransientModel):
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
+    #todo: @al, @chs: what is this method for ?
     def get_default_signup(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
             'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
         }
 
+    #todo: @al, @chs: what is this method for ?
     def set_signup(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
         icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
+
+    def _get_default_template_user(self, cr, uid, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'portal', 'default_template_user')
+        return data_obj.browse(cr, uid, data_id).res_id
+
+    _defaults = {
+        'auth_signup_template_user_id': _get_default_template_user,
+    }
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index f09e9155b0e..c17634ececb 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -14,7 +14,7 @@
                     </div>
                     <div attrs="{'invisible':[('auth_signup_uninvited','=',False)]}">
                         <label for="auth_signup_template_user_id"/>
-                        <field name="auth_signup_template_user_id" class="oe_inline"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline" domain="['|',('active','=',0),('active','=',1)]"/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index ddfb4cc6729..ed01973b527 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,6 +2,18 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Create a portal template user -->
+        <record id="default_template_user" model="res.users">
+            <field name="name">Template Portal User</field>
+            <field name="login">portal-template</field>
+            <!-- No password: this template user doesn't need to log in -->
+            <field name="password"></field>
+            <field name="active" eval="False"/>
+            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
+            <field name="groups_id" eval="[(5,)]"/>
+            <field name="partner_id" eval="ref('base.res_partner_1')"/>
+        </record>
+
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>

From 7c5c081c7cd0582eda263f0788d2e50d497695bc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 28 Aug 2012 15:18:28 +0200
Subject: [PATCH 067/118] [FIX] account: The 'With Last Closing Balance' is
 checked per default in the demo mode

bzr revid: stw@openerp.com-20120828131828-lqmsnlqxph83vhaf
---
 addons/account/demo/account_minimal.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 0c62d5cf021..b7bc34a3e35 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -384,6 +384,7 @@
             <field name="profit_account_id" model="account.account" ref="rsa" />
             <field name="loss_account_id" model="account.account" ref="rsa" />
             <field name="internal_account_id" model="account.account" ref="chart0" />
+            <field name="with_last_closing_balance" eval="True" />
             <field name="cash_control" eval="True" />
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>

From 804031584467516e744cc686b6f297d063a87302 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 28 Aug 2012 18:58:20 +0530
Subject: [PATCH 068/118] [FIX] hr_holiday: subscribe manager of employee on
 leave confirm

bzr revid: hmo@tinyerp.com-20120828132820-unts2iems2a58q3o
---
 addons/hr_holidays/hr_holidays.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 24e1f66023b..0a26cfbb9f1 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -151,10 +151,6 @@ class hr_holidays(osv.osv):
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
     
-    def create(self, cr, uid, vals, context=None):
-        obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
-        return obj_id
-    
     def _create_resource_leave(self, cr, uid, leaves, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -305,6 +301,9 @@ class hr_holidays(osv.osv):
 
     def holidays_confirm(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
+                self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
@@ -367,7 +366,7 @@ class hr_holidays(osv.osv):
     def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
         """ Add 'user_id' and 'manager' to the monitored fields """
         res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id', 'manager_id', 'manager_id2']
+        return res + ['user_id']
         
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):

From aaa01ab8c49129fca3bb757370fdc5244f24af13 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 28 Aug 2012 18:36:57 +0200
Subject: [PATCH 069/118] [IMP] move the template user in the auth_signup
 module, and fix the default methods

bzr revid: abo@openerp.com-20120828163657-x4l6bhebwdq0kslp
---
 addons/auth_signup/__openerp__.py       |  5 ++++-
 addons/auth_signup/auth_signup_data.xml | 22 ++++++++++++++++++++++
 addons/auth_signup/res_config.py        | 15 ++-------------
 addons/portal/portal_data.xml           | 14 ++------------
 4 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 addons/auth_signup/auth_signup_data.xml

diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 5f889bfb119..9cfe89cdc1c 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -31,7 +31,10 @@ Allow users to sign up.
     'website': 'http://www.openerp.com',
     'installable': True,
     'depends': ['base_setup'],
-    'data': ['res_config.xml'],
+    'data': [
+        'auth_signup_data.xml',
+        'res_config.xml',
+    ],
     'js': ['static/src/js/auth_signup.js'],
     'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
new file mode 100644
index 00000000000..1549fee306e
--- /dev/null
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Default template user for new users signing in -->
+        <record id="default_template_user" model="res.users">
+            <field name="name">Template User</field>
+            <field name="login">portaltemplate</field>
+            <!-- No password: this template user doesn't need to log in -->
+            <field name="password"></field>
+            <field name="active" eval="False"/>
+            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
+            <field name="groups_id" eval="[(5,)]"/>
+        </record>
+
+        <record model="ir.config_parameter" id="blabla">
+            <field name="key">auth.signup_template_user_id</field>
+            <field name="value" ref="default_template_user"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index faa20d7a593..888e932bb9f 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -29,24 +29,13 @@ class base_config_settings(osv.TransientModel):
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
-    #todo: @al, @chs: what is this method for ?
-    def get_default_signup(self, cr, uid, fields, context=None):
+    def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
             'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
         }
 
-    #todo: @al, @chs: what is this method for ?
-    def set_signup(self, cr, uid, ids, context=None):
+    def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
         icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
-
-    def _get_default_template_user(self, cr, uid, context=None):
-        data_obj = self.pool.get('ir.model.data')
-        data_id = data_obj._get_id(cr, uid, 'portal', 'default_template_user')
-        return data_obj.browse(cr, uid, data_id).res_id
-
-    _defaults = {
-        'auth_signup_template_user_id': _get_default_template_user,
-    }
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index ed01973b527..eb06ca656d6 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,22 +2,12 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Create a portal template user -->
-        <record id="default_template_user" model="res.users">
-            <field name="name">Template Portal User</field>
-            <field name="login">portal-template</field>
-            <!-- No password: this template user doesn't need to log in -->
-            <field name="password"></field>
-            <field name="active" eval="False"/>
-            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
-            <field name="groups_id" eval="[(5,)]"/>
-            <field name="partner_id" eval="ref('base.res_partner_1')"/>
-        </record>
-
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>
             <field name="override_menu" eval="False"/>
+            <!-- Insert the template user from auth_signup in the portal members group -->
+            <field name="users" eval="[(4,ref('auth_signup.default_template_user'))]"/>
         </record>
 
         <!-- Mail group for the company's news -->

From eb5b3f57330fb12d75673a2e07cf40d299b997fc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 10:26:47 +0200
Subject: [PATCH 070/118] [REF] base_gengo: misc code improvements made during
 code review

bzr revid: qdp-launchpad@openerp.com-20120829082647-rzl1btht2xc05ee4
---
 addons/base_gengo/res_company.py              |  6 +-
 .../wizard/gengo_update_translation.py        | 99 +++++++++++--------
 2 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 058a12bd6e8..610e46d05d2 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -26,13 +26,13 @@ class res_company(osv.Model):
     _name = "res.company"
     _inherit = "res.company"
     _columns = {
-           "gengo_private_key": fields.text("Gengo private key"),
-           "gengo_public_key": fields.text("Gengo public key"),
+           "gengo_private_key": fields.text("Gengo Private Key"),
+           "gengo_public_key": fields.text("Gengo Public Key"),
            "gengo_tier": fields.selection([('machine', 'Machine'),
                                           ('standard', 'Standard'),
                                           ('pro', 'Pro'),
                                           ('ultra', 'Ultra')], "Tier Type", required=True),
-           "gengo_comment": fields.text("Comments"),
+           "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 52c6e5b7fd8..2299af02480 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -33,6 +33,8 @@ import time
 
 _logger = logging.getLogger(__name__)
 
+GENGO_DEFAULT_LIMIT = 20
+
 LANG_CODE_MAPPING = {
     'ar_SA': ('ar', 'Arabic'),
     'id_ID': ('id', 'Indonesian'),
@@ -56,14 +58,14 @@ LANG_CODE_MAPPING = {
 }
 
 CRON_VALS = {
-    'name': 'Gengo Sync',
+    'name': _('Synchronization with Gengo'),
     'active': True,
     'interval_number': 20,
     'interval_type': 'minutes',
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(20,)'",
+    'args': "'(20,)'",#not sure
 }
 
 
@@ -75,11 +77,11 @@ class base_update_translation(osv.osv_memory):
     def gengo_authentication(self, cr, uid, context=None):
         ''' To Send Request and Get Response from Gengo User needs Public and Private
          key for that user need to sign up to gengo and get public and private
-         key which is provided by gengo to authentic user '''
+         key which is provided by gengo to authenticate user '''
 
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, "  - Invalid gengo configuration, Either Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameter under `Settings > Companies > Gengo Parameters`.")
+            return (False, _("  - Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -89,24 +91,32 @@ class base_update_translation(osv.osv_memory):
             gengo.getAccountStats()
             return (True, gengo)
         except Exception, e:
-            return (False, "Gengo Connection Error\n%s"%e)
+            return (False, _("Gengo Connection Error\n%s") %e)
+
+    def pack_jobs_request(self, cr, uid, term_ids, context=None):
+        ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
+            {'jobs': {
+                'term1.id': {...}
+                'term2.id': {...}
+                }
+            }'''
 
-    def pack_jobs_request(self, cr, uid, term_ids, context):
-        jobs = {}
-        gengo_parameter_pool = self.pool.get('res.users').browse(cr, uid, uid, context)
         translation_pool = self.pool.get('ir.translation')
-        auto_approve = gengo_parameter_pool.company_id.gengo_auto_approve and 1 or 0
-        for term in translation_pool.browse(cr, uid, term_ids, context):
+        jobs = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        auto_approve = 1 if user.company_id.gengo_auto_approve or 0
+        for term in translation_pool.browse(cr, uid, term_ids, context=context):
             if re.search(r"\w", term.src or ""):
-                job = {'type': 'text',
+                jobs[term.id] = {'type': 'text',
                         'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
-                        'tier': tools.ustr(gengo_parameter_pool.company_id.gengo_tier),
+                        'tier': tools.ustr(user.company_id.gengo_tier),
+                        #'tier': tools.ustr(term.gengo_tier),
                         'body_src': term.src,
                         'lc_src': 'en',
                         'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
                         'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment}
-                jobs.update({term.id: job})
+                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                }
         return {'jobs': jobs}
 
     def check_lang_support(self, cr, uid, langs, context=None):
@@ -115,35 +125,38 @@ class base_update_translation(osv.osv_memory):
         if not flag:
             return []
         else:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             tier = user.company_id.gengo_tier
             if tier == "machine":
                 tier = "nonprofit"
             lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+            #print "tier", tier
+
             if lang_pair['opstat'] == 'ok':
                 for g_lang in lang_pair['response']:
+                     #print 'g_lang', g_lang['lc_tgt'], g_lang['tier']
                     for l in langs:
                         if LANG_CODE_MAPPING[l][0] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
                             new_langs.append(l)
             return list(set(new_langs))
 
-    def _update_terms(self, cr, uid, response, tier, context):
+    def _update_terms(self, cr, uid, response, tier, context=None):
         translation_pool = self.pool.get('ir.translation')
-        for jobs in response['jobs']:        
+        for jobs in response['jobs']:
             for t_id, res in jobs.items():
                 vals = {}
                 if tier == "machine":
                     vals.update({'value': res['body_tgt'], 'state': 'translated'})
                 else:
                     vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
-                translation_pool.write(cr, uid, [t_id], vals, context)
+                translation_pool.write(cr, uid, [t_id], vals, context=context)
         return
 
-    def _send_translation_terms(self, cr, uid,  term_ids, context):
+    def _send_translation_terms(self, cr, uid,  term_ids, context=None):
         """
         Lazy Polling will be perform when user or cron request for the translation.
         """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if flag:
             request = self.pack_jobs_request(cr, uid, term_ids, context)
@@ -170,33 +183,33 @@ class base_update_translation(osv.osv_memory):
             context = {}
         lang_pool = self.pool.get('res.lang')
         super(base_update_translation, self).act_update(cr, uid, ids, context)
-        msg = "1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n"
+        msg = _("1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n")
         flag, gengo = self.gengo_authentication(cr, uid, context)
         if not flag:
             msg += gengo
         else:
-            for res in self.browse(cr, uid, ids, context):
+            for res in self.browse(cr, uid, ids, context=context):
                 lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
                 lang_name = self._get_lang_name(cr, uid, res.lang)
                 try:
                     if LANG_CODE_MAPPING[res.lang][0]:
                         lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
                     if lang_search:
-                        msg += '  - This language `%s` is already in queue for translation.' % (lang_name)
+                        msg += _('  - This language `%s` is already in queue for translation.') % (lang_name)
                     else:
-                        msg += '  - The language `%s` is queued for translation through Gengo translation.' % (lang_name)
+                        msg += _('  - The language `%s` is queued for translation through Gengo translation.') % (lang_name)
                         lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
                         _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', 'Gengo Sync Translation (Request)', '_sync_request', context)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', 'Gengo Sync Translation (Response)', '_sync_response', context)
-                    self._sync_request(cr, uid, limit=20)
+                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context)
+                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context)
+                    self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT)
                 except:
-                    msg +='  - The Language `%s` is not supported by Gengo Traditional Service.'%(lang_name)
+                    msg += _('  - The Language `%s` is not supported by Gengo Traditional Service.') % (lang_name)
 
-        context.update({'message': msg})
         obj_model = self.pool.get('ir.model.data')
         model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
         view_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        context.update({'message': msg})
         return {
                  'view_type': 'form',
                  'view_mode': 'form',
@@ -207,7 +220,7 @@ class base_update_translation(osv.osv_memory):
                  'context': context,
              }
 
-    def _sync_response(self, cr, uid, limit=20, context=None):
+    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
         """
         This method  will be call by cron services to get translation from
         gengo for translation terms which are posted to be translated. It will
@@ -226,7 +239,7 @@ class base_update_translation(osv.osv_memory):
                     vals={}
                     job_response = gengo.getTranslationJob(id=term.job_id)
                     if job_response['opstat'] != 'ok':
-                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s."%(term.job_id))
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
@@ -237,27 +250,27 @@ class base_update_translation(osv.osv_memory):
                     if job_comment['opstat']=='ok':
                         gengo_comments=""
                         for comment in job_comment['response']['thread']:
-                            gengo_comments+='%s Commented on %s by %s. \n'%(comment['body'], time.ctime(comment['ctime']), comment['author'])
-                        vals.update({'gengo_comment':gengo_comments})
+                            gengo_comments += _('%s Commented on %s by %s. \n') %(comment['body'], time.ctime(comment['ctime']), comment['author'])
+                        vals.update({'gengo_comment': gengo_comments})
                         up_comment +=1
                     if vals:
                         translation_pool.write(cr, uid, term.id,vals)
-                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms."%(up_term, up_comment ))
+                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms." % (up_term, up_comment ))
         return True
 
-    def _sync_request(self, cr, uid, limit=20, context=None):
-        """
-        This scheduler will send a job request to the gengo , which terms are
-        in translate state and gengo_translation is true
-        """
+    def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """This scheduler will send a job request to the gengo , which terms are
+        waiing to be translated and for which gengo_translation is True"""
         if context is None:
             context = {}
         language_pool = self.pool.get('res.lang')
         translation_pool = self.pool.get('ir.translation')
         try:
-            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)])
-            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids)]
-            langs = self.check_lang_support(cr, uid, langs)
+            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)]) #really? what's the point not checking ALL the languages if gengo support it? i feel like it's aunecessary load for the user that must configure yet another thing
+            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
+            #print "LANGS 1", langs
+            langs = self.check_lang_support(cr, uid, langs, context=context)#must move
+            #print "LANGS 2", langs
             term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
             if term_ids:
                 self._send_translation_terms(cr, uid, term_ids, context)

From db08eb4d0a40b15557505bbddbac05f6ff04f91f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 11:50:22 +0200
Subject: [PATCH 071/118] [REF] base_gengo: misc code improvements made during
 code review

bzr revid: qdp-launchpad@openerp.com-20120829095022-i3fsdc0nvok78q25
---
 addons/base_gengo/ir_translation.py                  |  7 +------
 addons/base_gengo/ir_translation.xml                 | 11 ++++-------
 addons/base_gengo/wizard/gengo_update_translation.py |  6 +++---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index edf939b3851..c8a5f9ef070 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -26,12 +26,7 @@ class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_comment': fields.text("Comments & Activity"),
         'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
-        'gengo_control': fields.boolean('Gengo Traslated', help="If Term is translated using Gengo Service, the check box will be checked.", readonly=True),
+        'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
         'job_id': fields.char('Gengo JobId', size=32),
     }
-
-    _defaults = {
-        'gengo_control': False,
-    }
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 8a0e6a238b8..6725504df8a 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -7,8 +7,7 @@
             <field name="inherit_id" ref="base.view_translation_search"/>
             <field name="arch" type="xml">
                 <search string="Translations">
-                     <filter icon="terp-project" string="In Progress" domain="[('state','=','inprogress')]"></filter>
-                     <filter string="To Control" domain="[('state','=','translated')]"></filter>
+                     <filter string="To Approve In Gengo" domain="[('state','=','inprogress'),('gengo_translation','=',True)]"></filter>
                 </search>
             </field>
         </record>
@@ -20,12 +19,10 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
-                    <group string="Gengo Comments &amp; Activity" col="1">
-                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..."/>
-                    </group>
-                    <group col="4">
+                    <group string="Gengo Translation Service" col="4" colspan="4">
                         <field name="gengo_translation" />
-                        <field name="gengo_control" />
+                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are suppose to do that directly by using your Gengo Account"/>
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 2299af02480..357d2a5bf74 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -65,7 +65,7 @@ CRON_VALS = {
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(20,)'",#not sure
+    'args': "'(%s,)'" %s GENGO_DEFAULT_LIMIT,
 }
 
 
@@ -175,6 +175,7 @@ class base_update_translation(osv.osv_memory):
             model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
             cron_pool.write(cr, uid, [res], {'active': True}, context=context)
         except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
             CRON_VALS.update({'name': name, "function": fn})
             return cron_pool.create(cr, uid, CRON_VALS, context)
 
@@ -243,8 +244,7 @@ class base_update_translation(osv.osv_memory):
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt'],
-                            'gengo_control': True})
+                            'value': job_response['response']['job']['body_tgt'])
                         up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':

From 55cc723fc183c888cfc57fa2d78654a79c029132 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 11:51:37 +0200
Subject: [PATCH 072/118] [FIX] base_gengo: syntax error fixed

bzr revid: qdp-launchpad@openerp.com-20120829095137-hy91xbg1gicwzid2
---
 addons/base_gengo/wizard/gengo_update_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 357d2a5bf74..23e66a9489d 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -104,7 +104,7 @@ class base_update_translation(osv.osv_memory):
         translation_pool = self.pool.get('ir.translation')
         jobs = {}
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        auto_approve = 1 if user.company_id.gengo_auto_approve or 0
+        auto_approve = 1 if user.company_id.gengo_auto_approve else 0
         for term in translation_pool.browse(cr, uid, term_ids, context=context):
             if re.search(r"\w", term.src or ""):
                 jobs[term.id] = {'type': 'text',

From f1febea2a3a5cef2585a097738eff52d90da4840 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 29 Aug 2012 12:10:03 +0200
Subject: [PATCH 073/118] [FIX] base_gengo: syntax error fixed

bzr revid: qdp-launchpad@openerp.com-20120829101003-3t7zpydsg6lk3ap1
---
 addons/base_gengo/wizard/gengo_update_translation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index 23e66a9489d..a7c8deb0348 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -65,7 +65,7 @@ CRON_VALS = {
     'numbercall': -1,
     'model': "'base.update.translations'",
     'function': "",
-    'args': "'(%s,)'" %s GENGO_DEFAULT_LIMIT,
+    'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
 }
 
 
@@ -244,7 +244,7 @@ class base_update_translation(osv.osv_memory):
                         continue
                     if job_response['response']['job']['status'] == 'approved':
                         vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt'])
+                            'value': job_response['response']['job']['body_tgt']})
                         up_term += 1
                     job_comment = gengo.getTranslationJobComments(id=term.job_id)
                     if job_comment['opstat']=='ok':

From 6aded504b3245d35da48e2420bbaf4d9178e8f16 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 29 Aug 2012 14:25:01 +0200
Subject: [PATCH 074/118] [FIX] point_of_sale: redefine the copy function for
 the pos.config to avoid a copy of the sequence. [IMP] point_of_sale:
 Associate a default category for the existing products.

bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
---
 addons/point_of_sale/point_of_sale.py       | 35 +++++++++++++++++++--
 addons/point_of_sale/point_of_sale_view.xml |  3 +-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 7d8a3ab0015..8da582f752f 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -84,6 +84,15 @@ class pos_config(osv.osv):
         (_check_cash_control, "You cannot have two cash controls in one Point Of Sale !", ['journal_ids']),
     ]
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        d = {
+            'sequence_id' : False,
+        }
+        d.update(default)
+        return super(pos_order, self).copy(cr, uid, id, d, context=context)
+
 
     def name_get(self, cr, uid, ids, context=None):
         result = []
@@ -676,7 +685,7 @@ class pos_order(osv.osv):
         }
         if 'payment_date' in data:
             args['date'] = data['payment_date']
-        args['name'] = order.session_id.name
+        args['name'] = order.name
         if data.get('payment_name', False):
             args['name'] = args['name'] + ': ' + data['payment_name']
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -712,7 +721,7 @@ class pos_order(osv.osv):
             'pos_statement_id' : order_id,
             'journal_id' : journal_id,
             'type' : 'customer',
-            'ref' : order.name,
+            'ref' : order.session_id.name,
         })
 
         statement_line_obj.create(cr, uid, args, context=context)
@@ -1266,8 +1275,30 @@ class product_product(osv.osv):
             help="If you want to sell this product through the point of sale, select the category it belongs to."),
         'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
     }
+
+    def _default_pos_categ_id(self, cr, uid, context=None):
+        proxy = self.pool.get('ir.model.data')
+
+        try:
+            category_id = proxy.get_object_reference(cr, uid, 'point_of_sale', 'categ_others')[1]
+        except ValueError:
+            values = {
+                'name' : 'Others',
+            }
+            category_id = self.pool.get('pos.category').create(cr, uid, values, context=context)
+            values = {
+                'name' : 'categ_others',
+                'model' : 'pos.category',
+                'module' : 'point_of_sale',
+                'res_id' : category_id,
+            }
+            proxy.create(cr, uid, values, context=context)
+
+        return category_id
+
     _defaults = {
         'to_weight' : False,
+        'pos_categ_id' : _default_pos_categ_id,
     }
 
     def edit_ean(self, cr, uid, ids, context):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c543be89d66..251591685e0 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -126,7 +126,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="view_pos_order_tree">
-            <field name="name">Sales</field>
+            <field name="name">Orders</field>
             <field name="model">pos.order</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
@@ -138,6 +138,7 @@
                     <field name="amount_total" sum="Amount total"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
+                    <field name="session_id" />
                 </tree>
             </field>
         </record>

From fd4178ee58d80dbcdf4795d69168fac2fbc67c9f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 29 Aug 2012 16:34:53 +0200
Subject: [PATCH 075/118] [IMP] auth_signup: better ids for the
 config_parameter record

bzr revid: abo@openerp.com-20120829143453-vn6l5b1c8kcvxqgj
---
 addons/auth_signup/auth_signup_data.xml | 4 ++--
 addons/auth_signup/res_config.py        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
index 1549fee306e..4a6bf9ae4b9 100644
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -13,8 +13,8 @@
             <field name="groups_id" eval="[(5,)]"/>
         </record>
 
-        <record model="ir.config_parameter" id="blabla">
-            <field name="key">auth.signup_template_user_id</field>
+        <record id="default_template_user" model="ir.config_parameter">
+            <field name="key">auth_signup.template_user_id</field>
             <field name="value" ref="default_template_user"/>
         </record>
 
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 888e932bb9f..813a903870c 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -32,10 +32,10 @@ class base_config_settings(osv.TransientModel):
     def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
-            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
+            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth_signup.template_user_id', 0) or False
         }
 
     def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
-        icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
+        icp.set_param(cr, uid, 'auth_signup.template_user_id', config.auth_signup_template_user_id.id)

From 7d120eb1d10385849be55ad70ad0992329077f2a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 29 Aug 2012 17:46:34 +0200
Subject: [PATCH 076/118] [FIX] point_of_sale: Set the right balance end for a
 bank statement [FIX] point_of_sale: Show/Hide some tabs

bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
---
 addons/point_of_sale/point_of_sale.py       | 3 +++
 addons/point_of_sale/point_of_sale_view.xml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 8da582f752f..b17e672cb9c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -396,6 +396,9 @@ class pos_session(osv.osv):
                         'account_id': account_id
                     }, context=context)
 
+                if st.journal_id.type == 'bank':
+                    st.write({'balance_end_real' : st.balance_end})
+
                 getattr(st, 'button_confirm_%s' % st.journal_id.type)(context=context)
         self._confirm_orders(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state' : 'closed'}, context=context)
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 251591685e0..8d7e3c3cefe 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -911,7 +911,7 @@
                             </group>
                             <newline/>
 
-                            <group string="Opening Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
+                            <group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '=', 'closed')]}">
                                 <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -920,7 +920,7 @@
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '!=', 'closing_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '!=', 'closing_control')]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
@@ -930,7 +930,7 @@
                                 </field>
                             </group>
 
-                            <div>
+                            <div attrs="{'invisible': [('state', '=', 'closed')]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
@@ -947,7 +947,7 @@
                             </div>
 
 
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', 'in', ('opening_control', 'closed'))]}">
                                 <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>

From 7e05e04f7b42966bff908994885f8e0b75638d89 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:47:19 +0200
Subject: [PATCH 077/118] [FIX] project: fix breakage of inherited project
 views after recent fp commits

bzr revid: odo@openerp.com-20120830094719-1vcyuk81as5x4pyp
---
 .../project_long_term_view.xml                | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..55a91b36f08 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -96,11 +96,14 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -347,11 +350,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_phases"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>

From 060baf72f947c119bb10c45e902ba4c307383add Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Aug 2012 11:48:11 +0200
Subject: [PATCH 078/118] [FIX] TranslateDialog#start() should return a
 deferred

bzr revid: fme@openerp.com-20120830094811-p88qbd8tiesu8ry2
---
 addons/web/static/src/js/views.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index c608e662f0a..b9739767c6d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1077,14 +1077,13 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({
     start: function() {
         var self = this;
         this._super();
-        $.when(this.languages_loaded).then(function() {
+        return $.when(this.languages_loaded).then(function() {
             self.$el.html(instance.web.qweb.render('TranslateDialog', { widget: self }));
             self.$fields_form = self.$el.find('.oe_translation_form');
             self.$fields_form.find('.oe_trad_field').change(function() {
                 $(this).toggleClass('touched', ($(this).val() != $(this).attr('data-value')));
             });
         });
-        return this;
     },
     on_languages_loaded: function(langs) {
         this.languages = langs;

From d5713782fe0cab2a40b1e110e79e93c6867b4e85 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:49:13 +0200
Subject: [PATCH 079/118] [FIX] project_long_term: wording

bzr revid: odo@openerp.com-20120830094913-rhv8iy1jxgd22vmw
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d5ac3868a5e..2eab5fa6ac6 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:

From 424085389f05d45d45f83a9911ba7e68cf82d4ba Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:58:21 +0200
Subject: [PATCH 080/118] [FIX] pad: fix case of missing pad server

Default to empty pad url when sever is not set, UI will gracefully handle this case

bzr revid: odo@openerp.com-20120830095821-2044b23scst5dktk
---
 addons/pad/pad.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 6f6b435cf3c..d21ccd42d16 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -12,6 +12,8 @@ class pad_common(osv.osv_memory):
     def pad_generate_url(self, cr, uid, context=None):
         pad_server = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.pad_server
         # make sure pad server in the form of http://hostname
+        if not pad_server:
+            return ''
         if not pad_server.startswith('http'):
             pad_server = 'http://' + pad_server
         pad_server = pad_server.rstrip('/')

From a99e5cae0a791cc870870435c6edd78b76301744 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 12:00:34 +0200
Subject: [PATCH 081/118] [FIX] lxml 3.0a2 has been deployed to pypi for some
 reason, pin to lxml < 3 for now

bzr revid: xmo@openerp.com-20120830100034-baug3vb3wlfncf5e
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 77a59d52cf7..a26b74e255d 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ setuptools.setup(
           'docutils',
           'feedparser',
           'gdata',
-          'lxml',
+          'lxml < 3',
           'mako',
           'psycopg2',
           'pydot',

From a1e474fa8129f18ecf573b379cbbd5257ee6acbe Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Aug 2012 12:27:46 +0200
Subject: [PATCH 082/118] [IMP] TranslateDialog#on_btn_save should return its
 mutex

bzr revid: fme@openerp.com-20120830102746-hqrzn8vh0rlsdvyu
---
 addons/web/static/src/js/views.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b9739767c6d..e453ecbc905 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1135,9 +1135,9 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({
         });
     },
     on_btn_save: function() {
-        var trads = {},
-            self = this,
-            trads_mutex = new $.Mutex();
+        var trads = {};
+        var self = this;
+        var trads_mutex = new $.Mutex();
         self.$fields_form.find('.oe_trad_field.touched').each(function() {
             var field = $(this).attr('name').split('-');
             if (!trads[field[0]]) {
@@ -1156,6 +1156,7 @@ instance.web.TranslateDialog = instance.web.Dialog.extend({
             });
         });
         this.close();
+        return trads_mutex;
     },
     on_btn_close: function() {
         this.close();

From 46604fccb57dce8fa1ee2e15bc9ec97e0b5a589d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 30 Aug 2012 17:20:55 +0530
Subject: [PATCH 083/118] [FIX] Impoved treanlstion state field conditions

bzr revid: jam@tinyerp.com-20120830115055-tf396grzw3f6olfz
---
 openerp/addons/base/ir/ir_translation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 72c0c0b9208..de2608a081a 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -77,7 +77,7 @@ class ir_translation_import_cursor(object):
     def push(self, ddict):
         """Feed a translation, as a dictionary, into the cursor
         """
-        state = ddict['value'] and "translated"  or "to_translate"
+        state =  "translated" if (ddict['value'] and ddict['value'] != "") else "to_translate"
         self._cr.execute("INSERT INTO " + self._table_name \
                 + """(name, lang, res_id, src, type,
                         imd_model, imd_module, imd_name, value,state)
@@ -172,7 +172,7 @@ class ir_translation(osv.osv):
     }
     
     _defaults = {
-        'state':'translated',
+        'state':'to_translate',
     }
     
     _sql_constraints = [ ('lang_fkey_res_lang', 'FOREIGN KEY(lang) REFERENCES res_lang(code)', 

From 209ff94873b6ead6ab7a69a8f0da9ff3bf4cf4a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 14:09:04 +0200
Subject: [PATCH 084/118] fix

bzr revid: fp@tinyerp.com-20120830120904-pen3o3nyviryh4q9
---
 addons/project_long_term/project_long_term_view.xml | 8 +++-----
 1 file changed, 3 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 b4b98e8fe4a..4009cd9e5e0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -347,11 +347,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
-                    <field name="use_phases"/>
+                <xpath expr='//div[@name="options_active"]' position='after'>
+                    <field name="use_phases" class="oe_inline"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>

From 15c7043f566d6177651a2343aada78c3f9918645 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Aug 2012 14:14:03 +0200
Subject: [PATCH 085/118] [IMP] make resequence field customizable, make
 sequence number for first record configurable

bzr revid: xmo@openerp.com-20120830121403-82cr13t824jdxcsh
---
 addons/web/controllers/main.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f9c36a1f0c0..cf7a7a06feb 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1190,12 +1190,26 @@ class DataSet(openerpweb.Controller):
         return req.session.exec_workflow(model, id, signal)
 
     @openerpweb.jsonrequest
-    def resequence(self, req, model, ids):
+    def resequence(self, req, model, ids, field='sequence', offset=0):
+        """ Re-sequences a number of records in the model, by their ids
+
+        The re-sequencing starts at the first model of ``ids``, the sequence
+        number is incremented by one after each record and starts at ``offset``
+
+        :param ids: identifiers of the records to resequence, in the new sequence order
+        :type ids: list(id)
+        :param str field: field used for sequence specification, defaults to
+                          "sequence"
+        :param int offset: sequence number for first record in ``ids``, allows
+                           starting the resequencing from an arbitrary number,
+                           defaults to ``0``
+        """
         m = req.session.model(model)
-        if not len(m.fields_get(['sequence'])):
+        if not m.fields_get([field]):
             return False
-        for i in range(len(ids)):
-            m.write([ids[i]], { 'sequence': i })
+        # python 2.6 has no start parameter
+        for i, id in enumerate(ids):
+            m.write(id, { field: i + offset })
         return True
 
 class DataGroup(openerpweb.Controller):

From bff39cb5b3fe77403c259d4e72c63956d2c76c17 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 14:19:27 +0200
Subject: [PATCH 086/118] [IMP] Drag handle on SO lines

bzr revid: fp@tinyerp.com-20120830121927-z35yximn8omvhv2k
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c4edc162f08..a0e69efe849 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -259,8 +259,8 @@
                                     </div>
                                 </form>
                                 <tree string="Sales Order Lines" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
                                     <field name="state" invisible="1"/>
-                                    <field name="sequence" invisible="1"/>
                                     <field name="delay" invisible="1"/>
                                     <field name="tax_id" invisible="1"/>
                                     <field name="type" invisible="1"/>

From 01e5824fb0f0bfc9f81c8833861aee1fc891bbfa Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 30 Aug 2012 14:43:37 +0200
Subject: [PATCH 087/118] [IMP] web_api improve example

bzr revid: al@openerp.com-20120830124337-4uraforhvgv18tff
---
 addons/web_api/static/src/example.html | 38 ++++++++++++--------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/addons/web_api/static/src/example.html b/addons/web_api/static/src/example.html
index 9c920e31fa2..5408b1de36c 100644
--- a/addons/web_api/static/src/example.html
+++ b/addons/web_api/static/src/example.html
@@ -18,38 +18,34 @@
         <script type="text/javascript">
         $(function() {
             $("body").on('click','button',function(ev){
-                eval($("pre.run").text());
+                console.log($("textarea").val());
+                eval($("textarea").val());
             });
         });
         </script> 
     </head> 
     <body>
-        <h1>OpenERP web_api examples</h1>
-        <h2>Example 1: Load the list of defined ir.model <button>Run it !</button></h2>
-        <blockquote>
-        <h3>Code: </h3>
+        <h1>OpenERP web_api test</h1>
+        <h2>Example: Load the content of ir.model <button>Run it !</button></h2>
         <pre>
 &lt;script type="text/javascript" src="/web/webclient/js"&gt;&lt;/script&gt;
 &lt;script type="text/javascript"&gt;
-<pre id="ex1" class="run">
-    var instance = openerp.init(["web"]); // get a new instance
-    instance.session.session_bind(); // bind it to the right hostname
-    instance.session.session_authenticate("trunk", "admin", "admin", false).then(function() {
-        var ds = new instance.web.DataSetSearch(null, "ir.model");
-        ds.read_slice(['name','model'], {}).then(function(models){
-            _.each(models,function(m,i){
-                $("#ex1res").append("&lt;li&gt;" + m.model + " (" + m.name + ") &lt;/li&gt;")
-            });
+<textarea rows="12" cols="100"id="ex1" class="run">
+var instance = openerp.init(["web"]); // get a new instance
+instance.session.session_bind(); // bind it to the right hostname
+instance.session.session_authenticate("trunk", "admin", "admin", false).then(function() {
+    var ds = new instance.web.DataSetSearch(null, "ir.model");
+    ds.read_slice(['name','model'], {}).then(function(models){
+        _.each(models,function(m,i){
+            $("#result").append("&lt;li&gt;" + m.model + " (" + m.name + ") &lt;/li&gt;")
         });
     });
-</pre>&lt;/script&gt;
+});
+</textarea>
+&lt;/script&gt;</pre>
+        <h3>Result:</h3>
+        <pre id="result" class="result">
         </pre>
-        <h3>Div for output:</h3>
-        <div id="ex1res" class="result">
-        &nbsp;
-        </div>
-        </blockquote>
-        <h2>Help me to complete this examples on <a href="http://bazaar.launchpad.net/~openerp/openerp-web/trunk/view/head:/addons/web_api/static/src/example.html">launchpad</a></h2>
     </body> 
 </html> 
 

From 3fea5ea545bf822162ec59a5d52eba513e2fbe34 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 30 Aug 2012 16:34:12 +0200
Subject: [PATCH 088/118] [IMP] allow hyphens in dbnames

bzr revid: al@openerp.com-20120830143412-0n9rag5fa92swnys
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8478ffeda22..511e37f4ab4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -120,7 +120,7 @@
                     </tr>
                     <tr>
                         <td><label for="db_name">New database name:</label></td>
-                        <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$" autofocus="true"/></td>
+                        <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_-]+$" autofocus="true"/></td>
                     </tr>
                     <tr>
                         <td><label for="demo_data">Load Demonstration data:</label></td>

From 46f287b2d19b1811a359a74057a3dbe44c6ba449 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 16:50:00 +0200
Subject: [PATCH 089/118] [FIX] base, ir_translation: a write of '' as
 translated value should reset the translation in 'to_translate' state

bzr revid: qdp-launchpad@openerp.com-20120830145000-61uh1tpux5dyp7na
---
 openerp/addons/base/ir/ir_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index de2608a081a..23cedbdc574 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -307,7 +307,7 @@ class ir_translation(osv.osv):
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if vals.get('src'):
+        if vals.get('src') or ('value' in vals and not(vals.get('value'))):
             result = vals.update({'state':'to_translate'})
         if vals.get('value'):
             result = vals.update({'state':'translated'})

From 1c3f30a081c779618b892322924951c88ae9b063 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 18:14:29 +0200
Subject: [PATCH 090/118] [IMP] base_gengo: lots of changes made during the
 code review. Among * database scheme simplification * merge of boolean on
 ir.translation and selection fields on res.company to select the tier (level
 service of gengo), which is now located on ir.translation * move of all the
 new features in a new wizard * removal of wizard to display the results

bzr revid: qdp-launchpad@openerp.com-20120830161429-h7rti6hbnrk8mozg
---
 addons/base_gengo/__openerp__.py              |   4 +-
 addons/base_gengo/ir_translation.py           |  60 +++-
 addons/base_gengo/wizard/__init__.py          |   3 +-
 .../base_gengo/wizard/alert_message_gengo.xml |  17 -
 ...anslation.py => base_gengo_translation.py} | 323 ++++++++----------
 .../wizard/base_gengo_translation_view.xml    |  39 +++
 .../base_gengo/wizard/gengo_update_message.py |  43 ---
 7 files changed, 249 insertions(+), 240 deletions(-)
 delete mode 100644 addons/base_gengo/wizard/alert_message_gengo.xml
 rename addons/base_gengo/wizard/{gengo_update_translation.py => base_gengo_translation.py} (50%)
 create mode 100644 addons/base_gengo/wizard/base_gengo_translation_view.xml
 delete mode 100644 addons/base_gengo/wizard/gengo_update_message.py

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 1173d513493..d2e5893d166 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -34,12 +34,14 @@ Automated Translations through Gengo API
         'res_company_view.xml',
         'res_lang_view.xml',
 
-        'wizard/alert_message_gengo.xml',
+        'wizard/base_gengo_translation_view.xml',
            ],
     'demo_xml': [],
     'test': [],
     'installable': True,
     'auto_install': False,
+    #'qweb': ['static/src/xml/base_gengo.xml'],
+    #'js': ['static/src/js/base_gengo.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index c8a5f9ef070..8f896ec561d 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -21,12 +21,70 @@
 
 from osv import fields, osv
 
+LANG_CODE_MAPPING = {
+    'ar_SA': ('ar', 'Arabic'),
+    'id_ID': ('id', 'Indonesian'),
+    'nl_NL': ('nl', 'Dutch'),
+    'fr_CA': ('fr-ca', 'French (Canada)'),
+    'pl_PL': ('pl', 'Polish'),
+    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+    'sv_SE': ('sv', 'Swedish'),
+    'ko_KR': ('ko', 'Korean'),
+    'pt_PT': ('pt', 'Portuguese (Europe)'),
+    'en_US': ('en', 'English'),
+    'ja_JP': ('ja', 'Japanese'),
+    'es_ES': ('es', 'Spanish (Spain)'),
+    'zh_CN': ('zh', 'Chinese (Simplified)'),
+    'de_DE': ('de', 'German'),
+    'fr_FR': ('fr', 'French'),
+    'fr_BE': ('fr', 'French'),
+    'ru_RU': ('ru', 'Russian'),
+    'it_IT': ('it', 'Italian'),
+    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
+}
 
 class ir_translation(osv.Model):
     _name = "ir.translation"
     _inherit = "ir.translation"
     _columns = {
-        'gengo_translation': fields.boolean("Gengo Auto Translation ?", help='If checked the term will be translated by Gengo automatically.'),
         'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
         'job_id': fields.char('Gengo JobId', size=32),
+        "gengo_translation": fields.selection([('', 'Do not translate this term by Gengo'),
+                                            ('machine', 'Translation By Machine'),
+                                            ('standard', 'Standard'),
+                                            ('pro', 'Pro'),
+                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.', required=True),
     }
+    _defaults = {
+        'gengo_translation': '',
+    }
+
+    def _get_all_supported_languages(self, cr, uid, context=None):
+        flag, gengo = self.pool.get('base.gengo.translations').gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        supported_langs = {}
+        lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+        if lang_pair['opstat'] == 'ok':
+            for g_lang in lang_pair['response']:
+                if g_lang['lc_tgt'] not in supported_langs:
+                    supported_langs[g_lang['lc_tgt']] = []
+                supported_langs[g_lang['lc_tgt']] += [g_lang['tier']]
+        return supported_langs
+
+    def _get_gengo_corresponding_language(cr, lang):
+        return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
+
+    def _check_lang_support(self, cr, uid, ids, context=None):
+        supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+        if supported_langs:
+            for term in self.browse(cr, uid, ids, context=context):
+                tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+                language = self._get_gengo_corresponding_language(term.lang)
+                if tier not in supported_langs.get(language,[]):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_lang_support, 'The Gengo translation service selected is not supported for this language.', ['gengo_translation'])
+    ]
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index f661b3b8114..e3cd1565124 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import gengo_update_translation
-import gengo_update_message
+import base_gengo_translation
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/alert_message_gengo.xml b/addons/base_gengo/wizard/alert_message_gengo.xml
deleted file mode 100644
index c2121b8ce6d..00000000000
--- a/addons/base_gengo/wizard/alert_message_gengo.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Update Message Form View -->
-        <record model="ir.ui.view" id="update_translation_wizard_view_confirm">
-            <field name="name">gengo.update.message.form</field>
-            <field name="model">gengo.update.message</field>
-            <field name="arch" type="xml">
-                <form string="Update Gengo Data" version="7.0">
-                    <group>
-                        <field name='name'/>
-                    </group>
-                </form>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/base_gengo_translation.py
similarity index 50%
rename from addons/base_gengo/wizard/gengo_update_translation.py
rename to addons/base_gengo/wizard/base_gengo_translation.py
index a7c8deb0348..e91be00ec47 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/base_gengo_translation.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 import re
 try:
@@ -35,53 +35,38 @@ _logger = logging.getLogger(__name__)
 
 GENGO_DEFAULT_LIMIT = 20
 
-LANG_CODE_MAPPING = {
-    'ar_SA': ('ar', 'Arabic'),
-    'id_ID': ('id', 'Indonesian'),
-    'nl_NL': ('nl', 'Dutch'),
-    'fr_CA': ('fr-ca', 'French (Canada)'),
-    'pl_PL': ('pl', 'Polish'),
-    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
-    'sv_SE': ('sv', 'Swedish'),
-    'ko_KR': ('ko', 'Korean'),
-    'pt_PT': ('pt', 'Portuguese (Europe)'),
-    'en_US': ('en', 'English'),
-    'ja_JP': ('ja', 'Japanese'),
-    'es_ES': ('es', 'Spanish (Spain)'),
-    'zh_CN': ('zh', 'Chinese (Simplified)'),
-    'de_DE': ('de', 'German'),
-    'fr_FR': ('fr', 'French'),
-    'fr_BE': ('fr', 'French'),
-    'ru_RU': ('ru', 'Russian'),
-    'it_IT': ('it', 'Italian'),
-    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
-}
-
-CRON_VALS = {
-    'name': _('Synchronization with Gengo'),
+DEFAULT_CRON_VALS = {
     'active': True,
     'interval_number': 20,
     'interval_type': 'minutes',
-    'numbercall': -1,
-    'model': "'base.update.translations'",
-    'function': "",
+    'model': "'base.gengo.translations'",
     'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
 }
 
+class base_gengo_translations(osv.osv_memory):
 
-class base_update_translation(osv.osv_memory):
-
-    _name = 'base.update.translations'
-    _inherit = "base.update.translations"
+    _name = 'base.gengo.translations'
+    _columns = {
+        'restart_send_job': fields.boolean("Restart Sending Job"),
+        'restart_fetch_job': fields.boolean("Restart Fetching Job"),
+        'lang_id': fields.many2one('res.lang', 'Language', help="Leave empty if you don't want to restrict the request to a single language"),
+    }
 
     def gengo_authentication(self, cr, uid, context=None):
-        ''' To Send Request and Get Response from Gengo User needs Public and Private
-         key for that user need to sign up to gengo and get public and private
-         key which is provided by gengo to authenticate user '''
+        ''' 
+        This method tries to open a connection with Gengo. For that, it uses the Public and Private
+        keys that are linked to the company (given by Gengo on subscription). It returns a tuple with
+         * as first element: a boolean depicting if the authentication was a success or not
+         * as second element: the connection, if it was a success, or the error message returned by 
+            Gengo when the connection failed.
+            This error message can either be displayed in the server logs (if the authentication was called 
+            by the cron) or in a dialog box (if requested by the user), thus it's important to return it 
+            translated.
+        '''
 
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
-            return (False, _("  - Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
+            return (False, _("Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
         try:
             gengo = MyGengo(
                 public_key=user.company_id.gengo_public_key.encode('ascii'),
@@ -89,10 +74,109 @@ class base_update_translation(osv.osv_memory):
                 sandbox=True,
             )
             gengo.getAccountStats()
+
             return (True, gengo)
         except Exception, e:
             return (False, _("Gengo Connection Error\n%s") %e)
 
+    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+        """
+        This function is used to reset a cron to its default values, or to recreate it if it was deleted.
+        """
+        cron_pool = self.pool.get('ir.cron')
+        cron_vals = DEFAULT_CRON_VALS.copy()
+        cron_vals.update({'name': name, "function": fn})
+        try:
+            res = []
+            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], cron_vals, context=context)
+        except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
+            cron_vals.update({'numbercall': -1})
+            return cron_pool.create(cr, uid, cron_vals, context=context)
+
+    def act_update(self, cr, uid, ids, context=None):
+        '''
+        Function called by the wizard.
+        '''
+        if context == None:
+            context = {}
+
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        for wizard in self.browse(cr, uid, ids, context=context):
+            supported_langs = self.pool.get('ir.translation')._get_all_supported_languages(cr, uid, context=context)
+            language = self.pool.get('ir.translation')._get_gengo_corresponding_language(wizard.lang_id.code)
+            if language not in supported_langs:
+                raise osv.except_osv(_("Warning"), _('This language is not supported by the  Gengo translation services.'))
+
+            #send immediately a new request for the selected language (if any)
+            ctx = context.copy()
+            ctx['gengo_language'] = wizard.lang_id.id
+            self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            #check the cron jobs and eventually restart/recreate them
+            if wizard.restart_send_job:
+                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
+            if wizard.restart_fetch_job:
+                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """
+        This method will be called by cron services to get translations from
+        Gengo. It will read translated terms and comments from Gengo and will 
+        update respective ir.translation in openerp.
+        """
+        translation_pool = self.pool.get('ir.translation')
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            _logger.warning("%s", gengo)
+        else:
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', 'in', ('machine','standard','pro','ultra'))], limit=limit, context=context)
+            for term in translation_pool.browse(cr, uid, translation_id, context=context):
+                up_term = up_comment = 0
+                if term.job_id:
+                    vals={}
+                    job_response = gengo.getTranslationJob(id=term.job_id)
+                    if job_response['opstat'] != 'ok':
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
+                        continue
+                    if job_response['response']['job']['status'] == 'approved':
+                        vals.update({'state': 'translated',
+                            'value': job_response['response']['job']['body_tgt']})
+                        up_term += 1
+                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
+                    if job_comment['opstat']=='ok':
+                        gengo_comments=""
+                        for comment in job_comment['response']['thread']:
+                            gengo_comments += _('%s\n\n--\n Commented on %s by %s.') % (comment['body'], time.ctime(comment['ctime']), comment['author'])
+                        vals.update({'gengo_comment': gengo_comments})
+                        up_comment += 1
+                    if vals:
+                        translation_pool.write(cr, uid, term.id, vals)
+                    _logger.info("Successfully Updated `%d` terms and %d Comments." % (up_term, up_comment ))
+                else:
+                    _logger.warning("%s", 'Cannot retrieve the Gengo job ID for translation %s: %s' % (term.id, term.src))
+        return True
+
+    def _update_terms(self, cr, uid, response, context=None):
+        """
+        Update the terms after their translation were requested to Gengo
+        """
+        translation_pool = self.pool.get('ir.translation')
+        for jobs in response['jobs']:
+            for t_id, res in jobs.items():
+                vals = {}
+                t_id = int(t_id)
+                tier = translation_pool.read(cr, uid, [t_id], ['gengo_translation'], context=context)[0]['gengo_translation']
+                if tier == "machine":
+                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
+                else:
+                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+                translation_pool.write(cr, uid, [t_id], vals, context=context)
+        return
+
     def pack_jobs_request(self, cr, uid, term_ids, context=None):
         ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
             {'jobs': {
@@ -108,173 +192,60 @@ class base_update_translation(osv.osv_memory):
         for term in translation_pool.browse(cr, uid, term_ids, context=context):
             if re.search(r"\w", term.src or ""):
                 jobs[term.id] = {'type': 'text',
-                        'slug': 'single::English to ' + LANG_CODE_MAPPING[term.lang][1],
-                        'tier': tools.ustr(user.company_id.gengo_tier),
-                        #'tier': tools.ustr(term.gengo_tier),
+                        'slug': 'single::English to ' + term.lang,
+                        'tier': tools.ustr(term.gengo_translation),
                         'body_src': term.src,
                         'lc_src': 'en',
-                        'lc_tgt': LANG_CODE_MAPPING[term.lang][0],
+                        'lc_tgt': translation_pool._get_gengo_corresponding_language(term.lang),
                         'auto_approve': auto_approve,
-                        'comment': gengo_parameter_pool.company_id.gengo_comment,
+                        'comment': user.company_id.gengo_comment,
                 }
         return {'jobs': jobs}
 
-    def check_lang_support(self, cr, uid, langs, context=None):
-        new_langs = []
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            return []
-        else:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            tier = user.company_id.gengo_tier
-            if tier == "machine":
-                tier = "nonprofit"
-            lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
-            #print "tier", tier
-
-            if lang_pair['opstat'] == 'ok':
-                for g_lang in lang_pair['response']:
-                     #print 'g_lang', g_lang['lc_tgt'], g_lang['tier']
-                    for l in langs:
-                        if LANG_CODE_MAPPING[l][0] == g_lang['lc_tgt'] and g_lang['tier'] == tier:
-                            new_langs.append(l)
-            return list(set(new_langs))
-
-    def _update_terms(self, cr, uid, response, tier, context=None):
-        translation_pool = self.pool.get('ir.translation')
-        for jobs in response['jobs']:
-            for t_id, res in jobs.items():
-                vals = {}
-                if tier == "machine":
-                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
-                else:
-                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
-                translation_pool.write(cr, uid, [t_id], vals, context=context)
-        return
 
     def _send_translation_terms(self, cr, uid,  term_ids, context=None):
         """
-        Lazy Polling will be perform when user or cron request for the translation.
+        Send a request to Gengo with all the term_ids in a different job, get the response and update the terms in
+        database accordingly.
         """
+
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        flag, gengo = self.gengo_authentication(cr, uid, context)
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
         if flag:
-            request = self.pack_jobs_request(cr, uid, term_ids, context)
+            request = self.pack_jobs_request(cr, uid, term_ids, context=context)
             if request['jobs']:
                 result = gengo.postTranslationJobs(jobs=request)
                 if result['opstat'] == 'ok':
-                    self._update_terms(cr, uid, result['response'], user.company_id.gengo_tier, context)
+                    self._update_terms(cr, uid, result['response'], context=context)
         else:
             _logger.error(gengo)
         return True
 
-    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
-        cron_pool = self.pool.get('ir.cron')
-        try:
-            res = []
-            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
-            cron_pool.write(cr, uid, [res], {'active': True}, context=context)
-        except:
-            #the cron job was not found, probably deleted previously, so we create it again using default values
-            CRON_VALS.update({'name': name, "function": fn})
-            return cron_pool.create(cr, uid, CRON_VALS, context)
-
-    def act_update(self, cr, uid, ids, context=None):
-        if context == None:
-            context = {}
-        lang_pool = self.pool.get('res.lang')
-        super(base_update_translation, self).act_update(cr, uid, ids, context)
-        msg = _("1. Translation file loaded successfully.\n2. Processing Gengo Translation:\n")
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            msg += gengo
-        else:
-            for res in self.browse(cr, uid, ids, context=context):
-                lang_id = lang_pool.search(cr, uid, [('code', '=', res.lang)])
-                lang_name = self._get_lang_name(cr, uid, res.lang)
-                try:
-                    if LANG_CODE_MAPPING[res.lang][0]:
-                        lang_search = lang_pool.search(cr, uid, [('gengo_sync', '=', True), ('id', '=', lang_id[0])])
-                    if lang_search:
-                        msg += _('  - This language `%s` is already in queue for translation.') % (lang_name)
-                    else:
-                        msg += _('  - The language `%s` is queued for translation through Gengo translation.') % (lang_name)
-                        lang_pool.write(cr, uid, lang_id, {'gengo_sync': True})
-                        _logger.info('Translation request for language `%s` has been queued successfully.', lang_name)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context)
-                    self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context)
-                    self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT)
-                except:
-                    msg += _('  - The Language `%s` is not supported by Gengo Traditional Service.') % (lang_name)
-
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'update_translation_wizard_view_confirm')])
-        view_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        context.update({'message': msg})
-        return {
-                 'view_type': 'form',
-                 'view_mode': 'form',
-                 'res_model': 'gengo.update.message',
-                 'views': [(view_id, 'form')],
-                 'type': 'ir.actions.act_window',
-                 'target': 'new',
-                 'context': context,
-             }
-
-    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
-        """
-        This method  will be call by cron services to get translation from
-        gengo for translation terms which are posted to be translated. It will
-        read translated terms and comments from gengo and will update respective
-        translation in openerp.
-        """
-        translation_pool = self.pool.get('ir.translation')
-        flag, gengo = self.gengo_authentication(cr, uid, context)
-        if not flag:
-            _logger.warning("%s", gengo)
-        else:
-            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', '=', True)], limit=limit, context=context)
-            for term in translation_pool.browse(cr, uid, translation_id, context):
-                up_term = up_comment = 0
-                if term.job_id:
-                    vals={}
-                    job_response = gengo.getTranslationJob(id=term.job_id)
-                    if job_response['opstat'] != 'ok':
-                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
-                        continue
-                    if job_response['response']['job']['status'] == 'approved':
-                        vals.update({'state': 'translated',
-                            'value': job_response['response']['job']['body_tgt']})
-                        up_term += 1
-                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
-                    if job_comment['opstat']=='ok':
-                        gengo_comments=""
-                        for comment in job_comment['response']['thread']:
-                            gengo_comments += _('%s Commented on %s by %s. \n') %(comment['body'], time.ctime(comment['ctime']), comment['author'])
-                        vals.update({'gengo_comment': gengo_comments})
-                        up_comment +=1
-                    if vals:
-                        translation_pool.write(cr, uid, term.id,vals)
-                    _logger.info("Successfully Updated `%d` terms and Comments for `%d` terms." % (up_term, up_comment ))
-        return True
-
     def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
-        """This scheduler will send a job request to the gengo , which terms are
-        waiing to be translated and for which gengo_translation is True"""
+        """
+        This scheduler will send a job request to the gengo , which terms are
+        waiing to be translated and for which gengo_translation is enabled. 
+
+        A special key 'gengo_language' can be passed in the context in order to 
+        request only translations of that language only. Its value is the language 
+        ID in openerp.
+        """
         if context is None:
             context = {}
         language_pool = self.pool.get('res.lang')
         translation_pool = self.pool.get('ir.translation')
         try:
-            lang_ids = language_pool.search(cr, uid, [('gengo_sync', '=', True)]) #really? what's the point not checking ALL the languages if gengo support it? i feel like it's aunecessary load for the user that must configure yet another thing
+            #by default, the request will be made for all terms that needs it, whatever the language
+            lang_ids = language_pool.search(cr, uid, [], context=context)
+            if context.get('gengo_language'):
+                #but if this specific key is given, then we restrict the request on terms of this language only
+                lang_ids = [context.get('gengo_language')]
             langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
-            #print "LANGS 1", langs
-            langs = self.check_lang_support(cr, uid, langs, context=context)#must move
-            #print "LANGS 2", langs
-            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', '=', True), ('lang', 'in', langs)], limit=limit)
+            #search for the n first terms to translate
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', 'in', ('machine','standard','pro','ultra')), ('lang', 'in', langs)], limit=limit, context=context)
             if term_ids:
-                self._send_translation_terms(cr, uid, term_ids, context)
-                _logger.info("Translation terms %s has been posted to gengo successfully", len(term_ids))
+                self._send_translation_terms(cr, uid, term_ids, context=context)
+                _logger.info("%s Translation terms have been posted to Gengo successfully", len(term_ids))
             else:
                 _logger.info('No Translation terms to process.')
         except Exception, e:
diff --git a/addons/base_gengo/wizard/base_gengo_translation_view.xml b/addons/base_gengo/wizard/base_gengo_translation_view.xml
new file mode 100644
index 00000000000..88ce7788d24
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translation_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="base_gengo_translation_wizard_from">
+            <field name="name">base.gengo.translation.form</field>
+            <field name="model">base.gengo.translations</field>
+            <field name="arch" type="xml">
+                <form string="Gengo Request Form" version="7.0">
+                   <group col="4">
+                        <group>
+                            <field name="restart_send_job"/>
+                            <field name="restart_fetch_job"/>
+                        </group>
+                        <group>
+                            <field name="lang_id"/>
+                            <label colspan="2" string="Leave empty for requesting all the terms to Gengo that needs it, regardless of their language"/>
+                        </group>
+                    </group>
+                    <footer>
+                        <button name="act_update" string="Send" type="object" class="oe_highlight"/> 
+                        or 
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_wizard_base_gengo_translations" model="ir.actions.act_window">
+            <field name="name">Gengo: Manual Request of Translation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.gengo.translations</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_wizard_base_gengo_translations" id="menu_action_wizard_base_gengo_translations" parent="base.menu_translation_app"/>
+
+    </data>
+</openerp>
diff --git a/addons/base_gengo/wizard/gengo_update_message.py b/addons/base_gengo/wizard/gengo_update_message.py
deleted file mode 100644
index 45d54ffc54b..00000000000
--- a/addons/base_gengo/wizard/gengo_update_message.py
+++ /dev/null
@@ -1,43 +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 osv
-from osv import fields
-
-
-class gengo_update_message(osv.osv_memory):
-    """Update Message"""
-
-    _name = "gengo.update.message"
-    _description = "Update Message"
-    _columns = {
-        'name': fields.text('Message', readonly=True),
-    }
-
-    def default_get(self, cr, uid, fields, context=None):
-        if context == None:
-            context = {}
-        res = super(gengo_update_message, self).default_get(cr, uid, fields, context=context)
-        res.update({'name': context.get('message')})
-        return res
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 7e7ed8ce1859e7a36a70c22eec15296ee9b6d433 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 18:15:31 +0200
Subject: [PATCH 091/118] [FIX] google_docs: do not declare self = this as a
 GLOBAL variable

bzr revid: qdp-launchpad@openerp.com-20120830161531-w0it8fda6a2j84vk
---
 addons/google_docs/static/src/js/gdocs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..694f5736c72 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,7 +3,7 @@ var _t = instance.web._t;
 
     instance.web.Sidebar = instance.web.Sidebar.extend({
         on_attachments_loaded: function(attachments) {
-            self = this
+            var self = this;
             self._super(attachments);
             // if attachment contains a google doc url do nothing
             // else display a button to create a google doc

From 53049c846f47ad5ec6c283f00c1d092dab5ede60 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Aug 2012 18:23:16 +0200
Subject: [PATCH 092/118] [IMP] base_gengo: commit finishing what did the
 previous one: removal of unused files and fields, fixing the cron job data,
 ...

bzr revid: qdp-launchpad@openerp.com-20120830162316-vglsn7lfuxr04772
---
 addons/base_gengo/__init__.py                 |  1 -
 addons/base_gengo/__openerp__.py              |  2 +-
 .../base_gengo/gengo_sync_schedular_data.xml  |  8 ++---
 addons/base_gengo/res_company.py              |  5 ---
 addons/base_gengo/res_company_view.xml        |  1 -
 addons/base_gengo/res_lang.py                 | 31 -------------------
 addons/base_gengo/res_lang_view.xml           | 16 ----------
 addons/base_gengo/wizard/__init__.py          |  2 +-
 ...nslation.py => base_gengo_translations.py} |  0
 ...w.xml => base_gengo_translations_view.xml} |  0
 10 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 addons/base_gengo/res_lang.py
 delete mode 100644 addons/base_gengo/res_lang_view.xml
 rename addons/base_gengo/wizard/{base_gengo_translation.py => base_gengo_translations.py} (100%)
 rename addons/base_gengo/wizard/{base_gengo_translation_view.xml => base_gengo_translations_view.xml} (100%)

diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index b4fd54acd21..133fa90dc51 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -22,6 +22,5 @@
 import res_company
 import ir_translation
 import wizard
-import res_lang
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index d2e5893d166..b60d3db9682 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -34,7 +34,7 @@ Automated Translations through Gengo API
         'res_company_view.xml',
         'res_lang_view.xml',
 
-        'wizard/base_gengo_translation_view.xml',
+        'wizard/base_gengo_translations_view.xml',
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index 78d2c602ac5..bd52a9697d3 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -4,11 +4,11 @@
         <!--Scheduler sync Receive Request-->
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
-            <field eval="False" name="active"/>
+            <field eval="True" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'base.gengo.translations'" name="model"></field>
             <field eval="'_sync_response'" name="function"/>
             <field eval="'(20,)'" name="args"/>
         </record>
@@ -16,11 +16,11 @@
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
-            <field eval="False" name="active"/>
+            <field eval="True" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'base.gengo.translations'" name="model"></field>
             <field eval="'_sync_request'" name="function"/>
             <field eval="'(20,)'" name="args"/>
         </record>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 610e46d05d2..22d7b343939 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -28,15 +28,10 @@ class res_company(osv.Model):
     _columns = {
            "gengo_private_key": fields.text("Gengo Private Key"),
            "gengo_public_key": fields.text("Gengo Public Key"),
-           "gengo_tier": fields.selection([('machine', 'Machine'),
-                                          ('standard', 'Standard'),
-                                          ('pro', 'Pro'),
-                                          ('ultra', 'Ultra')], "Tier Type", required=True),
            "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
     _defaults = {
-        "gengo_tier": "machine",
         "gengo_auto_approve": True,
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index fdc0c8833a6..0f99efc8ad0 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -18,7 +18,6 @@
                             </group>
                         </group>
                         <group col="4">
-                            <field name="gengo_tier" />
                             <field name="gengo_auto_approve"/>
                         </group>
                         <group string="Comments for Translator" col="1">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
deleted file mode 100644
index 43b867c4f76..00000000000
--- a/addons/base_gengo/res_lang.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class res_company(osv.Model):
-    _name = "res.lang"
-    _inherit = "res.lang"
-
-    _columns = {
-        'gengo_sync': fields.boolean('Gengo Auto Synchronize ?', help='If checked the language will be automatically synchronize translation periodically using gengo translation services.')
-    }
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
deleted file mode 100644
index 38e6b995163..00000000000
--- a/addons/base_gengo/res_lang_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <!-- res.company form view -->
-        <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
-            <field name="name">res.lang.form.inherit</field>
-            <field name="inherit_id" ref="base.res_lang_form"/>
-            <field name="model">res.lang</field>
-            <field name="arch" type="xml">
-                <xpath expr="//sheet/group" position="inside">
-                    <field name="gengo_sync" />
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index e3cd1565124..f5dd71be01c 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import base_gengo_translation
+import base_gengo_translations
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translation.py b/addons/base_gengo/wizard/base_gengo_translations.py
similarity index 100%
rename from addons/base_gengo/wizard/base_gengo_translation.py
rename to addons/base_gengo/wizard/base_gengo_translations.py
diff --git a/addons/base_gengo/wizard/base_gengo_translation_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
similarity index 100%
rename from addons/base_gengo/wizard/base_gengo_translation_view.xml
rename to addons/base_gengo/wizard/base_gengo_translations_view.xml

From 4639967d0ceb5db0ba1a12d89c7c46d1db012f63 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 31 Aug 2012 04:56:49 +0000
Subject: [PATCH 093/118] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120831045649-sm7os4ihiv8fv422
---
 addons/audittrail/i18n/zh_TW.po         | 138 ++--
 addons/base_setup/i18n/ru.po            |  20 +-
 addons/crm/i18n/ru.po                   |  75 +-
 addons/crm/i18n/zh_TW.po                |  10 +-
 addons/crm_claim/i18n/zh_TW.po          |  15 +-
 addons/crm_helpdesk/i18n/zh_TW.po       | 744 ++++++++++++++++++++
 addons/crm_partner_assign/i18n/zh_TW.po | 885 ++++++++++++++++++++++++
 addons/document/i18n/zh_TW.po           | 182 ++---
 addons/document_page/i18n/zh_TW.po      | 154 +++--
 addons/document_webdav/i18n/zh_TW.po    | 196 ++++++
 addons/edi/i18n/zh_TW.po                | 386 +++++++++++
 addons/email_template/i18n/zh_TW.po     | 711 +++++++++++++++++++
 addons/event/i18n/zh_TW.po              | 359 +++++-----
 addons/event_project/i18n/zh_TW.po      |   4 +-
 addons/procurement/i18n/ru.po           |  18 +-
 addons/product/i18n/ru.po               |  18 +-
 16 files changed, 3426 insertions(+), 489 deletions(-)
 create mode 100644 addons/crm_helpdesk/i18n/zh_TW.po
 create mode 100644 addons/crm_partner_assign/i18n/zh_TW.po
 create mode 100644 addons/document_webdav/i18n/zh_TW.po
 create mode 100644 addons/edi/i18n/zh_TW.po
 create mode 100644 addons/email_template/i18n/zh_TW.po

diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 293a2a1b117..9da7a569f75 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:17+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 13:46+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.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: 2012-08-28 06:25+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "警告：稽核追蹤不屬於此池"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "已訂閱"
 
 #. module: audittrail
 #: sql_constraint:audittrail.rule:0
@@ -39,330 +39,332 @@ msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
 msgstr ""
+"該對象已經定義了稽核規則。\n"
+"您不能再次定義，請直接編輯現有的稽核規則。"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribed Rule"
-msgstr ""
+msgstr "已訂閱規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Audit Logs"
-msgstr ""
+msgstr "稽核日誌"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "訂閱(_S)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "舊值"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
 msgid ""
 "Select this if you want to keep track of read/open on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你需要追蹤對該對象的任何記錄的讀和打開動作請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "方法"
 
 #. module: audittrail
 #: field:audittrail.view.log,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
 #: help:audittrail.rule,user_id:0
 msgid "if  User is not added then it will applicable for all users"
-msgstr ""
+msgstr "如果未加入使用者則適用於所有使用者"
 
 #. module: audittrail
 #: help:audittrail.rule,log_workflow:0
 msgid ""
 "Select this if you want to keep track of workflow on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您需要追蹤該對象所有記錄的工作流程請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "對象"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: field:audittrail.view.log,to:0
 msgid "Log To"
-msgstr ""
+msgstr "記錄到"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "新值內容： "
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "搜索稽核追蹤規則"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Audit Rules"
-msgstr ""
+msgstr "稽核規則"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "舊值： "
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "資源名稱"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: audittrail
 #: help:audittrail.rule,log_write:0
 msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您要追蹤此對象所有記錄的變更請選擇此項。"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
-msgstr ""
+msgstr "建立日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,object_id:0
 msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "選擇您要生成稽核日誌的對象"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "舊值內容： "
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "記錄工作流"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "記錄讀操作"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:76
 #, python-format
 msgid "Change audittrail depends -- Setting rule as DRAFT"
-msgstr ""
+msgstr "修改檢查稽核依賴 - 設定規則為草稿"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "欄位列表"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: help:audittrail.rule,log_unlink:0
 msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你要追蹤所有刪除這個對象記錄的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "動作ID"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
-msgstr ""
+msgstr "使用者（如果沒有選擇使用者則適用於所有使用者）"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "取消訂閱"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "記錄刪除操作"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "欄位說明"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "搜尋稽核追蹤日誌"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "記錄修改操作"
 
 #. module: audittrail
 #: view:audittrail.view.log: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
 msgid "Rule Name"
-msgstr ""
+msgstr "規則名稱"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "新值"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "草稿規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_action:0
 msgid ""
 "Select this if you want to keep track of actions on the object of this rule"
-msgstr ""
+msgstr "如果你要追蹤這個對象所有記錄執行的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "新值: "
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "舊值內容"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
 msgid "View Log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "Log Line"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "記錄動作"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
 msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你想追蹤此對象所有記錄的建立請選擇此項"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index ce9fde3914d..96bbd87b971 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 19:34+0000\n"
+"PO-Revision-Date: 2012-08-30 17:01+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: 2012-08-28 06:08+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -79,12 +79,12 @@ msgstr ""
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Расширенный"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -197,7 +197,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Клиент"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -224,6 +224,8 @@ msgstr ""
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -261,7 +263,7 @@ msgstr ""
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Упрощенный"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
@@ -271,7 +273,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 6b1cc85b6e5..fab81c37340 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-06 11:58+0000\n"
+"PO-Revision-Date: 2012-08-30 17:52+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: 2012-08-28 06:06+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -320,7 +320,7 @@ msgstr "Перспективный партнер"
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -535,7 +535,7 @@ msgstr "Эл. письмо"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Звонки за последние 7 дней"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -626,7 +626,7 @@ msgstr "Встреча '%s' была подтверждена."
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В процессе"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -720,7 +720,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Валюта организации"
 
 #. module: crm
 #: view:crm.lead:0
@@ -763,7 +763,7 @@ msgstr "Остановить процесс"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -778,7 +778,7 @@ msgstr "Продолжить"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Дней в периоде"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -933,7 +933,7 @@ msgstr "Внимание!"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Звонки за текущий год"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -943,7 +943,7 @@ msgstr "Дней до открытия"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Показать время как"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -973,7 +973,7 @@ msgstr "Мои встречи"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Звонки за сегодня"
 
 #. module: crm
 #: view:board.board:0
@@ -1030,7 +1030,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "Изменить цвет"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1180,7 +1180,7 @@ msgstr "Письмо партнеру"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "Детали звонка"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1270,7 +1270,7 @@ msgstr "Продолжительность в минутах"
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Название канала"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
@@ -1321,7 +1321,7 @@ msgstr "Дата записи"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Конец повторения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1345,7 +1345,7 @@ msgstr "Установить сигнал на это время, перед с
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Назначить звонок"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1433,7 +1433,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1549,7 +1549,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "Почта"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1905,7 +1905,7 @@ msgstr "Преобразовать в предложение"
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "Каналы"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2181,7 +2181,7 @@ msgstr "Создать нового партнера"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2191,7 +2191,7 @@ msgstr "Дата начала"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2201,7 +2201,7 @@ msgstr "Отклонить"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email пользователя"
 
 #. module: crm
 #: help:crm.lead,optin:0
@@ -2387,7 +2387,7 @@ msgstr "Прочее"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Продажи"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2575,7 +2575,7 @@ msgstr "Проверка классификации"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Логин пользователя"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2706,7 +2706,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Тема письма"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2822,7 +2822,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3010,7 +3010,7 @@ msgstr "Создание предложений из кандидатов"
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "Панель аналитики CRM"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -3095,7 +3095,7 @@ msgstr "Условие на историю общения"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3398,7 +3398,7 @@ msgstr "Закрыть"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3408,7 +3408,7 @@ msgstr "Категоризация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Описать звонок"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3438,7 +3438,7 @@ msgstr "Кому"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3470,7 +3470,7 @@ msgstr "Описание"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Звонки, сделанные в текущем месяце"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3565,7 +3565,7 @@ msgstr "Проиграно"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3625,6 +3625,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Отлеживание источников появления кандидатов и предложений путём создания "
+"специализированных каналов, обслуживаемых при создании докумета в системе. "
+"Например, каналы могут быть такими: сайт, телефонный звонок, реселлер и т.д."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3655,7 +3658,7 @@ msgstr "Последовательность"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Мастер создания электронной почты"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3692,7 +3695,7 @@ msgstr "Год"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index fe6c76a3ce7..a56875dfe82 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-30 02:54+0000\n"
-"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"PO-Revision-Date: 2012-08-30 10:41+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2307,7 +2307,7 @@ msgstr "動作"
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr "下降因子(0.0>1.0)"
+msgstr "減少 (0>1)"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
index d09ec398c20..1346638c87a 100644
--- a/addons/crm_claim/i18n/zh_TW.po
+++ b/addons/crm_claim/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -797,14 +797,3 @@ msgstr "建立日期"
 #: view:crm.claim:0
 msgid "In Progress Claims"
 msgstr "正在處理的抱怨"
-
-#~ msgid ""
-#~ "The state is set to 'Draft', when a case is created. \n"
-#~ "If the case is in progress the state is set to 'Open'. \n"
-#~ "When the case is over, the state is set to 'Done'. \n"
-#~ "If the case needs to be reviewed then the state is set to 'Pending'."
-#~ msgstr ""
-#~ "當一個業務建立時狀態設為'草稿'\n"
-#~ "如果業務正在處理狀態設為'開啟'\n"
-#~ "當業務結束狀態設為'完成'\n"
-#~ "如果業務需要審查狀態設為'待定'"
diff --git a/addons/crm_helpdesk/i18n/zh_TW.po b/addons/crm_helpdesk/i18n/zh_TW.po
new file mode 100644
index 00000000000..6cddf9bd735
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_TW.po
@@ -0,0 +1,744 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:12+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "本年發生的服務需求"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "客服需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "客服分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估計"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "上個月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "之前7天內的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "客服售後服務報表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "管道"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "客服分類"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "新的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "客服需求月份"
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "無主題"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "所有暫停的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "服務需求的年份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "溝通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "當月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "關聯2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "計劃成本"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "通訊管道"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "這些郵件地址將加入到之前發送記錄的發送和接收郵件的郵件副本欄位，分隔多個郵件地址有逗號。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "搜索客服"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "搜索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯絡人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "雜項"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "一般"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "傳送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "屬於此種情況下，銷售團隊。定義負責用戶和電子郵件帳戶的郵件網關。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "客服協助來源"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"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."
+msgstr "為所有的支持請求排序指定具體標準如：處理時間，請求回覆的次數，發送的郵件，成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "客服和協助"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "提問"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "建立和管理客服類型去更好管理和分類你的需求協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "今天的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "打開客服需求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近動作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"客服和協助使你可以去追蹤.如果需要選擇一個客戶增加備註和類型這業務夥伴.你可以分配一優先級用系統問題模塊來管理的的支持活動.問題能鏈接郵件閘道.新的郵件可"
+"能建立新的問題,它們能自動寫入於客戶溝通的日誌."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持續時間"
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
new file mode 100644
index 00000000000..3c77816d71b
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -0,0 +1,885 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:14+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,send_to:0
+msgid "Send to"
+msgstr "傳送給"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "電子郵件發送後永久刪除"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_to:0
+msgid "Message recipients"
+msgstr "收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "分組..."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "轉寄"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_text:0
+msgid "Plain-text version of the message"
+msgstr "內容的純文字版本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "內文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "潛在客戶"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "#Partner"
+msgstr "#Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情況"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "無法連接到服務器，請確保你的連線(%s) 正常。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "業務夥伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_text:0
+msgid "Text contents"
+msgstr "文本內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "訊息唯一編號"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo 緯度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr "在這裡加入你在郵件裡要加入現有的單據附件。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo 指派的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "內容的富文本/HTML版本"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "密件副本收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一個"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "網絡錯誤"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "來自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "業務夥伴級別"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "發送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一個"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "內容類型，一般是“html”或“純文本”，用於對應地選擇純文本或富文本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "潛在客戶分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "相關單據編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "指定業務夥伴"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "類型用於區分線索和商機"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document model"
+msgstr "相關單據模組"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
+#, python-format
+msgid "Fwd"
+msgstr "轉發"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "發送日誌"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "聯絡人"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,use_template:0
+msgid "Use Template"
+msgstr "使用者範本"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重要性"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr "級別"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "開啟日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主題"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr "團隊"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Referred Partner"
+msgstr "推薦的業務夥伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr "批量轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "轉為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "指定日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "業務開啟的天數"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Geo 經度"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr "商機編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "潛在客戶指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "這業務的業務夥伴已提出/已指定"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-text內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "已計劃收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "Cc"
+msgstr "副本收件人"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,references:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最近30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "級別名稱"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "這業務指定/轉發的業務夥伴的最後期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "郵件副本收件人"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Geo 定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "當前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr "郵件發件人，​​來自使用者的個人設置。如果為空，不發郵件而是發內部消息。"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,nbr:0
+msgid "# of Partner"
+msgstr "# of Partner"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,name:0
+msgid "Partner name"
+msgstr "上級名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "預計收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指定的業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr "發送郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr "國家"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,headers:0
+msgid "Message headers"
+msgstr "郵件頭"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "轉換為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr "業務夥伴分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr "業務夥伴分配分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客戶關係管理 線索報表"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "郵件引用，例如前一個郵件的ID"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "業務資訊"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr "CRM業務夥伴報表"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr "篩選"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "本郵件推薦的回覆地址"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件協同作業"
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index b49d418b9c6..84e7f3c7cfa 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-28 03:53+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -35,7 +35,7 @@ msgstr "名稱欄位"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "文件佈告欄"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -58,7 +58,7 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -79,7 +79,7 @@ msgstr "檔案"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "當月文件"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -90,12 +90,12 @@ msgstr "三月"
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "抬頭"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr "表達式"
+msgstr "表達方式"
 
 #. module: document
 #: view:document.directory:0
@@ -111,7 +111,7 @@ msgstr "目錄內容"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "動態背景"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,11 +125,14 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"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"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr "本年"
+msgstr "今年"
 
 #. module: document
 #: field:document.storage,path:0
@@ -146,7 +149,7 @@ msgstr "目錄名不能重覆！"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "過濾我的文件"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -158,12 +161,12 @@ msgstr "已索引內容"
 msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
-msgstr ""
+msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，只有符合資源的附件會被歸屬。"
 
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "知識管理"
 
 #. module: document
 #: view:document.directory:0
@@ -175,7 +178,7 @@ msgstr "目錄"
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr "各用戶檔案詳情"
+msgstr "各使用者檔案詳情"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
@@ -187,17 +190,17 @@ msgstr "錯誤！"
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "尋找所有資源"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "按資源歸類檔案夾"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr "後綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.user,change_date:0
@@ -207,7 +210,7 @@ msgstr "修改日期"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "文管設定"
 
 #. module: document
 #: view:ir.attachment:0
@@ -219,7 +222,7 @@ msgstr "伙伴"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "各用戶檔案"
+msgstr "使用者檔案"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -239,7 +242,7 @@ msgstr "檢驗錯誤"
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -252,13 +255,13 @@ msgstr "文件"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "錯誤! 您不可以建立循環目錄。"
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "存儲器"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -292,28 +295,28 @@ msgstr "類型"
 msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
-msgstr ""
+msgstr "在這裡選擇一個目標，這個資源將會是一筆記錄一個檔案夾"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr ""
+msgstr "請使用一個領域，如果您要將可見的資源自動過濾。"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "夥伴文件"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr "脈絡欄位"
+msgstr "內文欄位"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "儲存名稱"
 
 #. module: document
 #: view:document.directory:0
@@ -336,7 +339,7 @@ msgstr "七月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr "文件儀錶板"
+msgstr "文件控制台"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -346,7 +349,7 @@ msgstr "延伸檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "已建立"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -356,25 +359,25 @@ msgstr "虛擬檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "已修改"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "文件書寫錯誤!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "已產生檔案"
 
 #. module: document
 #: view:document.configuration:0
 msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
-msgstr ""
+msgstr "執行這個精靈，它會根據已安裝的模組自動組態您的目錄。"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -397,7 +400,7 @@ msgstr "安全"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "最後修改用戶"
+msgstr "最後修改使用者"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
@@ -425,7 +428,7 @@ msgstr "各目錄檔案詳情"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: view:board.board:0
@@ -453,18 +456,18 @@ msgstr "靜態目錄"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "子目錄"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "在內文中定義所有的子目錄及檔案"
 
 #. module: document
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
 
 #. module: document
 #: view:document.directory:0
@@ -475,7 +478,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "擁有人"
 
 #. module: document
 #: view:document.directory:0
@@ -492,7 +495,7 @@ msgstr "內容"
 #: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "產生的日期"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -501,12 +504,14 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n"
+"如果設定, 這個目錄將會是第一個資源"
 
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -521,26 +526,26 @@ msgstr "附件"
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "模型 Id"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "在線上"
 
 #. 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 ""
+msgstr "檢查這個項目，如果您要在系統中使用相同的樹狀結構當作選擇的目標。"
 
 #. module: document
 #: help:document.directory,ressource_id:0
 msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
-msgstr ""
+msgstr "隨著母模型，這個ID在這個檔案夾附屬在母模型的特定記錄上。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -551,7 +556,7 @@ msgstr "八月"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目錄不能作自己的母目錄!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -563,7 +568,7 @@ msgstr "六月"
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -574,7 +579,7 @@ msgstr "群組"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -596,6 +601,8 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"如果您在這裡放置一個目標，這個目錄範本將會出現下列所有目標。這種目錄是 \"附件\" "
+"於特定的模型或記錄，就像附屬文件。如果您選擇一個母模型，就不要放置母目錄。"
 
 #. module: document
 #: view:document.directory:0
@@ -611,7 +618,7 @@ msgstr "十月"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -637,12 +644,12 @@ msgstr ""
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr "儀錶板"
+msgstr "控制台"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -652,7 +659,7 @@ msgstr "唯讀"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "文件目錄"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -663,12 +670,12 @@ msgstr "目錄名不能重覆！"
 #: field:document.directory,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "建置者"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: document
 #: view:document.configuration:0
@@ -678,6 +685,8 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"OpenERP's "
+"文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。"
 
 #. module: document
 #: view:board.board:0
@@ -695,7 +704,7 @@ msgstr "九月"
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr "前綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -710,7 +719,7 @@ msgstr "檔案名稱"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -720,19 +729,19 @@ msgstr "資源ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "外部檔案儲存"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "排行榜"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "關於檔案儲存，儲存的根路徑"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -747,17 +756,17 @@ msgstr "欄位"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "目錄動態內文"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "母模型"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -771,12 +780,12 @@ msgstr "月"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "當月檔案"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr "報告"
+msgstr "報表"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -792,29 +801,29 @@ msgstr "五月"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "使用者已經一個月未插入文件"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
 msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
-msgstr ""
+msgstr "文件儲存室讓您可以存取所有附件，如電郵、專案文件、商業發票等"
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "對於每一輸入，虛擬檔案在檔案夾中出現"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
@@ -834,7 +843,7 @@ msgstr "各伙伴檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "已索引內容 - 實驗性質"
 
 #. module: document
 #: view:report.document.user:0
@@ -844,12 +853,12 @@ msgstr "本月"
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr "注解"
+msgstr "備註"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: help:document.directory,type:0
@@ -860,6 +869,8 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"每一個目錄可以是靜態或連接於另一個資源。一個靜態的目錄與其作業系統，是一個典型的目錄可以包含一組檔案。這個目錄連接於系統資源，在母目錄中按資源別自動持有次"
+"目錄。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -871,14 +882,14 @@ msgstr "二月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr "各用戶統計"
+msgstr "各使用者統計"
 
 #. module: document
 #: help:document.directory.dctx,field:0
 msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
-msgstr ""
+msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
 
 #. module: document
 #: field:document.directory,name:0
@@ -889,7 +900,7 @@ msgstr "名稱"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "儲存路徑不能重複!"
 
 #. module: document
 #: view:document.directory:0
@@ -899,7 +910,7 @@ msgstr "欄位"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "如果設定，媒體只能唯讀。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -918,21 +929,21 @@ msgstr "檔案數"
 #: code:addons/document/document.py:209
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copy)"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
-msgstr ""
+msgstr "只有這個群組中的數字，才能存取這個目錄及其檔案。"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
-msgstr ""
+msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -942,7 +953,7 @@ msgstr "Mime 類型"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "所有月份文件"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -959,12 +970,12 @@ msgstr "檔案名不能重覆！"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "內部文件儲存"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目錄必須要有母目錄或儲存"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
@@ -1030,3 +1041,6 @@ msgstr "文件類型"
 
 #~ msgid "Product"
 #~ msgstr "產品"
+
+#~ msgid "Attached To"
+#~ msgstr "附屬於"
diff --git a/addons/document_page/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
index 0ce1ed5d91b..08d9b01e2d3 100644
--- a/addons/document_page/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -7,165 +7,165 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 09:36+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.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: 2012-08-28 06:43+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "文檔頁面範本"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "文檔頁面"
 
 #. module: document_page
 #: field:document.page.type,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "展示方法"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
 #: view:document.page.page.open:0
 msgid "Open Page"
-msgstr ""
+msgstr "開啓葉面"
 
 #. module: document_page
 #: field:document.page,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "選單"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "表示，這個頁面至少有一個表的內容"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "頁面歷史文件"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "小編輯"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,content:0
 msgid "Content"
-msgstr ""
+msgstr "內容"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "子頁面"
 
 #. module: document_page
 #: field:document.page,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "上級頁面"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "最後的貢獻者"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "上級選單"
 
 #. module: document_page
 #: field:document.page,name:0
 msgid "Title"
-msgstr ""
+msgstr "標題"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "嚮導創建選單"
 
 #. module: document_page
 #: field:document.page,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Page Content"
-msgstr ""
+msgstr "頁面內容"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "有沒有變化修訂"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
 
 #. module: document_page
 #: field:document.page.type,notes:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: document_page
 #: field:document.page,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: help:document.page,review:0
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr ""
+msgstr "表示這個頁面應該檢討，提高其他出資人的注意"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0
 msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "頁面歷史記錄"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "Tree"
-msgstr ""
+msgstr "目錄樹"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Page Template"
-msgstr ""
+msgstr "頁面模版"
 
 #. module: document_page
 #: field:document.page,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "關鍵字"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_wiki
@@ -175,173 +175,175 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"Wiki頁面，您可以與您的同事的想法和問題。您可以創建一個新的文件，可以連接到一個或多個應用程序（客戶關係管理（CRM），銷售等）。您可以使用關鍵字，以便"
+"於訪問到您的wiki頁面。有一個基本的的維基編輯為文本格式。"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: document_page
 #: help:document.page.type,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "在首頁,需要選擇首頁顯示的方法"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: document_page
 #: view:document.page.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "要選定的頁面上創建一個索引呢？ "
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
 #: view:wizard.document.page.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: field:document.page.type,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "頁面"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Group Description"
-msgstr ""
+msgstr "群組敘述"
 
 #. module: document_page
 #: view:document.page.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "要打開一個wiki頁面？ "
 
 #. module: document_page
 #: field:document.page.history,content:0
 msgid "Text area"
-msgstr ""
+msgstr "文本區域"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Meta Information"
-msgstr ""
+msgstr "中繼資訊"
 
 #. module: document_page
 #: field:document.page,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "建立於"
 
 #. module: document_page
 #: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: document_page
 #: field:document.page,summary:0 field:document.page.history,edit_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: document_page
 #: field:document.page.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "All Page Histories"
-msgstr ""
+msgstr "所有頁面的歷史記錄"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "本組創建的選單中定義默認行為"
 
 #. module: document_page
 #: view:wizard.document.page.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "結束"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
 msgid "Wiki Id"
-msgstr ""
+msgstr "維基標識"
 
 #. module: document_page
 #: field:document.page.type,home:0 selection:document.page.type,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "首頁"
 
 #. module: document_page
 #: help:document.page,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "允許您與其他頁的鏈接，在當前主題"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Modification Information"
-msgstr ""
+msgstr "修改信息"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
 msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
 
 #. module: document_page
 #: field:document.page,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "修改日期"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
 #: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
 msgid "Create Index"
-msgstr ""
+msgstr "創建索引"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
+msgstr "您需要選擇最小或最大歷史修訂！"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
 #: view:document.page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
 msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: document_page
 #: field:document.page.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "這是一個主要的編輯嗎？"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_groups
@@ -349,56 +351,56 @@ msgstr ""
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "文件類型"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Topic"
-msgstr ""
+msgstr "主題"
 
 #. module: document_page
 #: field:document.page.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "修改者"
 
 #. module: document_page
 #: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "開啓文件"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "WIZ打開的頁面"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "刪除"
 
 #. module: document_page
 #: field:wizard.document.page.history.show_diff,file_path:0
 msgid "Diff"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Need Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "頁面等待審查"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "搜尋頁面"
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
new file mode 100644
index 00000000000..121d57b341a
--- /dev/null
+++ b/addons/document_webdav/i18n/zh_TW.po
@@ -0,0 +1,196 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "建立日期"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "文件"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "錯誤! 您不能建立循環的目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "搜尋文件目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Namespace"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "群組...."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "這些內容將被加到 WebDAV 請求"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "文件的DAV 內容"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV 匯入錯誤!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "文件"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "檔案夾"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "目錄不能成為自己的母目錄!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "動態背景"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "目錄名不能重覆！"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV 檔案夾內容"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "內容"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "價值"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "目錄"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "最後修改使用者"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "路徑"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "修改日期"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "建立者"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "目錄必須要有母目錄或儲存室"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "替代項目"
diff --git a/addons/edi/i18n/zh_TW.po b/addons/edi/i18n/zh_TW.po
new file mode 100644
index 00000000000..3ea35742e44
--- /dev/null
+++ b/addons/edi/i18n/zh_TW.po
@@ -0,0 +1,386 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "每個公司的貨幣代碼必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "業務夥伴地址"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名稱必須唯一！"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員"
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI權杖"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "接收EDI文件的唯一標識符"
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能建立循環引用的公司."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI權杖必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr "你要匯入的文件需要OpenERP的 %s 模組。你可以用管理員使用者安裝並打開配置精靈。"
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI文件內容"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI文件"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "%s是個無效的外部ID"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "不存在此功能"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "文件"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
diff --git a/addons/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
new file mode 100644
index 00000000000..9094107915f
--- /dev/null
+++ b/addons/email_template/i18n/zh_TW.po
@@ -0,0 +1,711 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:19+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "報表檔名"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "SMTP 伺服器"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr "移除側邊欄按鈕目前顯示在相關的文件"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "側邊欄動作"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "另存新的範本"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "主旨 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "副本收件人 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "收到"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr "側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+"產生的報表文件命名(可能包含佔位符)\n"
+"可以省略分機號碼然後將會成為報表型態."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "附加現有文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "郵件內容"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "主旨"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "從"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "相關的合作夥伴"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "子欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr "相關文件螢幕上的精靈列按鈕可打開這範本之精靈"
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "傳送"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "訊息類型, 經常是'html'或'plain', 用於選擇 plaintext 或 rich text 做為內容"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr "建立動態值"
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "相關文件 ID"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr "語言選擇"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "提出"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr "相關文檔模型"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+"從相關文件類型選擇目標\n"
+"若它是關聯欄位，您就可以在這關聯關係中，取得這欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr "空值"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "子類型"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr "啟用，這是您希望包括一個特殊的追蹤電子郵件標記，這樣您就可以找出答覆並連接到相應的資源記錄。這是有用的，例如CRM的線索"
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr "使用範本"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr "附加的文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "選項"
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr "相關文件類型"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr "發信人地址(佔位符可以用在這)"
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr "若勾選, 這個合作夥伴將不會收到任何自動郵件回復, 例如有效發票"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "備註: 這是Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "分類方式..."
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "加入簽名"
+
+#. module: email_template
+#: help:email.template,body_text:0
+#: help:email_template.preview,body_text:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr "Plaintext 消息版本(佔位符可以用在這)"
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "消息原始版本, 因為它是在網路上發送"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr "(副本)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr "外送"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr "使用訊息範本"
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr "若勾選, 使用者的簽名將附加到郵件的文字版本"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "內文 (Rich/HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+"當這相關欄位是選為第一欄位, this field shows the document model the relationship goes to."
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "郵件範本"
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr "加入側邊欄按鈕"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "內文 (Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "進階選項"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "傳送郵件 (%s)"
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text Contents"
+msgstr "富文本內容"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr "表達"
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr "原作"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "地址"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr "最後的模板欄位，找到要複製-貼上的區塊"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr "郵件詳情"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "副本"
+
+#. module: email_template
+#: field:email.template,body_text:0
+#: field:email_template.preview,body_text:0
+msgid "Text Contents"
+msgstr "文字內容"
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "永久刪除已發送的郵件以節省空間"
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr "參考"
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr "顯示文字"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr "這個範本您可以加入附件, 從這範本新建所有郵件"
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "發送郵件伺服器"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr "側邊欄動作使這個範本記錄相關的文件類型"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr "相關使用者"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr "範本"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "不參加"
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr "密件副本收件人（佔位符可以用在這裡）"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+"選擇翻譯語言（ISO代碼）選擇發送電子郵件時。如果沒有設置，將使用英文版本。通常，這應該是一個佔位符，表達式，提供適當的語言代碼，例如$ "
+"{object.partner_id.lang.code}。"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "文件範本"
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr "逗號分隔的收件人地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "資源追蹤"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "預覽郵件範本"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "預覽郵件"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"Message-ID SMTP header to use in outgoing messages based on this template. "
+"Please note that this overrides the 'Resource Tracking' option, so if you "
+"simply need to track replies to outgoing emails, enable that option "
+"instead.\n"
+"Placeholders must be used here, as this value always needs to be unique!"
+msgstr ""
+"消息ID SMTP頭使用在基於此模板的傳出消息。請注意，這將覆蓋'資源追蹤'選項，所以如果您只需要跟蹤答覆外發郵件，啟用該選項。\n"
+"佔位符必須用在這裡，這個值永遠必須是唯一的！"
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr "訊息頂端"
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本收件人"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr "首選的回覆地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr "移動側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr "若欄位是空的需選擇使用值"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr "型號"
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "消息引用，如以前的消息標識符"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "側邊欄按鈕來打開側邊欄動作"
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤 ! 您不行建立相關成員"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "刪除的動作記錄失敗"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr "可選擇伺服器發送的郵件。如果沒有設置，優先級最高的將被使用。"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr "傳送失敗"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr "當相關欄位已被選擇為第一欄位, 這欄位，讓您選擇目標欄位內的目標文件類型（子類型型）。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr "附加報表"
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "選擇報表列印與附加"
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr "Rich-text/HTML版本的消息（佔位符可以用在這裡）"
+
+#~ msgid "Sidebar button"
+#~ msgstr "側邊欄按鈕"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件合併精靈"
+
+#~ msgid "Related Document model"
+#~ msgstr "相關文件類型"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "豐富的文字內容"
+
+#~ msgid "Text contents"
+#~ msgstr "文字內容"
+
+#~ msgid "Opt-out"
+#~ msgstr "退出選擇"
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index 55264e50f48..a6c27495e1c 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-08-30 03:33+0000\n"
+"PO-Revision-Date: 2012-08-30 10:20+0000\n"
 "Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
-"Language-Team: \n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: event
 #: view:event.event:0
@@ -24,55 +24,55 @@ msgstr "發票資訊"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr "活動詳情"
+msgstr "事件細節"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr "主講者"
+msgstr "主要關注者"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr "最小登記數"
+msgstr "最少的登記記錄"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr "活動登記確認"
+msgstr "確認事件的登記記錄"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr "登記電郵"
+msgstr "登記記錄的郵件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr "登記日期"
+msgstr "登錄日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr "結束(_C)"
+msgstr "結束"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -82,17 +82,17 @@ msgstr "Bon Jovi 演唱會"
 #. module: event
 #: view:report.event.registration:0
 msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "僅已開發票的報名者"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "確認電郵"
+msgstr "確認電子郵件"
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -103,7 +103,7 @@ msgstr "數量"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "登記記錄沒有給任何業務夥伴開發票"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -121,7 +121,7 @@ msgstr "發票日期"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr "當前活動價目表版本"
+msgstr "當前事件的價目表版本"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:88
@@ -131,17 +131,17 @@ msgstr "當前活動價目表版本"
 #: view:partner.event.registration:0
 #, python-format
 msgid "Event Registration"
-msgstr "活動登記"
+msgstr "事件登錄"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr "上級活動"
+msgstr "上級事件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
@@ -151,27 +151,27 @@ msgstr "小計"
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "正登記活動"
+msgstr "登錄的事件"
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "所有系統的電子郵件在「回覆」填入這郵件地址。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "新增內部備註"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr ""
+msgstr "已確認的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event Beginning Date"
-msgstr ""
+msgstr "活動開始日期"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,12 +179,12 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "活動分析"
+msgstr "事件分析"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr "郵件"
+msgstr "訊息"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
@@ -206,25 +206,25 @@ msgstr "歌劇門票"
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "確認活動"
+msgstr "確認事件"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆:"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 #: model:ir.ui.menu,name:event.menu_board_associations_manager
 msgid "Event Dashboard"
-msgstr "活動儀錶板"
+msgstr "事件控制台"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -234,40 +234,40 @@ msgstr "威爾第歌劇"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "意向報名者合計"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
 msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
-msgstr ""
+msgstr "如果你想用自動確認郵件或提醒請勾選這裡。"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "關聯"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr "活動結束日期"
+msgstr "事件的結束日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr "額外資訊"
+msgstr "附加資訊"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
@@ -279,17 +279,17 @@ msgstr "客戶發票"
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: event
 #: field:event.type,name:0
 msgid "Event type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr " 活動類型 "
+msgstr " 事件類型 "
 
 #. module: event
 #: view:event.event:0
@@ -301,13 +301,13 @@ msgstr " 活動類型 "
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr "襟章"
+msgstr "標記"
 
 #. module: event
 #: view:event.event:0
@@ -316,17 +316,17 @@ msgstr "襟章"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr "登記確認"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "在新建狀態的活動"
 
 #. module: event
 #: view:report.event.registration:0
@@ -337,17 +337,17 @@ msgstr "確認"
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr "其他講者"
+msgstr "其他關注者"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr "活動開立發票"
+msgstr "事件建立發票"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr "登記或門票數量"
+msgstr "登錄編號或票"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -361,30 +361,30 @@ msgstr "警告！"
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新電子郵件"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "提供最小的報名人數"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr "地點"
+msgstr "位置"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr "已確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
@@ -400,7 +400,7 @@ msgstr "類型"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -408,17 +408,17 @@ msgid ""
 "This email will be sent when the event gets confirmed or when someone "
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
-msgstr ""
+msgstr "這封郵件會在活動已確認或有人註冊了已確認的郵件時發送。此郵件也會發送關於本活動的提醒。"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "待開票"
 
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: event
 #: code:addons/event/event.py:398
@@ -430,55 +430,55 @@ msgstr "錯誤！"
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr "摘要"
+msgstr "概要"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "Cancel Registration"
-msgstr "取消登記"
+msgstr "取消登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要開票的登記記錄裡的業務夥伴沒地址"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "上個月新建的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "本年新建的活動"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "活動類型，如座談會、展覽、會議、培訓"
+msgstr "事件類型如：研討會，展覽，會議，培訓。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "確認報名者"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr "活動組織"
+msgstr "事件結構"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr "歷史資訊"
+msgstr "日誌資訊"
 
 #. module: event
 #: view:event.registration:0
@@ -489,18 +489,18 @@ msgstr "日期"
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr "無論如何確認"
+msgstr "總是確認"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "警告：這事件 '%s'已達到最高極限 (%s)。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: event
 #: view:event.event:0
@@ -508,17 +508,17 @@ msgstr ""
 #: field:event.registration.badge,registration_id:0
 #: model:ir.actions.act_window,name:event.act_event_list_register_event
 msgid "Registration"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr "活動數目"
+msgstr "事件數"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "要在這次活動上發言的演講者"
 
 #. module: event
 #: help:event.event,state:0
@@ -527,17 +527,18 @@ msgid ""
 "particular dates the state is set to 'Confirmed'. If the event is over, the "
 "state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
 msgstr ""
+"如果事件剛建立狀態是「草稿」。如果事件在具體的日期已確認狀態是「已確認」。如果事件結束狀態設為「完成」。如果事件已經取消狀態是「已取消」。"
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "取消活動"
+msgstr "取消事件"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯繫方式"
 
 #. module: event
 #: view:event.event:0
@@ -545,45 +546,45 @@ msgstr "聯絡人"
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "事件填充狀態"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "發票分類"
+msgstr "發票組"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "郵遞"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "活動狀態"
 
 #. module: event
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr "未確認登記"
+msgstr "不確認登記記錄"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "已開票業務夥伴"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "提供本次報名的最大人數"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -598,17 +599,17 @@ msgstr "日誌"
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -618,28 +619,28 @@ msgstr "發票名稱"
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # 沒草稿狀態的登記記錄"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr "活動完結"
+msgstr "事件完成"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "未確認狀態的報名者"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr "開放及完成登記總數"
+msgstr "開啟和完成的登記記錄共有"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -649,35 +650,35 @@ msgstr "訊息"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！你不能建立互相調用的事件。"
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "關聯2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr "已開發票"
+msgstr "已開票"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr "我的活動"
+msgstr "我的事件"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -685,12 +686,12 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "這些郵箱地址將添加到所有接收的發送郵件的副本欄位，用逗號分隔多個郵件地址。"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成發票嗎 ？"
 
 #. module: event
 #: view:event.event:0
@@ -700,12 +701,12 @@ msgstr "開始日期"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr "結束"
+msgstr "已結束"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "新建狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -714,28 +715,28 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_event_event_assiciation
 #: view:res.partner:0
 msgid "Events"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr "登記數量"
+msgstr "登記記錄數"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr "子活動"
+msgstr "子事件"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr "不詳"
+msgstr "未知的"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -743,39 +744,39 @@ msgid ""
 "The invoices of this event registration will be created with this Product. "
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
-msgstr ""
+msgstr "將建立這事件登記記錄的產品發票。因此對這些預設發票它允許你設置預設的標籤和會計資訊。"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "合作的門票"
 
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr "我的登記"
+msgstr "我的登記記錄"
 
 #. module: event
 #: view:event.confirm:0
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr "警告：本活動未達最少登記限制。是否確認？"
+msgstr "警告：這事件沒有達到最低登記記錄的規定，你肯定要確認它？"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: event
 #: field:event.registration,date:0
@@ -785,12 +786,12 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
@@ -800,7 +801,7 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: event
 #: field:event.event,language:0
@@ -811,22 +812,22 @@ msgstr "語言"
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr "副本(CC)"
+msgstr "抄送"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr "此等人士會收到電郵"
+msgstr "這些人將收到電子郵件。"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr "設為草案"
+msgstr "設為草稿"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -835,7 +836,7 @@ msgstr "設為草案"
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr "確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
@@ -847,39 +848,39 @@ msgstr "日期"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr "登記電郵內容"
+msgstr "登記記錄的郵件內容"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr "確認電郵內容"
+msgstr "確認郵件內容"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "在已確認或已完成狀態的報名者"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr "歷史"
+msgstr "日誌"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr "地點位址"
+msgstr "地址"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯繫方式"
 
 #. module: event
 #: field:event.event,pricelist_id:0
@@ -890,12 +891,12 @@ msgstr "價目表"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "事件沒關聯任何定義的產品"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr "自動確認電郵"
+msgstr "自動確認郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -905,7 +906,7 @@ msgstr "雜項"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "錯誤！結束日期不能早於開始日期"
+msgstr "錯誤！結束日期不能在開始日期前。"
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -932,7 +933,7 @@ msgstr "發票"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr "年份"
+msgstr "年"
 
 #. module: event
 #: code:addons/event/event.py:465
@@ -945,30 +946,30 @@ msgstr "取消"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr "各登記活動"
+msgstr "事件登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr "開放"
+msgstr "開啟"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "責任用戶"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr "自動確認：[%s] %s"
+msgstr "自動確認： [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -977,14 +978,14 @@ msgstr "自動確認：[%s] %s"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr "負責"
+msgstr "負責人"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr "登記成本"
+msgstr "登記記錄的成本"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -996,7 +997,7 @@ msgstr "單價"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1011,13 +1012,13 @@ msgstr "回覆"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "本月新建的活動"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "如果你要自動發郵件給新的報名者請勾選此項。"
 
 #. module: event
 #: field:event.event,date_end:0
@@ -1038,12 +1039,12 @@ msgstr "產品"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr "說明"
+msgstr "描述"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr " # 已確認登記數"
+msgstr " # 沒確認登記記錄"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
@@ -1053,17 +1054,17 @@ msgstr "訂閱"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr "活動登記"
+msgstr "事件登記記錄"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "當有人讚同這事件時將發送這郵件"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
@@ -1073,34 +1074,34 @@ msgstr "會議門票"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "活動類型"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr "地址"
+msgstr "地址:"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr "下個活動"
+msgstr "下一個事件"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr "訂閱(_S)"
+msgstr "訂閱"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr "  活動登記 "
+msgstr "  事件登記記錄 "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: selection:event.registration,state:0
@@ -1111,22 +1112,22 @@ msgstr "未確認"
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr "自動登記：[%s] %s"
+msgstr "自動登記記錄： [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr "結束日"
+msgstr "結束日期"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "商會控制台"
 
 #. module: event
 #: view:event.event:0
@@ -1140,18 +1141,18 @@ msgstr "名稱"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "登記記錄設置為不能開發票"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1160,24 +1161,24 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr "結束登記"
+msgstr "結束登記記錄"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: event
 #: help:event.event,unit_price:0
 msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "這裡是開發票是預設的報名價格，注意你可以對每個報名者用不同的價格。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "已確認狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -1185,7 +1186,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: view:event.event:0
@@ -1194,51 +1195,51 @@ msgstr "活動類型"
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "標識"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr "最大登記數"
+msgstr "最多的登記記錄"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤，您不能建立循環引用的會員用戶"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr "可登記活動"
+msgstr "登記記錄引起的事件"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "如果登記記錄在 %s 狀態，不能開發票。"
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr "活動確認"
+msgstr "事件確認"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr "自動登記電郵"
+msgstr "自動登記記錄郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -1250,7 +1251,7 @@ msgstr "總計"
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr "已確認講者"
+msgstr "關注者確認"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1259,7 +1260,7 @@ msgid ""
 "should be synchronized with mobile devices or calendar applications through "
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
-msgstr ""
+msgstr "事件是低層對象用於會議和其它文檔通過caldar同步移動設備或日程表應用程序。大多數用戶將使用日程表菜單而不是事件列表。"
 
 #~ msgid "Provide Maximun Number of Registrations"
 #~ msgstr "提供登記最大數"
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index e32df5eb306..764a9d8957f 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 70986bfa1df..4beb8951849 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-16 07:09+0000\n"
+"PO-Revision-Date: 2012-08-30 18:15+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.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: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -376,7 +376,7 @@ msgstr "Ссылки"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Правило минимальных запасов"
 
 #. module: procurement
 #: view:res.company:0
@@ -390,6 +390,8 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Пожалуйста, проверьте количество в заказе на снабжение, оно не должно быть "
+"нулевым или отрицательным!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -615,7 +617,7 @@ msgstr "Правило минимума ТМЦ"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "Количество в заказе будет округляться до этого значения."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -655,7 +657,7 @@ msgstr "Заказ по максимуму"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -896,7 +898,7 @@ msgstr ""
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -995,7 +997,7 @@ msgstr ""
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 1576d2f8314..5762449e179 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-26 16:28+0000\n"
-"Last-Translator: Michael Otcheskih <otma@mail.ru>\n"
+"PO-Revision-Date: 2012-08-30 18:22+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: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -968,7 +968,7 @@ msgstr "Итоговый вес пакета"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1893,7 +1893,7 @@ msgstr "Другие ТМЦ"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: product
 #: view:product.product:0
@@ -1919,7 +1919,7 @@ msgstr "Каталог поставщика"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -2007,7 +2007,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Категории единиц"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2088,7 +2088,7 @@ msgstr "Поставщик ТМЦ"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: product
 #: field:product.uom,uom_type:0

From 7d96e13e2333ad1166aaf14fdea9073f02918d92 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 12:15:41 +0530
Subject: [PATCH 094/118] [FIX] Removed Unused File reference from __openerp__
 and unneccesasry tier check on Do nto translate

bzr revid: jam@tinyerp.com-20120831064541-1fd5h47xh8p7pb81
---
 addons/base_gengo/__openerp__.py    | 2 --
 addons/base_gengo/ir_translation.py | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index b60d3db9682..89262afc457 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -32,8 +32,6 @@ Automated Translations through Gengo API
     'update_xml': [
         'ir_translation.xml',
         'res_company_view.xml',
-        'res_lang_view.xml',
-
         'wizard/base_gengo_translations_view.xml',
            ],
     'demo_xml': [],
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 8f896ec561d..7a64c5ec305 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -79,6 +79,8 @@ class ir_translation(osv.Model):
         supported_langs = self._get_all_supported_languages(cr, uid, context=context)
         if supported_langs:
             for term in self.browse(cr, uid, ids, context=context):
+                if term.gengo_translation == "":
+                    continue
                 tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
                 language = self._get_gengo_corresponding_language(term.lang)
                 if tier not in supported_langs.get(language,[]):

From 40339ae0258c73906d7d3f2a951c6d5aad7ceb89 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 09:55:05 +0200
Subject: [PATCH 095/118] [IMP] boms on products

bzr revid: fp@tinyerp.com-20120831075505-n3478j5h7jqsu72j
---
 addons/mrp/mrp_view.xml | 1 -
 addons/mrp/product.py   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 99c8befbb6c..a785d022b53 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1006,7 +1006,6 @@
                     <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
                         <tree string="Bill of Materials">
                             <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
                             <field name="product_qty" string="Quantity of Product"/>
                             <field name="type"/>
                             <field name="date_start"/>
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 1bc3bb749ce..c6cd4a7f51c 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
+        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', [('bom_id','=',False)]),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:

From 39ed85c18dc3b3226ddc62ed73391fce714d2d9a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Aug 2012 10:39:09 +0200
Subject: [PATCH 096/118] fix

bzr revid: fp@tinyerp.com-20120831083909-suttma1sjdz7uu0m
---
 .../account_analytic_analysis_view.xml        |  1 -
 addons/mrp/mrp_view.xml                       | 55 ++++++++-----------
 addons/mrp/product.py                         |  2 +-
 addons/procurement/procurement_view.xml       | 41 +++++---------
 addons/product/product_view.xml               |  2 +
 5 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 8f051b33bf9..63a8e6c7add 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,7 +23,6 @@
                     <label for="quantity_max"/>
                     <div>
                         <field name="quantity_max" class="oe_inline"/>
-                        <field name="company_uom_id" readonly="1" class="oe_inline"/>
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a785d022b53..52b79e2ade0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -985,42 +985,14 @@
                </data>
             </field>
         </record>
-		<record id="product_normal_form_supply_view" model="ir.ui.view">
+        <record id="product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-            	<xpath expr="//field[@name='procure_method']" position="after">
-            		<field name="supply_method" groups="base.group_user"/>
-            	</xpath>
-            </field>
-        </record>
-
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.mrp.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-            <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Bill of Materials"/>
-                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                        <tree string="Bill of Materials">
-                            <field name="name" string="Component Name"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </tree>
-                        <form string="Bill of Material">
-                            <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </form>
-                    </field>
-                </page>
+                <xpath expr="//field[@name='procure_method']" position="after">
+                    <field name="supply_method" groups="base.group_user"/>
+                </xpath>
             </field>
         </record>
 
@@ -1078,5 +1050,24 @@
                 id="menu_mrp_production_order_action" name="Orders Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
+
+        <record model="ir.actions.act_window" id="product_open_bom">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Bill of Materials</field>
+            <field name="res_model">mrp.bom</field>
+        </record>
+
+        <record model="ir.ui.view" id="product_form_view_bom_button">
+            <field name="name">product.product.procurement</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Bill of Materials" name="%(product_open_bom)d" type="action"/>
+                </xpath>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index c6cd4a7f51c..1fa0f2c8a97 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', [('bom_id','=',False)]),
+        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', domain=[('bom_id','=',False)]),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f2a8dc98cb0..432ff13aaa5 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -261,12 +261,12 @@
         </record>
 
         <act_window
-        context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
-        id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Reordering Rules"
-        res_model="stock.warehouse.orderpoint"
-        src_model="stock.warehouse"
-        groups="stock.group_stock_user"/>
+            context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
+            id="act_stock_warehouse_2_stock_warehouse_orderpoint"
+            name="Reordering Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="stock.warehouse"
+            groups="stock.group_stock_user"/>
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
@@ -283,23 +283,11 @@
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.orderpoint.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-            <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Minimum Stock Rules"/>
-                        <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                            <tree string="Reordering Rules">
-                                <field name="name"/>
-                                <field name="warehouse_id"/>
-                                <field name="product_min_qty"/>
-                                <field name="product_max_qty"/>
-                            </tree>
-                        </field>
-                </page>
-            </field>
+
+        <record model="ir.actions.act_window" id="product_open_orderpoint">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Orderpoints</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
         </record>
 
         <record model="ir.ui.view" id="product_form_view_procurement_button">
@@ -307,10 +295,9 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='image_medium']" position="after">
-                    <div class='oe_right oe_button_box'>
-                        <button string="Procurement Request" name="%(act_make_procurement)d" type="action"/>
-                    </div>
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
+                    <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 17b4a7ecc68..d341b5883d6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -72,6 +72,8 @@
                             <label for="categ_id" class="oe_edit_only"/>
                             <h2><field name="categ_id"/></h2>
                         </div>
+                        <div class="oe_right oe_button_box" name="buttons">
+                        </div>
                         <notebook>
                             <page string="Information">
                                 <group>

From 48b6fc09b3f2063a2a3febc8fabd4eca5f6885ca Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:02:49 +0200
Subject: [PATCH 097/118] [FIX] base_gengo: removed required=True on
 gengo_translation field as the way to create translation is a bit unusual
 (created in a temporary table for mass import then using SQL queries to
 update the right table), it would be tricky to inherit at the right spot to
 apply the default value

bzr revid: qdp-launchpad@openerp.com-20120831090249-v0meyp1luf29eddn
---
 addons/base_gengo/ir_translation.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7a64c5ec305..561938a28e1 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -48,15 +48,11 @@ class ir_translation(osv.Model):
     _inherit = "ir.translation"
     _columns = {
         'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
-        'job_id': fields.char('Gengo JobId', size=32),
-        "gengo_translation": fields.selection([('', 'Do not translate this term by Gengo'),
-                                            ('machine', 'Translation By Machine'),
+        'job_id': fields.char('Gengo Job ID', size=32),
+        "gengo_translation": fields.selection([('machine', 'Translation By Machine'),
                                             ('standard', 'Standard'),
                                             ('pro', 'Pro'),
-                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.', required=True),
-    }
-    _defaults = {
-        'gengo_translation': '',
+                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.'),
     }
 
     def _get_all_supported_languages(self, cr, uid, context=None):
@@ -79,7 +75,7 @@ class ir_translation(osv.Model):
         supported_langs = self._get_all_supported_languages(cr, uid, context=context)
         if supported_langs:
             for term in self.browse(cr, uid, ids, context=context):
-                if term.gengo_translation == "":
+                if not term.gengo_translation:
                     continue
                 tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
                 language = self._get_gengo_corresponding_language(term.lang)

From 0491bffbe33151e95852f22b09031a3cf628564a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:18:51 +0200
Subject: [PATCH 098/118] [IMP] base_gengo: removal of restart_fetch_job field
 in wizard (not useful)

bzr revid: qdp-launchpad@openerp.com-20120831091851-wq4wxw3h5mbc6wjw
---
 addons/base_gengo/wizard/base_gengo_translations.py       | 4 +---
 addons/base_gengo/wizard/base_gengo_translations_view.xml | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
index e91be00ec47..1e3637e7b56 100644
--- a/addons/base_gengo/wizard/base_gengo_translations.py
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -48,7 +48,6 @@ class base_gengo_translations(osv.osv_memory):
     _name = 'base.gengo.translations'
     _columns = {
         'restart_send_job': fields.boolean("Restart Sending Job"),
-        'restart_fetch_job': fields.boolean("Restart Fetching Job"),
         'lang_id': fields.many2one('res.lang', 'Language', help="Leave empty if you don't want to restrict the request to a single language"),
     }
 
@@ -118,8 +117,7 @@ class base_gengo_translations(osv.osv_memory):
             #check the cron jobs and eventually restart/recreate them
             if wizard.restart_send_job:
                 self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
-            if wizard.restart_fetch_job:
-                self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+            self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
index 88ce7788d24..378d270f6aa 100644
--- a/addons/base_gengo/wizard/base_gengo_translations_view.xml
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -8,11 +8,10 @@
                 <form string="Gengo Request Form" version="7.0">
                    <group col="4">
                         <group>
+                            <field name="lang_id"/>
                             <field name="restart_send_job"/>
-                            <field name="restart_fetch_job"/>
                         </group>
                         <group>
-                            <field name="lang_id"/>
                             <label colspan="2" string="Leave empty for requesting all the terms to Gengo that needs it, regardless of their language"/>
                         </group>
                     </group>

From 7c540602f543fc1c3c6a4969f1ee48e4bdecadae Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:50:48 +0200
Subject: [PATCH 099/118] [FIX] base_gengo: added missing import statement

bzr revid: qdp-launchpad@openerp.com-20120831095048-0yn1vgataftgadhx
---
 addons/base_gengo/ir_translation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 561938a28e1..c7343159ddf 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 LANG_CODE_MAPPING = {
     'ar_SA': ('ar', 'Arabic'),

From 61a1ab40955a30cf15d50407900073537a93f47c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 31 Aug 2012 11:53:12 +0200
Subject: [PATCH 100/118] [FIX] base_gengo: typo

bzr revid: qdp-launchpad@openerp.com-20120831095312-pbi55dof1zrxzdsf
---
 addons/base_gengo/ir_translation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
index 6725504df8a..ba9667d979e 100644
--- a/addons/base_gengo/ir_translation.xml
+++ b/addons/base_gengo/ir_translation.xml
@@ -21,7 +21,7 @@
                  <xpath expr="//form[@string='Translations']/sheet" position="inside">
                     <group string="Gengo Translation Service" col="4" colspan="4">
                         <field name="gengo_translation" />
-                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are suppose to do that directly by using your Gengo Account"/>
+                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are supposed to do that directly by using your Gengo Account"/>
                         <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
                     </group>
                 </xpath>

From ea60ca1e27cb469fca4fa9a33bc7bd59e1683088 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 15:31:43 +0530
Subject: [PATCH 101/118] [FIX] Usability Fix,  missing import and added the
 resquest process call

bzr revid: jam@tinyerp.com-20120831100143-rgx1ntdkzqcngov9
---
 addons/base_gengo/wizard/base_gengo_translations.py       | 1 +
 addons/base_gengo/wizard/base_gengo_translations_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
index 1e3637e7b56..d8a96a2ced9 100644
--- a/addons/base_gengo/wizard/base_gengo_translations.py
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -114,6 +114,7 @@ class base_gengo_translations(osv.osv_memory):
             ctx = context.copy()
             ctx['gengo_language'] = wizard.lang_id.id
             self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            self._sync_response( cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
             #check the cron jobs and eventually restart/recreate them
             if wizard.restart_send_job:
                 self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
index 378d270f6aa..09c3a77b1d5 100644
--- a/addons/base_gengo/wizard/base_gengo_translations_view.xml
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -8,7 +8,7 @@
                 <form string="Gengo Request Form" version="7.0">
                    <group col="4">
                         <group>
-                            <field name="lang_id"/>
+                            <field name="lang_id" required="1"/>
                             <field name="restart_send_job"/>
                         </group>
                         <group>

From bf513b5919006080b7a48825d3a63861fc6ff25f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 12:25:09 +0200
Subject: [PATCH 102/118] [IMP] point_of_sale: Add a description when the
 session is in progress

bzr revid: stw@openerp.com-20120831102509-yv3bc68gii0sexfk
---
 .../point_of_sale/wizard/pos_session_opening.py   | 15 ++++++++++++---
 .../point_of_sale/wizard/pos_session_opening.xml  |  9 +++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index d3b6ea28b17..4364998b6a4 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -15,6 +15,10 @@ class pos_session_opening(osv.osv_memory):
         'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
                                        'Session State', readonly=True),
         'show_config' : fields.boolean('Show Config', readonly=True),
+        'pos_session_name' : fields.related('pos_session_id', 'name',
+                                            type='char', size=64, readonly=True),
+        'pos_session_username' : fields.related('pos_session_id', 'user_id', 'name',
+                                                type='char', size=64, readonly=True)
     }
 
     def open_ui(self, cr, uid, ids, context=None):
@@ -66,7 +70,9 @@ class pos_session_opening(osv.osv_memory):
     def on_change_config(self, cr, uid, ids, config_id, context=None):
         result = {
             'pos_session_id': False,
-            'pos_state': False
+            'pos_state': False,
+            'pos_session_username' : False,
+            'pos_session_name' : False,
         }
         if not config_id:
             return {'value': result}
@@ -76,8 +82,11 @@ class pos_session_opening(osv.osv_memory):
             ('config_id', '=', config_id),
         ], context=context)
         if session_ids:
-            result['pos_state'] = proxy.browse(cr, uid, session_ids[0], context=context).state
-            result['pos_session_id'] = session_ids[0]
+            session = proxy.browse(cr, uid, session_ids[0], context=context)
+            result['pos_state'] = session.state
+            result['pos_session_id'] = session.id
+            result['pos_session_name'] = session.name
+            result['pos_session_username'] = session.user_id.name
         return {'value' : result}
 
     def default_get(self, cr, uid, fieldnames, context=None):
diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml
index 948f1db8c61..9279d5fce45 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -44,6 +44,15 @@
                           interface.
                         </p>
                     </div>
+                    <div attrs="{'invisible' : [('pos_state', '!=', 'opened')]}" class="oe_view_nocontent">
+                        <p class="oe_view_nocontent_create">
+                            Click to continue the session.
+                        </p>
+                        <p>
+                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state" class="oe_inline" /></b>"<br/>
+                            You can continue sales from the touchscreen interface by clicking on "<b>Settings</b>" or close the cash register session ?
+                        </p>
+                    </div>
 
                 </form>
             </field>

From 34fcb826028538f09e58c72d8ac4ce22fbc04de9 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 31 Aug 2012 12:50:42 +0200
Subject: [PATCH 103/118] [FIX] Fixed autosize behaviour.

bzr revid: vta@openerp.com-20120831105042-fuwhrbdgs51x76u6
---
 addons/web/__openerp__.py                     | 59 +------------------
 .../lib/jquery.autosize/jquery.autosize.js    |  7 ++-
 addons/web/static/src/js/view_form.js         | 15 +++--
 3 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 38e3328bf8b..44a3caaf8ec 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -23,6 +23,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.validate/jquery.validate.js",
         "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
         "static/lib/spinjs/spin.js",
+        "static/lib/jquery.autosize/jquery.autosize.js",
         "static/lib/jquery.blockUI/jquery.blockUI.js",
         "static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js",
         "static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js",
@@ -37,8 +38,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/underscore/underscore.string.js",
         "static/lib/backbone/backbone.js",
         "static/lib/cleditor/jquery.cleditor.js",
-        "static/lib/py.js/lib/py.js",
-        "static/lib/jquery.autosize/jquery.autosize.js",
+        "static/lib/py.js/lib/py.js",        
         "static/src/js/boot.js",
         "static/src/js/corelib.js",
         "static/src/js/coresetup.js",
@@ -68,60 +68,5 @@ This module provides the core of the OpenERP Web Client.
     ],
     'qweb' : [
         "static/src/xml/*.xml",
-        'static/lib/datejs/globalization/en-US.js',
-        'static/lib/datejs/core.js',
-        'static/lib/datejs/parser.js',
-        'static/lib/datejs/sugarpak.js',
-        'static/lib/datejs/extras.js',
-        'static/lib/jquery/jquery-1.7.2.js',
-        'static/lib/jquery.MD5/jquery.md5.js',
-        'static/lib/jquery.form/jquery.form.js',
-        'static/lib/jquery.validate/jquery.validate.js',
-        'static/lib/jquery.ba-bbq/jquery.ba-bbq.js',
-        'static/lib/spinjs/spin.js',
-        'static/lib/jquery.blockUI/jquery.blockUI.js',
-        'static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js',
-        'static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js',
-        'static/lib/jquery.ui.notify/js/jquery.notify.js',
-        'static/lib/jquery.deferred-queue/jquery.deferred-queue.js',
-        'static/lib/jquery.scrollTo/jquery.scrollTo-min.js',
-        'static/lib/jquery.tipsy/jquery.tipsy.js',
-        'static/lib/jquery.textext/jquery.textext.js',
-        'static/lib/jquery.timeago/jquery.timeago.js',
-        'static/lib/qweb/qweb2.js',
-        'static/lib/underscore/underscore.js',
-        'static/lib/underscore/underscore.string.js',
-        'static/lib/backbone/backbone.js',
-        'static/lib/cleditor/jquery.cleditor.js',
-        'static/lib/py.js/lib/py.js',
-        'static/src/js/boot.js',
-        'static/src/js/corelib.js',
-        'static/src/js/coresetup.js',
-        'static/src/js/dates.js',
-        'static/src/js/formats.js',
-        'static/src/js/chrome.js',
-        'static/src/js/views.js',
-        'static/src/js/data.js',
-        'static/src/js/data_export.js',
-        'static/src/js/data_import.js',
-        'static/src/js/search.js',
-        'static/src/js/view_form.js',
-        'static/src/js/view_list.js',
-        'static/src/js/view_list_editable.js',
-        'static/src/js/view_tree.js',
-    ],
-    'css': [
-        'static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css',
-        'static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css',
-        'static/lib/jquery.ui.notify/css/ui.notify.css',
-        'static/lib/jquery.tipsy/tipsy.css',
-        'static/lib/jquery.textext/jquery.textext.css',
-        'static/src/css/base.css',
-        'static/src/css/data_export.css',
-        'static/src/css/data_import.css',
-        'static/lib/cleditor/jquery.cleditor.css',
-    ],
-    'qweb': [
-        'static/src/xml/*.xml',
     ],
 }
diff --git a/addons/web/static/lib/jquery.autosize/jquery.autosize.js b/addons/web/static/lib/jquery.autosize/jquery.autosize.js
index 29729d2fd42..9d972e96a57 100644
--- a/addons/web/static/lib/jquery.autosize/jquery.autosize.js
+++ b/addons/web/static/lib/jquery.autosize/jquery.autosize.js
@@ -59,7 +59,12 @@
 				} else {
 					mirror = $(copy).data('ismirror', true).addClass(className || 'autosizejs')[0];
 
-					resize = $ta.css('resize') === 'none' ? 'none' : 'horizontal';
+					// Changed allowed resize only in edit mode by VTA (31/8/2012)
+					if ($ta.attr('disabled')) {
+						$ta.css('resize', 'none');
+					}
+					// Changed horizontal to vertical by VTA (31/8/2012)
+					resize = $ta.css('resize') === 'none' ? 'none' : 'vertical';
 
 					$ta.data('mirror', $(mirror)).css({
 						overflow: hidden,
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0b0366a9ee4..db144f3976d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2322,12 +2322,16 @@ instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
 
 instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldText',
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
+    },
     initialize_content: function() {
+        var self = this;
         this.$textarea = this.$el.find('textarea');
         this.default_height = this.$textarea.css('height');
         if (!this.get("effective_readonly")) {
             this.$textarea.change(_.bind(function() {
-                this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
+                self.set({'value': instance.web.parse_value(self.$textarea.val(), self)});
             }, this));
         } else {
             this.$textarea.attr('disabled', 'disabled');
@@ -2340,14 +2344,17 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
         this.setupFocus(this.$textarea);
     },
     set_value: function(value_) {
-        this._super.apply(this, arguments);
+        this._super(value_);
         this.render_value();
+        $(window).resize();
     },
     render_value: function() {
         var show_value = instance.web.format_value(this.get('value'), this, '');
+        if (show_value === '') {
+            this.$textarea.css('height', parseInt(this.default_height)+"px");
+        }
         this.$textarea.val(show_value);
-        this.$textarea.autosize();
-        this.$textarea.css('height', parseInt(this.default_height)+"px");
+        this.$textarea.autosize();        
     },
     is_syntax_valid: function() {
         if (!this.get("effective_readonly")) {

From 422e3f1fbc6857e82a321fe75903aa11017b77dd Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 16:25:40 +0530
Subject: [PATCH 104/118] [FIX] Set cron job to the false by default and module
 decrpation to use it.

bzr revid: jam@tinyerp.com-20120831105540-hnt2zbx8fz8i6i01
---
 addons/base_gengo/__openerp__.py                | 7 +++++++
 addons/base_gengo/gengo_sync_schedular_data.xml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 89262afc457..1f002b3de43 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -24,6 +24,13 @@
     'category': 'Tools',
     'description': """
 Automated Translations through Gengo API
+----------------------------------------
+    The module will install passive Scheduler job for Automated Translations 
+using Gnego API. To active translation Configure your gengo authentication 
+parameters under `Settings > Companies > Gengo Parameters1 and Launch the 
+Gengo Language Sync Wizard under `Settings > Application Terms > 
+Gengo: Manual Request of Translation` and follow the wizard. This wizard will
+active the Scheduler and will start active translation via Gengo Services,
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index bd52a9697d3..823ca8f14db 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -4,7 +4,7 @@
         <!--Scheduler sync Receive Request-->
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
-            <field eval="True" name="active"/>
+            <field eval="False" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
@@ -16,7 +16,7 @@
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
-            <field eval="True" name="active"/>
+            <field eval="False" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>

From decd215edcbe6a30841780861c7b1e47be09c3b5 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 31 Aug 2012 17:11:06 +0530
Subject: [PATCH 105/118] [FIX] _check_lang_support constrain

bzr revid: jam@tinyerp.com-20120831114106-tjnrcwj4nslaamxz
---
 addons/base_gengo/ir_translation.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index c7343159ddf..7b864aba8ce 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.py
@@ -73,15 +73,14 @@ class ir_translation(osv.Model):
         return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
 
     def _check_lang_support(self, cr, uid, ids, context=None):
-        supported_langs = self._get_all_supported_languages(cr, uid, context=context)
-        if supported_langs:
-            for term in self.browse(cr, uid, ids, context=context):
-                if not term.gengo_translation:
-                    continue
-                tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
-                language = self._get_gengo_corresponding_language(term.lang)
-                if tier not in supported_langs.get(language,[]):
-                    return False
+        for term in self.browse(cr, uid, ids, context=context):
+            if term.gengo_translation:
+                supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+                if supported_langs:
+                    tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+                    language = self._get_gengo_corresponding_language(term.lang)
+                    if tier not in supported_langs.get(language,[]):
+                        return False
         return True
 
     _constraints = [

From c0d5a806824986284dd022e0478e57fc1e59feb7 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:12:16 +0200
Subject: [PATCH 106/118] Random generation of default avatar

bzr revid: mit@openerp.com-20120831131216-c5j02m8q7kwnn5pv
---
 openerp/addons/base/module/module_view.xml    |   2 +-
 openerp/addons/base/res/res_partner.py        |  31 ++++++++++++++++--
 openerp/addons/base/res/res_partner_view.xml  |   8 ++---
 openerp/addons/base/static/src/img/avatar.png | Bin 0 -> 10341 bytes
 .../addons/base/static/src/img/avatar0.png    | Bin 6910 -> 0 bytes
 .../addons/base/static/src/img/avatar1.png    | Bin 5279 -> 0 bytes
 .../addons/base/static/src/img/avatar2.png    | Bin 5340 -> 0 bytes
 .../addons/base/static/src/img/avatar3.png    | Bin 5317 -> 0 bytes
 .../addons/base/static/src/img/avatar4.png    | Bin 5323 -> 0 bytes
 .../addons/base/static/src/img/avatar5.png    | Bin 5374 -> 0 bytes
 .../addons/base/static/src/img/avatar6.png    | Bin 5452 -> 0 bytes
 .../base/static/src/img/partner_image.png     | Bin 2723 -> 0 bytes
 setup.py                                      |   2 +-
 13 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 openerp/addons/base/static/src/img/avatar.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar0.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar1.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar2.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar3.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar4.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar5.png
 delete mode 100644 openerp/addons/base/static/src/img/avatar6.png
 delete mode 100644 openerp/addons/base/static/src/img/partner_image.png

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 27eccf020b2..729d3ef7b4c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -69,7 +69,7 @@
                         <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
                         <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
                         <div class="oe_module_desc">
-                          <h4><a type="edit"><field name="shortdesc"/></a></h4>
+                          <h4><a type="open"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
                              <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
                              <i><field name="name" groups="base.group_no_one"/></i>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 93d12228ebe..f282466b989 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -227,10 +227,35 @@ class res_partner(osv.osv):
 
     def _get_default_image(self, cr, uid, is_company, context=None):
         if is_company:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')
+            image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+<<<<<<< TREE
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
+            face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png'))
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+=======
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 256), int(random() * 256), int(random() * 256))
+            face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+>>>>>>> MERGE-SOURCE
 
     _defaults = {
         'active': True,
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 92a264f0089..7e70e68c35c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -176,7 +176,7 @@
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
-                                                <a type="edit">
+                                                <a type="open">
                                                     <img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>
                                                     <div class="oe_module_desc">
@@ -184,7 +184,7 @@
                                                             <table class="oe_kanban_table">
                                                                 <tr>
                                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                                        <h4><a type="open"><field name="name"/></a></h4>
                                                                         <i><div t-if="record.function.raw_value">
                                                                             <field name="function"/><br/></div></i>
                                                                     </td>
@@ -302,11 +302,11 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette">
-                                <a type="edit">
+                                <a type="open">
                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_kanban_image"/>
                                 </a>
                                 <div class="oe_kanban_details">
-                                    <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a></h4>
+                                    <h4 class="oe_partner_heading"><a type="open"><field name="name"/></a></h4>
                                     <div class="oe_kanban_partner_categories"/>
                                     <div class="oe_kanban_partner_links"/>
                                     <ul>
diff --git a/openerp/addons/base/static/src/img/avatar.png b/openerp/addons/base/static/src/img/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..93235db8afa7085e727ea6dc04fb3170ee0d92c1
GIT binary patch
literal 10341
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

literal 0
HcmV?d00001

diff --git a/openerp/addons/base/static/src/img/avatar0.png b/openerp/addons/base/static/src/img/avatar0.png
deleted file mode 100644
index 2bcc7c8d2e477a359296fbb8461c6cdb091dfdaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6910
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

diff --git a/openerp/addons/base/static/src/img/avatar1.png b/openerp/addons/base/static/src/img/avatar1.png
deleted file mode 100644
index 4f6d2f7e8183ec27b29da9a3f7c3f3283034dca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5279
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
TT)_e7i6DI)W9<qpyU70l6|~ko

diff --git a/openerp/addons/base/static/src/img/avatar2.png b/openerp/addons/base/static/src/img/avatar2.png
deleted file mode 100644
index 70d5df7ee60257cfd927fc6e9f4e8adc5114d22f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5340
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

diff --git a/openerp/addons/base/static/src/img/avatar3.png b/openerp/addons/base/static/src/img/avatar3.png
deleted file mode 100644
index 053768aa0350fd973ded62ec2ffbd362d59cd5d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5317
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
Z;}uHVztD9(13YzvsHtcv7b{wZ{TJkF>NWrX

diff --git a/openerp/addons/base/static/src/img/avatar4.png b/openerp/addons/base/static/src/img/avatar4.png
deleted file mode 100644
index 1b2a99f05c314245013d41b663059fc87e126684..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5323
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
EKfVga!vFvP

diff --git a/openerp/addons/base/static/src/img/avatar5.png b/openerp/addons/base/static/src/img/avatar5.png
deleted file mode 100644
index 0f6c416ecf017631a4f95d2fe8eda439a6e41cf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5374
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
M54BZFm8@R<2b>c9f&c&j

diff --git a/openerp/addons/base/static/src/img/avatar6.png b/openerp/addons/base/static/src/img/avatar6.png
deleted file mode 100644
index d6a18c2779e4bf8b582183a483a22e612f5d87c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5452
zcmai22T)U8w+#j*w1^5)Or#1@6hulWf+8*S8k+Qu2tisD5D6vH1*C(BH0jc$2Vw+N
zKm??>AR-EcqVzy`*Z-UGz5mTCnYojF&zybE+`ac%YwZ(lpr^siz{LOpftZn+szx9X
zjoY6Gasn9H#_eE%KN?>n4HZz;C)iKmg&wVG;R^yWp8NCAfU<HpfI&Jxq^=s>H25Nf
zMqy94$P@%(okgnNGQmueXRP7`#;kibjYoFZmRGh`<Lb<++XI>y&eB&X(h7j-W0>{K
zc}_Vj(4r-33_fFFqGw|aRC8!wUgmqP_}JiLoI0xh{fWZ&XWw>yoabAlIn&=~;}THp
zsyN(OT7@?=V>|8KIORL>^EtU{t?b~@bD6Y-+@rwtYU;6Zi5@b|nI6OusY4H9fq@`U
z5G@@D3kDHr{u+--pqpqAF!GPVgZMKM82QKe>+#q4*TjF;`0Mf4_-Bv*;_C9m*`jLC
z+rb4HJWHi#L?%P2w|i?_yz4^Se|3B(98<n>Znm$-<Q<@SU{FThmxFE+9C7LebjNi#
zsyYvX^tDZbsbFlyzjfweJN2t~_T1reQPA;~S#w(|ftyh@<}5=bmheKXHv&SS8PkYz
zw#d~h8U88774JzVAdm4L-%*Me6IJ<=G$ZylL`D&9&G+q(TSh!mwTkqW@XnQsZ>M(U
zo^q)?*_!S8Jo@s10_E47=d<2LuSSKvI-mTP3!P#+?8WX}QTgtZLKn$xzkY%1HtMXc
zE%(2;4%e9Lq&WvY&8Oo<NQi246uZBfB3o9b&9)-4mG6ak-AL7nRLOr74B^#e!Gevg
zy4<9=8Z7%W?Y~_t&9wUIC(jkX6N;$~Cp{jHSFf9>K$XjplUu2fkuUMh&CS#kA`mFz
z8COeHdhcQ;TqkNUXYRd|WZ2Eec);UasbTquidF3F-tA1+*l1O3O_y2|eC6Yp@rj8|
z9S;caxA^^;8EcAuPih>gbI<tp*tY9M(ZaIbpjG|!iaUGLC5-JhiK})dgp3RE>IJ;s
zeL<AdcXK98S=G>WX$fFQWV}bi^8ObV6<Qhn(lQT?Q!{jMI=$yyY0jo1shG`*P%5d?
zID5h~Eg(DrETkWQzj?JBnEftbz(j<NQr6uNPwISMYABL=w#Zkh;$|D>jZx|Nb;gNX
zXuEow+roLf_uyZ<>WYk_*TICa{4KNFM-z9Mw4Qxpi&e`?$fU&ldeG<6n(uD;`t?m|
z&)lv`9YG@A2n!C>jt^+PSGoAAn<vOheuD4{OEe}*Fc~d8^<M4{Zk!@3N9*5$K-*G)
zl#<E!%6wjBmn#&z8_}t=t(sM$3KU98iH2FfFZlZUVwc?Lp<BmX^_Ev^lr*FhN=KTF
z6fc%Q<3tLhE+LcMvj&dtM|!|kT8~jOOt)VT-Rhy?Rjo1K`fXF4RL{<ksS{-wNwU+l
z*W}dQppj-}Fa-9nJuSR*o0G$)`OX{LU~S<ah~ST>dw%PvkiI@YI_3G<XD`8?<9L6)
z{({hEzc|^5RvwyHHntMhZ~SH6>0wD=@&|z+dBADR%d^6)lo%ay817GKF7$&@2Sc;l
z{DkzS*Mx%yRz+e|hHv%ECw4xfykpk#Nwl#pOXl)}DGiYW;;lHBC8Bo7cZ4q{p5yj|
z;WLb5y7-DX7+Zb#rGb@`;N(SGe-8E_eqmi8q2yEQ2IV7e@(`&0E+$zZLKAh>Am-Y`
zW!IJ+PG!H(aU!#xvWO=bmDStGQZO9nIu(D6$7=|8>kUiA-0YdRXsO!uDlR1oY*gHU
z<7Aguc~#qON?6Yg{q&>lh0)@KmY&HrLK2YfGTGBf&L*2Y0kL{qIKR(67_^>ygXJ@a
zmx!JW(#B+tg9WN!@CB=mC@r13n=BLY{piI)u5;VDp>Dt4$O>JJkn-2FVUi0W(o8=q
zTG(JckH{JHYHWs`h0SK7AkZFpg_xUY46kGaOO(AL1@qVgL0T+tA$5O@sOg?3<-Bd3
z%sGoMJbB`s6dXtKZ?%pgWdyY9o`FEI;DSN_Ts{_9l`Dt3d-`1-I2|Eueq39#*xhD7
zo@WHzH+Srx$fv^^TL85NRW`u<(MCTAmJ*ug!#+*HCixKP%J!e=VZpR?gn7|o_gd7F
zqE`hAY|X_2)jXaLh1RWy)<tNbn-GYmqOWbo6r1#LIYC^jh#u3_K|HHJdVEpH8-Jk8
zSld^WL_(8a_fuGku|g;g)9D*!1`(yC%Mw^(S1I9_65$q_Bv8Ph#)E)B<D!-vN+Q`?
z&%o~NN=OC~uLe5NL(LA-Lmf;qU3zG+#8mw6dohY|CgBvKQbKfS;8ZXDvIN`R?q8=5
zKU*x{>>;R~=C><RhU2U<izh4$UlHry&GsswejwarL0BS%43j+pY)6Zr#1<!#0BZPm
z>HyIGf5QJJI{ndb;M8LRg$cT7JE=71%{P85Fw%WG7T898ul{TygqBX1PThCgG{Kf1
zac8Ajw462Uiy%TGtK|7o(eUsYC{FkUVIH-9WH>7%11H!Spg+qI=8f_Vp780^EZEuc
zBJK#EjW&o74uJ6>ejp@HJY)u<GiNQ6s7LPAU8ILr1^o#R7M#-HB6bcaz}E1E$!+Il
z((C5^CnOs&!u&D`vvtj@0@07pRBQcLTE^f0P}Ec5{S(!=RuV0ay*8W=5jSH?i;JCz
z^{wxR204bvu|Qr+YN4B2#~`P|ot+~+5Z`fg>_vn8h-q7A3ztkHa?tG=P(?PKmbodI
z*H1~L^0=g$KOWE9RoS69IfXIKyWO<{$cnhLKxv2%ey9yz)V@(R|9C$#!_N5`X+tyL
zdBSG7r%*UX1t`n)CtVJ#1R8?f(|~Z&29_#GSCmmNJDQFJK9~PssuP2MH1z0DC<R8m
zg~pVR)*kwHaFjsLvBj%57pb5z_blx-3cx?bn*O|aTH0S2R~@NsoXFQkV+<rXDvG@f
zaP-k#4qIHbIN6d^OpbE`vgU&Pc_0L*^+W+KG17UPRnw=yO%ENAfdj$Mu1!IET>Esy
zx>SW_oqUk0b?Hq|lziNNd2s$)T~T?cc(0Qrt9@J5)yk*9l07AC7HOHN?v<ZQ7IF?I
zn_>T=7h{|cz0!*)72e)jb57t4ORiPM8CqD>?1m)$<HH+~W>vuIn50+orv}3J4U!{R
zn(rhS#nps3{t!e2^RhrHIK`4?MXxk=hu@>cb>!U0D}wAk37VqCt#7<uy&)nhI*-oa
zjU;WHK_+7fcKo3@qnwO(y?0Ml(0f-En#6+~#;U}77JMe-e+K)PQtHQBQ+0-?XJ&NQ
ztqXbh6>PtgF!E64Hy2bO7HKIT1V%VUe9Zt@x}1JP9%?HK@0}CB15wnu73KQ;%A^Kg
zO(y`sbHxjNa%;i~osZ6=k_C)_WO)zsMraD0RTNifn>z^C;bD0JrNvceLn*f?iFdw-
z#pd5>#d}sqOFEx}F^Tb|YK6?-6*XBf=YGg%-*}-<c=&MW?9_G1*P6-ilCZa}SJtX)
z7XUh5mx3z>_*9f@ivl$v7fI?=(8Y=Mnx$u;*1nI0%D&Bc`wDwB98>I0cza?5QLDA2
z)ixND0H&0%sTp4GGJM`z>(OyPx*QIt+nJi4&M8+`g+t2*DhCF9-(H8)L3Kn`o_MAW
zhd^CB<RZ1<gs|JiY&K$kyCge{XQWPh?r1Ty<nk}}c^=DAM^IW87{bXiNg$eze7ZJ0
zKGPTig~?UEzW$4c@=EGED;BK55UHXlrr_3Z4y8R&f8n}c<N`5+;I0NSyqbQl$k&88
zs?eUIBltjC3{IDji5lmYdv8PHkp`AYf$yA0LU@5fV&RMv;fQh1va+)B<YiOwTb}}C
zU7xTYjHB!)shQ16B-KF=P+gwr*O4ZW&FNHAil3Sm09hP6b164@(EA^<mBhR9LSqAY
z`o2ZRi{)7qyPuEkGTDA)Yde9s{4@bv5F%6CSMR{h3c-T;bwrgqgelzzlD8QMVTLZ6
z$l7q?K+r(wx1(z)b$V!yljS}McSzx!U}o0^2qKB@d{yILjr-U5M_K=$I{Dv~wNA1C
zvdxs1mM&^2G@YR|Y~tO85Z7zct8Egx#>4eF0UrjK+2`owp-dxg<KEg=(tGm`BFP&&
zA&;&;anA|}*pP3{?DbPh&RmvcB3@4K{qXUmheNr5+3)>efwP<yXMZ3zMi))SwpH>!
zTk9rsh2NjN^gCcD(p5IQU(ma%WZ^{zrW`D*Ydp4XR4Qc_`sCyE%pWp3td7PgUWCvd
zRMOpp5awe)z2xR>x2YcSI9d>0KF5v8_!?Iz*O8<tz?THsyoKI-*~OwVekH2dUH`a(
z`my)4LC(1;?KvI6lp1p}76=PBEiRqEV8o-eEUWT{rgQh=<o06TvAHCm$W?g10w>1A
zW9wl%Anpg|Ml-YoOOiT(+8|TJc@WcZ&Xy{(a#OEoh~nfs{VsKzm>hs$(8e}T8q<|q
zXV%u%uI_3Te_bB>c)cS}r(~E(oEFD;z-U!6yx*H1GeBiXx)w4+c|+N}g=K-&rLqSw
zlN$z>l&c>7E>FMwNyj~RQm4phr$3#lp$<$K_PnMuyt@4`UY)<iH|t}c<dw$a%UV)g
zWNy^WU>2D16DFdBe6C(4N*llnNiRcWm0-#T0=eW}5B)~PM@Z73x1YbYnd$cS*qcIy
z2S!Be`;$eVN53wGuJ>yd0g7m+Kl{Z(hGzPpM*~;<scfYixBI8H1XH3_zmi;;v5rhh
zgKkpeTR%+!mJa$<*mSIdj=Lfr!BSR6C67saRUh2)eZ-&MySWM@`22b=p<9P4SDOt!
z?Yx<7xf7t2w=^M#b*%sLBcQdcOl0x*mv;kYr57eVNAV%r(vXC}OOYJoX9ObLWU|Ga
z>^?WF^l~@npje$ZOxd=0Y6tj<O7Wj0m`qJOs6r<nI6nW<`9er(1MPNqb8~kc(DOtI
z04M`%@)tI8shRT8Lvqw8I}V_=lFx<Wh)T9Jn}+DssjUf5nU(E_>dp$M)OWfMeo-zW
zyB2)ro?rZSWavC+HTbaIrpU<RptaJ@KI}{92gUo;d7zf{4^>Oe#RBBv*EZHJ=iP~J
zpY~a8h4{73cr;{{%?|8dTrfpe6%V_s873U84f-^Ru+qtdczJnoHA)tq667thX7GIe
z@OzC)CF(lU?LE8gFX8YWd|);8C%1d(p@mGyTe<#yW;MgMqa8W@lN!gjm;L0+%I*&d
z6)SXL_O^@z6Gg&HUH^21_q@Ea8tV#A6)SaU2L9SPy#FIGHNi2fKN3Sxi-AqyEJokY
zAxnnCZr)5=44<>d5(obzVTvrn6_42zv(@dxdn~KV=O(D~5$rZTS4$DD5!!%*(Gx7g
z#T@X2=nsIJ;&x`!%ggx&?~4XHns^X9x|e3W8d2p(6H5xyqG7UJPtC=?x9mHQh8Ngs
z1f^gqQN8XJ4xPsMjfPZq8>6qA7zC_%fy2tluhm+282`&5_B?p@`%AEa>s7=K{I^9V
z>Om}D@FH*=h6jXdCsxIJdYDf3*oB#x9yR27-A_gY&p!V4d!Krgo~iZJ{ZtR$RG&A(
zo&#uxuTvi5YipASmdMPj4lXwK!uq0;r?g+JJS-m(VPybxYAFp<R=KiM<)YI5URtqx
zOBJ```Va+(bVj{x{<ufOIQ}FPvbXZm*=S9Hq0q=h6E2n|tmB4tP)iknHe_r7?}mi!
zNjnpOfJ65RwD^)Zrd7U|k`Nd>+q#KwcbM$Nc7|lx)S}f3pxh1!f^-7GzGB3KEw;-$
z*hj(KoJabx&xcp1X&D(ieh<z7KbJb;97}43XODfBOM~UnsBJwal#c|W2xsUB4$l#l
z@-I5&5U%b09$DEwK1f{VU$S@$Dz@u4$D^-t$94%mgD=o05QMZ$OykMV=TpEgw_JTh
zGj%4t!#Ev-r;X7}R9L%>zNx8K#fdsj?wFTb>!jHrY>out6uS~L@v~HXV+;6tRl9*^
zkx{MKl($lQ`YK}HI+bc=mfin-rTShHSLbT%S`M|Fz41bPH>p@;NghfGlxA}D_D-Cj
zMduz&KfId0(m@@KP9W;V>y`XIxNB8-ilnZ!e+YO_h*v9G3}3VCu`f|?oq02Q--H{j
zu=1y)%d=~Dj7SLo0#a0ONg0#sx2ew2L_g(vEOe5QQRsa_KJ}gvc%$j}qPdvNVILp&
z1x^(RGTF~sNE$R?nYZF6Pn;{bA&5AzYV)dSL*An~P1zDp^|M|-u2kNC<*<7t%^8q(
zdRt({>a3QUrl!liziO`cZr+78SYD}b(A1?-cFUdYbE)fDLn=!m%vnwzeo(Yp?O<KL
ztWo8one3GH-8Q6I6;5Nj-&eiH8RfGZy0no%^pgF!D4G3{hI{D#-4earmfrgNn&_=O
z^=sa)r93449j~o3>TC**N;{g7lQj5CGaq6Lc7a~D41k@4V{mX4zy||MiKi2&w=T?#
z2$+IdnwkJbefny^dpg`Rpv7N4c@yH}>))dn6;kj);dly~iYmV}y7Y=2l<nhUX80^b
z7uQxj^9ogN!f<o0TziB%EJRU&PBMcue&)_11?L*pgm<TyhoyFRc3z!%93r#63a{-Z
zB#480FuO?QT1?Of6QJ1zlMKqrpjC-@=`w(=ln?u%BQ)q&TeE7EjJ&{jk?n^!%*|iO
zgA#^pE<4pt1j<9dvx0ga`j&esdwE-=Ib{`Bt#ns1`O~1|{$ytd)dPV2WyoVkAhZ;G
zg;)gU=SeKMa}$5qT<o3&WNpm<NIfP7#1VDWR&l3%<kiW?yzW^p7HNmk8WVULJ9FCy
zHJ2iuX3ZrUGJ=SVwnI*3AUgqaKsE^^k!4xg{py6Bli$Bx_x&$D+kf8j{Wlr&|6LHG
bGmhzU%<$Z@vCf}>%TEweO;5E-#SZ%)_s%9~

diff --git a/openerp/addons/base/static/src/img/partner_image.png b/openerp/addons/base/static/src/img/partner_image.png
deleted file mode 100644
index 87fdbc5af55a640792e97a49e80b0e7e47dfcd8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2723
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

diff --git a/setup.py b/setup.py
index 77a59d52cf7..a26b74e255d 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ setuptools.setup(
           'docutils',
           'feedparser',
           'gdata',
-          'lxml',
+          'lxml < 3',
           'mako',
           'psycopg2',
           'pydot',

From a57ee611c4129f50797ef462e8dcb2b528f4669f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:31:33 +0200
Subject: [PATCH 107/118] fix merge crap

bzr revid: mit@openerp.com-20120831133133-5u2jvawyn6xkth91
---
 openerp/addons/base/res/res_partner.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f282466b989..e4d6d0341b0 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -229,7 +229,6 @@ class res_partner(osv.osv):
         if is_company:
             image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-<<<<<<< TREE
             from PIL import Image
             from StringIO import StringIO
             from random import random
@@ -242,20 +241,6 @@ class res_partner(osv.osv):
             avatar.save(buffer, 'PNG')
             image = buffer.getvalue()
         return tools.image_resize_image_big(image.encode('base64'))
-=======
-            from PIL import Image
-            from StringIO import StringIO
-            from random import random
-            color = (int(random() * 256), int(random() * 256), int(random() * 256))
-            face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()
-            avatar = Image.new('RGB', face.size)
-            avatar.paste(color)
-            avatar.paste(face, mask=face)
-            buffer = StringIO()
-            avatar.save(buffer, 'PNG')
-            image = buffer.getvalue()
-        return tools.image_resize_image_big(image.encode('base64'))
->>>>>>> MERGE-SOURCE
 
     _defaults = {
         'active': True,

From ad051ebf45cc28e94ad8a5aa0d1fa41b3571b7c1 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 31 Aug 2012 15:49:41 +0200
Subject: [PATCH 108/118] fix old avatar code

bzr revid: mit@openerp.com-20120831134941-w0xui7l1pj3ulv71
---
 openerp/addons/base/res/res_users.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index cddc02673b8..f802a7065bd 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -206,11 +206,6 @@ class res_users(osv.osv):
         ('login_key', 'UNIQUE (login)',  'You can not have two users with the same login !')
     ]
 
-    def _get_default_image(self, cr, uid, context=None):
-        """ Override of res.partner: multicolor avatars ! """
-        image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid

From 1eac0fbe525eea0cca7ba137878d31124b648535 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 15:51:36 +0200
Subject: [PATCH 109/118] [REF] Replace the user id 1 by openerp.SUPERUSER_ID

bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
---
 addons/account/account.py                     | 10 +++---
 addons/audittrail/audittrail.py               | 35 ++++++++++---------
 addons/auth_oauth/controllers/main.py         |  5 +--
 addons/auth_oauth/res_users.py                |  3 +-
 addons/auth_openid/controllers/main.py        |  9 ++---
 .../auth_reset_password.py                    |  7 ++--
 addons/auth_signup/controllers/main.py        |  3 +-
 addons/auth_signup/res_users.py               |  5 +--
 addons/decimal_precision/decimal_precision.py |  3 +-
 addons/document_webdav/nodes.py               |  4 ++-
 addons/document_webdav/test_davclient.py      |  3 +-
 addons/l10n_br/account.py                     |  5 +--
 addons/mail/mail_alias.py                     |  3 +-
 addons/mail/res_users.py                      |  2 +-
 addons/project/project.py                     |  3 +-
 addons/share/wizard/share_wizard.py           |  3 +-
 16 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9383913abbb..e11479e4dc0 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -30,6 +30,8 @@ from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
 from tools.float_utils import float_round
+from openerp import SUPERUSER_ID
+
 
 _logger = logging.getLogger(__name__)
 
@@ -819,7 +821,7 @@ class account_journal(osv.osv):
         if not 'sequence_id' in vals or not vals['sequence_id']:
             # if we have the right to create a journal, we should be able to
             # create it's sequence.
-            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+            vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
@@ -1858,7 +1860,7 @@ class account_tax(osv.osv):
 
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
 
@@ -3349,9 +3351,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-            ir_values_obj.set_default(cr, 1, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index aee9fbd9305..3dff7c1cb00 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,6 +25,7 @@ from tools.translate import _
 import pooler
 import time
 import tools
+from openerp import SUPERUSER_ID
 
 class audittrail_rule(osv.osv):
     """
@@ -252,10 +253,10 @@ class audittrail_objects_proxy(object_proxy):
         pool = pooler.get_pool(cr.dbname)
         resource_pool = pool.get(model)
         model_pool = pool.get('ir.model')
-        model_ids = model_pool.search(cr, 1, [('model', '=', model)])
+        model_ids = model_pool.search(cr, SUPERUSER_ID, [('model', '=', model)])
         model_id = model_ids and model_ids[0] or False
         assert model_id, _("'%s' Model does not exist..." %(model))
-        model = model_pool.browse(cr, 1, model_id)
+        model = model_pool.browse(cr, SUPERUSER_ID, model_id)
 
         # fields to log. currently only used by log on read()
         field_list = []
@@ -322,7 +323,7 @@ class audittrail_objects_proxy(object_proxy):
         data = {}
         resource_pool = pool.get(model.model)
         # read all the fields of the given resources in super admin mode
-        for resource in resource_pool.read(cr, 1, res_ids):
+        for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids):
             values = {}
             values_text = {}
             resource_id = resource['id']
@@ -332,19 +333,19 @@ class audittrail_objects_proxy(object_proxy):
                     continue
                 values[field] = resource[field]
                 # get the textual value of that field for this record
-                values_text[field] = self.get_value_text(cr, 1, pool, resource_pool, method, field, resource[field])
+                values_text[field] = self.get_value_text(cr, SUPERUSER_ID, pool, resource_pool, method, field, resource[field])
 
                 field_obj = resource_pool._all_columns.get(field).column
                 if field_obj._type in ('one2many','many2many'):
                     # check if an audittrail rule apply in super admin mode
-                    if self.check_rules(cr, 1, field_obj._obj, method):
+                    if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                         # check if the model associated to a *2m field exists, in super admin mode
-                        x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                        x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                         x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                        x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                        x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                         #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                        data.update(self.get_data(cr, SUPERUSER_ID, pool, resource[field], x2m_model, method))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
@@ -389,12 +390,12 @@ class audittrail_objects_proxy(object_proxy):
             field_obj = field_definition.column
             if field_obj._type in ('one2many','many2many'):
                 # checking if an audittrail rule apply in super admin mode
-                if self.check_rules(cr, 1, field_obj._obj, method):
+                if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                     # checking if the model associated to a *2m field exists, in super admin mode
-                    x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                    x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                     x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                     assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                    x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                    x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                     # the resource_ids that need to be checked are the sum of both old and previous values (because we
                     # need to log also creation or deletion in those lists).
                     x2m_old_values_ids = old_values.get(key, {'value': {}})['value'].get(field_name, [])
@@ -402,7 +403,7 @@ class audittrail_objects_proxy(object_proxy):
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
                     for res_id in res_ids:
-                        lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+                        lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
@@ -459,9 +460,9 @@ class audittrail_objects_proxy(object_proxy):
                     vals.update({'method': 'unlink'})
                 # create the audittrail log in super admin mode, only if a change has been detected
                 if lines[(model_id, resource_id)]:
-                    log_id = pool.get('audittrail.log').create(cr, 1, vals)
+                    log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals)
                     model = pool.get('ir.model').browse(cr, uid, model_id)
-                    self.create_log_line(cr, 1, log_id, model, lines[(model_id, resource_id)])
+                    self.create_log_line(cr, SUPERUSER_ID, log_id, model, lines[(model_id, resource_id)])
         return True
 
     def check_rules(self, cr, uid, model, method):
@@ -475,11 +476,11 @@ class audittrail_objects_proxy(object_proxy):
         """
         pool = pooler.get_pool(cr.dbname)
         if 'audittrail.rule' in pool.models:
-            model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', model)])
+            model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', model)])
             model_id = model_ids and model_ids[0] or False
             if model_id:
-                rule_ids = pool.get('audittrail.rule').search(cr, 1, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
-                for rule in pool.get('audittrail.rule').read(cr, 1, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
+                rule_ids = pool.get('audittrail.rule').search(cr, SUPERUSER_ID, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
+                for rule in pool.get('audittrail.rule').read(cr, SUPERUSER_ID, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
                     if len(rule['user_id']) == 0 or uid in rule['user_id']:
                         if rule.get('log_'+method,0):
                             return True
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 2959fa45db1..5d939f19db1 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -7,6 +7,7 @@ import werkzeug.utils
 import openerp.modules.registry
 import openerp.addons.web.controllers.main
 import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +19,7 @@ class OAuthController(openerpweb.Controller):
         registry = openerp.modules.registry.RegistryManager.get(dbname)
         with registry.cursor() as cr:
             providers = registry.get('auth.oauth.provider')
-            l = providers.read(cr, 1, providers.search(cr, 1, [('enabled','=',True)]))
+            l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled','=',True)]))
         return l
 
     @openerpweb.httprequest
@@ -30,7 +31,7 @@ class OAuthController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 u = registry.get('res.users')
-                credentials = u.auth_oauth(cr, 1, provider, kw)
+                credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw)
                 cr.commit()
                 return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 3dbab849942..b4f62612746 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -6,6 +6,7 @@ import simplejson
 
 import openerp
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -63,7 +64,7 @@ class res_users(osv.Model):
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
-            res = self.search(cr, 1, [('id','=',uid),('oauth_access_token','=',password)])
+            res = self.search(cr, SUPERUSER_ID, [('id','=',uid),('oauth_access_token','=',password)])
             if not res:
                 raise
 
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index eba711dae7a..ebcaab4bf25 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -23,6 +23,7 @@ import logging
 import os
 import tempfile
 import urllib
+from openerp import SUPERUSER_ID
 
 import werkzeug.urls
 import werkzeug.exceptions
@@ -176,7 +177,7 @@ class OpenIDController(openerpweb.Controller):
             with registry.cursor() as cr:
                 Modules = registry.get('ir.module.module')
 
-                installed = Modules.search_count(cr, 1, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
+                installed = Modules.search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
                 if installed:
 
                     Users = registry.get('res.users')
@@ -196,13 +197,13 @@ class OpenIDController(openerpweb.Controller):
 
                     domain += [('openid_url', '=', openid_url), ('active', '=', True)]
 
-                    ids = Users.search(cr, 1, domain)
+                    ids = Users.search(cr, SUPERUSER_ID, domain)
                     assert len(ids) < 2
                     if ids:
                         user_id = ids[0]
-                        login = Users.browse(cr, 1, user_id).login
+                        login = Users.browse(cr, SUPERUSER_ID, user_id).login
                         key = randomString(utils.KEY_LENGTH, '0123456789abcdef')
-                        Users.write(cr, 1, [user_id], {'openid_key': key})
+                        Users.write(cr, SUPERUSER_ID, [user_id], {'openid_key': key})
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
diff --git a/addons/auth_reset_password/auth_reset_password.py b/addons/auth_reset_password/auth_reset_password.py
index 3d1bcbbfa7b..ff208c89b9c 100644
--- a/addons/auth_reset_password/auth_reset_password.py
+++ b/addons/auth_reset_password/auth_reset_password.py
@@ -6,6 +6,7 @@ import urlparse
 
 from openerp.tools import config
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 TWENTY_FOUR_HOURS = 24 * 60 * 60
 
@@ -76,9 +77,9 @@ class res_users(osv.osv):
         MailMessage.send(cr, uid, [msg_id], context=context)
 
     def send_reset_password_request(self, cr, uid, email, context=None):
-        ids = self.pool.get('res.users').search(cr, 1, [('user_email', '=', email)], context=context)
+        ids = self.pool.get('res.users').search(cr, SUPERUSER_ID, [('user_email', '=', email)], context=context)
         if ids:
-            self._auth_reset_password_send_email(cr, 1, email, 'reset_password_email', ids[0], context=context)
+            self._auth_reset_password_send_email(cr, SUPERUSER_ID, email, 'reset_password_email', ids[0], context=context)
             return True
         #else:
         #    _m, company_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'main_company')
@@ -109,7 +110,7 @@ class auth_reset_password(osv.TransientModel):
         Users = self.pool.get('res.users')
         data = Users._auth_reset_password_check_token(cr, uid, values.get('token', ''))
         if data:
-            Users.write(cr, 1, data['uid'], {'password': pw}, context=context)
+            Users.write(cr, SUPERUSER_ID, data['uid'], {'password': pw}, context=context)
         else:
             raise osv.except_osv('Error', 'Invalid token')
 
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 0ed2151d12b..821ef44f459 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -5,6 +5,7 @@ import werkzeug.urls
 from openerp.modules.registry import RegistryManager
 from openerp.addons.web.controllers.main import login_and_redirect
 import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +19,7 @@ class OpenIDController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 Users = registry.get('res.users')
-                credentials = Users.auth_signup(cr, 1, name, login, password)
+                credentials = Users.auth_signup(cr, SUPERUSER_ID, name, login, password)
                 cr.commit()
                 return login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 1d77a3f9473..5f6463508b6 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -1,5 +1,6 @@
 import openerp
 from openerp.osv import osv
+from openerp import SUPERUSER_ID
 
 class res_users(osv.Model):
     _inherit = 'res.users'
@@ -15,9 +16,9 @@ class res_users(osv.Model):
         #
         user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'auth.signup_template_user_id', 0)
         if user_template_id:
-            self.pool.get('res.users').copy(cr, 1, user_template_id, new_user, context=context)
+            self.pool.get('res.users').copy(cr, SUPERUSER_ID, user_template_id, new_user, context=context)
         else:
-            self.pool.get('res.users').create(cr, 1, new_user, context=context)
+            self.pool.get('res.users').create(cr, SUPERUSER_ID, new_user, context=context)
 
     def auth_signup(self, cr, uid, name, login, password, context=None):
         r = (cr.dbname, login, password)
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d9f6aa7b8db..93d69eb3093 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 import tools
 import pooler
+from openerp import SUPERUSER_ID
 
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
@@ -56,7 +57,7 @@ decimal_precision()
 
 def get_precision(application):
     def change_digit(cr):
-        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, application)
+        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, application)
         return (16, res)
     return change_digit
 
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index d6ceca458cd..a8fedee4fe3 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -25,6 +25,8 @@ from tools.safe_eval import safe_eval as eval
 import time
 import urllib
 import uuid
+from openerp import SUPERUSER_ID
+
 try:
     from tools.dict_tools import dict_filter
 except ImportError:
@@ -233,7 +235,7 @@ class node_acl_mixin(object):
         
         if props_to_delete:
             # explicitly delete, as admin, any of the ids we have identified.
-            propobj.unlink(cr, 1, props_to_delete)
+            propobj.unlink(cr, SUPERUSER_ID, props_to_delete)
         
         if lock_data.get('unlock_mode', False):
             return lock_found and True
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index f1f2e58c835..0f66363c553 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -42,6 +42,7 @@ from tools import config
 from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -361,7 +362,7 @@ class DAVClient(object):
         to break if "base_crypt" is used.
         """
         ruob = obj.pool.get('res.users')
-        res = ruob.read(cr, 1, [uid,], ['login', 'password'])
+        res = ruob.read(cr, SUPERUSER_ID, [uid,], ['login', 'password'])
         assert res, "uid %s not found" % uid
         self.user = res[0]['login']
         self.passwd = res[0]['password']
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
index 6e38aaa690f..64d3c2cda79 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@ -29,6 +29,7 @@ import decimal_precision as dp
 from tools.misc import currency
 from tools.translate import _
 from tools import config
+from openerp import SUPERUSER_ID
 
 class account_tax_code_template(osv.osv):
 
@@ -53,7 +54,7 @@ class account_tax_template(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
@@ -91,7 +92,7 @@ class account_tax(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 5bcce0b8927..27eb29051b9 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -92,9 +92,8 @@ class mail_alias(osv.Model):
     _defaults = {
         'alias_defaults': '{}',
         'alias_user_id': lambda self,cr,uid,context: uid,
-        
         # looks better when creating new aliases - even if the field is informative only
-        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr,1,[1],None,None)[1]
+        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr, SUPERUSER_ID,[1],None,None)[1]
     }
 
     _sql_constraints = [
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index d9c77cb83f4..63280bbaf6c 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -88,7 +88,7 @@ class res_users(osv.Model):
         subject = '''%s has joined %s.''' % (user.name, company_name)
         body = '''Welcome to OpenERP !''' 
         # TODO change 1 into user.id but catch errors
-        return self.pool.get('res.partner').message_append_note(cr, 1, [user.partner_id.id],
+        return self.pool.get('res.partner').message_append_note(cr, SUPERUSER_ID, [user.partner_id.id],
             subject=subject, body=body, type='comment', content_subtype='html', context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/project/project.py b/addons/project/project.py
index 904e19671cb..f16cb905807 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,6 +26,7 @@ from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
 import time
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 _TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
 
@@ -877,7 +878,7 @@ class task(base_stage, osv.osv):
         if context is None: context = {}
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
-        obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
+        obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 598bb085967..204ca1e92e1 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -23,6 +23,7 @@ import random
 import time
 from urllib import quote_plus
 import uuid
+from openerp import SUPERUSER_ID
 
 import simplejson
 
@@ -545,7 +546,7 @@ class share_wizard(osv.TransientModel):
                             _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], {
+                            rule_obj.write(cr, SUPERUSER_ID, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
                             _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)

From b3988436cb09b41a9d303602f36a88f9f8ed4df4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 15:53:09 +0200
Subject: [PATCH 110/118] [REF] Replace the user id 1 by openerp.SUPERUSER_ID

bzr revid: stw@openerp.com-20120831135309-o4plzf5wp0kyuzgf
---
 openerp/addons/base/ir/ir_actions.py          |  3 +-
 openerp/addons/base/ir/ir_config_parameter.py |  5 ++-
 openerp/addons/base/ir/ir_rule.py             |  4 +-
 openerp/addons/base/ir/ir_ui_menu.py          |  3 +-
 openerp/addons/base/res/res_company.py        |  3 +-
 openerp/addons/base/res/res_users.py          | 19 ++++-----
 openerp/modules/loading.py                    |  3 +-
 openerp/osv/fields.py                         | 11 +++---
 openerp/osv/orm.py                            |  3 +-
 openerp/service/web_services.py               |  5 ++-
 openerp/tools/translate.py                    |  5 ++-
 openerp/tools/yaml_import.py                  | 39 ++++++++++---------
 12 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index a5d04d7f1bc..019ef62a6bd 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -35,6 +35,7 @@ from tools.config import config
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 from socket import gethostname
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -271,7 +272,7 @@ class act_window(osv.osv):
         :return: A read() view of the ir.actions.act_window
         """
         dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id (cr, 1, module, xml_id)
+        data_id = dataobj._get_id (cr, SUPERUSER_ID, module, xml_id)
         res_id = dataobj.browse(cr, uid, data_id, context).res_id
         return self.read(cr, uid, res_id, [], context)
 
diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py
index f21c2db8d0a..120fcfca554 100644
--- a/openerp/addons/base/ir/ir_config_parameter.py
+++ b/openerp/addons/base/ir/ir_config_parameter.py
@@ -26,6 +26,7 @@ from osv import osv,fields
 import uuid
 import datetime
 from tools import misc, config
+from openerp import SUPERUSER_ID
 
 """
 A dictionary holding some configuration parameters to be initialized when the database is created.
@@ -55,9 +56,9 @@ class ir_config_parameter(osv.osv):
         Initializes the parameters listed in _default_parameters.
         """
         for key, func in _default_parameters.iteritems():
-            ids = self.search(cr, 1, [('key','=',key)])
+            ids = self.search(cr, SUPERUSER_ID, [('key','=',key)])
             if not ids:
-                self.set_param(cr, 1, key, func())
+                self.set_param(cr, SUPERUSER_ID, key, func())
 
     def get_param(self, cr, uid, key, default=False, context=None):
         """Retrieve the value for a given key.
diff --git a/openerp/addons/base/ir/ir_rule.py b/openerp/addons/base/ir/ir_rule.py
index 2b864a7f8c6..75882051e6b 100644
--- a/openerp/addons/base/ir/ir_rule.py
+++ b/openerp/addons/base/ir/ir_rule.py
@@ -44,7 +44,7 @@ class ir_rule(osv.osv):
     def _eval_context(self, cr, uid):
         """Returns a dictionary to use as evaluation context for
            ir.rule domains."""
-        return {'user': self.pool.get('res.users').browse(cr, 1, uid),
+        return {'user': self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid),
                 'time':time}
 
     def _domain_force_get(self, cr, uid, ids, field_name, arg, context=None):
@@ -152,7 +152,7 @@ class ir_rule(osv.osv):
             # involve objects on which the real uid has no acces rights.
             # This means also there is no implicit restriction (e.g. an object
             # references another object the user can't see).
-            query = self.pool.get(model_name)._where_calc(cr, 1, dom, active_test=False)
+            query = self.pool.get(model_name)._where_calc(cr, SUPERUSER_ID, dom, active_test=False)
             return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']
 
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 77c0c4d738a..add4a39a182 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -28,6 +28,7 @@ import tools
 import openerp.modules
 from osv import fields, osv
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 def one_in(setA, setB):
     """Check the presence of an element of setA in setB
@@ -59,7 +60,7 @@ class ir_ui_menu(osv.osv):
         """
         with self.cache_lock:
             modelaccess = self.pool.get('ir.model.access')
-            user_groups = set(self.pool.get('res.users').read(cr, 1, uid, ['groups_id'])['groups_id'])
+            user_groups = set(self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['groups_id'])['groups_id'])
             result = []
             for menu in self.browse(cr, uid, ids, context=context):
                 # this key works because user access rights are all based on user's groups (cfr ir_model_access.check)
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index c1062f2af2c..f6f0d1808e4 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -24,6 +24,7 @@ from osv import fields
 import os
 import tools
 import openerp
+from openerp import SUPERUSER_ID
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 
@@ -156,7 +157,7 @@ class res_company(osv.osv):
             # select only the currently visible companies (according to rules,
             # which are probably to allow to see the child companies) even if
             # she belongs to some other companies.
-            user = self.pool.get('res.users').browse(cr, 1, uid, context=context)
+            user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
             cmp_ids = list(set([user.company_id.id] + [cmp.id for cmp in user.company_ids]))
             return cmp_ids
         return super(res_company, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index f802a7065bd..6394a703811 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -26,6 +26,7 @@ import logging
 from lxml import etree
 from lxml.builder import E
 import netsvc
+from openerp import SUPERUSER_ID
 import openerp
 import openerp.exceptions
 from osv import fields,osv
@@ -233,9 +234,9 @@ class res_users(osv.osv):
         dataobj = self.pool.get('ir.model.data')
         result = []
         try:
-            dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_user')
+            dummy,group_id = dataobj.get_object_reference(cr, SUPERUSER_ID, 'base', 'group_user')
             result.append(group_id)
-            dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_partner_manager')
+            dummy,group_id = dataobj.get_object_reference(cr, SUPERUSER_ID, 'base', 'group_partner_manager')
             result.append(group_id)
         except ValueError:
             # If these groups does not exists anymore
@@ -275,7 +276,7 @@ class res_users(osv.osv):
                     break
             else:
                 if 'company_id' in values:
-                    if not (values['company_id'] in self.read(cr, 1, uid, ['company_ids'], context=context)['company_ids']):
+                    if not (values['company_id'] in self.read(cr, SUPERUSER_ID, uid, ['company_ids'], context=context)['company_ids']):
                         del values['company_id']
                 uid = 1 # safe fields only, so we write as super-user to bypass access rights
 
@@ -327,7 +328,7 @@ class res_users(osv.osv):
         return super(res_users, self).copy(cr, uid, id, copydef, context)
 
     def context_get(self, cr, uid, context=None):
-        user = self.browse(cr, 1, uid, context)
+        user = self.browse(cr, SUPERUSER_ID, uid, context)
         result = {}
         for k in self._all_columns.keys():
             if k.startswith('context_'):
@@ -345,7 +346,7 @@ class res_users(osv.osv):
 
     def action_get(self, cr, uid, context=None):
         dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
+        data_id = dataobj._get_id(cr, SUPERUSER_ID, 'base', 'action_res_users_my')
         return dataobj.browse(cr, uid, data_id, context=context).res_id
 
     def check_super(self, passwd):
@@ -356,7 +357,7 @@ class res_users(osv.osv):
 
     def check_credentials(self, cr, uid, password):
         """ Override this method to plug additional authentication methods"""
-        res = self.search(cr, 1, [('id','=',uid),('password','=',password)])
+        res = self.search(cr, SUPERUSER_ID, [('id','=',uid),('password','=',password)])
         if not res:
             raise openerp.exceptions.AccessDenied()
 
@@ -372,7 +373,7 @@ class res_users(osv.osv):
             # of them rolled back due to a concurrent access.)
             cr.autocommit(True)
             # check if user exists
-            res = self.search(cr, 1, [('login','=',login)])
+            res = self.search(cr, SUPERUSER_ID, [('login','=',login)])
             if res:
                 user_id = res[0]
                 # check credentials
@@ -537,7 +538,7 @@ class groups_implied(osv.osv):
             return memo[g]
 
         res = {}
-        for g in self.browse(cr, 1, ids, context):
+        for g in self.browse(cr, SUPERUSER_ID, ids, context):
             res[g.id] = map(int, computed_set(g))
         return res
 
@@ -682,7 +683,7 @@ class groups_view(osv.osv):
 
     def get_user_groups_view(self, cr, uid, context=None):
         try:
-            view = self.pool.get('ir.model.data').get_object(cr, 1, 'base', 'user_groups_view', context)
+            view = self.pool.get('ir.model.data').get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context)
             assert view and view._table_name == 'ir.ui.view'
         except Exception:
             view = False
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 8a2c43e6ed2..86e69fa64ba 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -39,6 +39,7 @@ import openerp.pooler as pooler
 import openerp.release as release
 import openerp.tools as tools
 import openerp.tools.assertion_report as assertion_report
+from openerp import SUPERUSER_ID
 
 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
@@ -296,7 +297,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
             modobj = pool.get('ir.module.module')
             if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 _logger.info('updating modules list')
-                modobj.update_list(cr, 1)
+                modobj.update_list(cr, SUPERUSER_ID)
 
             _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))
 
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 5a47601f8a5..b6b43f3f4c9 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -46,6 +46,7 @@ from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
 import simplejson
 from openerp.tools.html_sanitize import html_sanitize
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -444,7 +445,7 @@ class many2one(_column):
         # build a dictionary of the form {'id_of_distant_resource': name_of_distant_resource}
         # we use uid=1 because the visibility of a many2one field value (just id and name)
         # must be the access right of the parent form and not the linked object itself.
-        records = dict(obj.name_get(cr, 1,
+        records = dict(obj.name_get(cr, SUPERUSER_ID,
                                     list(set([x for x in res.values() if isinstance(x, (int,long))])),
                                     context=context))
         for id in res:
@@ -1200,7 +1201,7 @@ class related(function):
         else:
             res = {}.fromkeys(ids, False)
 
-        objlst = obj.browse(cr, 1, ids, context=context)
+        objlst = obj.browse(cr, SUPERUSER_ID, ids, context=context)
         for data in objlst:
             if not data:
                 continue
@@ -1230,7 +1231,7 @@ class related(function):
                 # name_get as root, as seeing the name of a related
                 # object depends on access right of source document,
                 # not target, so user may not have access.
-                ng = dict(obj.pool.get(self._obj).name_get(cr, 1, ids, context=context))
+                ng = dict(obj.pool.get(self._obj).name_get(cr, SUPERUSER_ID, ids, context=context))
                 for r in res:
                     if res[r]:
                         res[r] = (res[r], ng[res[r]])
@@ -1495,7 +1496,7 @@ class property(function):
                 # not target, so user may not have access) in order to avoid
                 # pointing on an unexisting record.
                 if property_destination_obj:
-                    if res[id][prop_name] and obj.pool.get(property_destination_obj).exists(cr, 1, res[id][prop_name].id):
+                    if res[id][prop_name] and obj.pool.get(property_destination_obj).exists(cr, SUPERUSER_ID, res[id][prop_name].id):
                         name_get_ids[id] = res[id][prop_name].id
                     else:
                         res[id][prop_name] = False
@@ -1503,7 +1504,7 @@ class property(function):
                 # name_get as root (as seeing the name of a related
                 # object depends on access right of source document,
                 # not target, so user may not have access.)
-                name_get_values = dict(obj.pool.get(property_destination_obj).name_get(cr, 1, name_get_ids.values(), context=context))
+                name_get_values = dict(obj.pool.get(property_destination_obj).name_get(cr, SUPERUSER_ID, name_get_ids.values(), context=context))
                 # the property field is a m2o, we need to return a tuple with (id, name)
                 for k, v in name_get_ids.iteritems():
                     if res[k][prop_name]:
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7c8085ea8ed..a9be954b5ac 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -63,6 +63,7 @@ from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 from query import Query
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 _schema = logging.getLogger(__name__ + '.schema')
@@ -773,7 +774,7 @@ class BaseModel(object):
             }
             if getattr(f, 'serialization_field', None):
                 # resolve link to serialization_field if specified by name
-                serialization_field_id = ir_model_fields_obj.search(cr, 1, [('model','=',vals['model']), ('name', '=', f.serialization_field)])
+                serialization_field_id = ir_model_fields_obj.search(cr, SUPERUSER_ID, [('model','=',vals['model']), ('name', '=', f.serialization_field)])
                 if not serialization_field_id:
                     raise except_orm(_('Error'), _("Serialization field `%s` not found for sparse field `%s`!") % (f.serialization_field, k))
                 vals['serialization_field_id'] = serialization_field_id[0]
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 7c08003bf7a..d8a7c663dbe 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -40,6 +40,7 @@ import openerp.tools as tools
 import openerp.modules
 import openerp.exceptions
 from openerp.service import http_server
+from openerp import SUPERUSER_ID
 
 #.apidoc title: Exported Service methods
 #.apidoc module-mods: member-order: bysource
@@ -72,8 +73,8 @@ def _initialize_db(serv, id, db_name, demo, lang, user_password):
 
         if lang:
             modobj = pool.get('ir.module.module')
-            mids = modobj.search(cr, 1, [('state', '=', 'installed')])
-            modobj.update_translations(cr, 1, mids, lang)
+            mids = modobj.search(cr, SUPERUSER_ID, [('state', '=', 'installed')])
+            modobj.update_translations(cr, SUPERUSER_ID, mids, lang)
 
         cr.execute('UPDATE res_users SET password=%s, lang=%s, active=True WHERE login=%s', (
             user_password, lang, 'admin'))
diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index eb5dbe24077..5239b37bd2d 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -43,6 +43,7 @@ import misc
 from misc import UpdateableStr
 from misc import SKIPPED_ELEMENT_TYPES
 import osutil
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -214,7 +215,7 @@ class GettextAlias(object):
                 if cr:
                     # Try to use ir.translation to benefit from global cache if possible
                     pool = pooler.get_pool(cr.dbname)
-                    res = pool.get('ir.translation')._get_source(cr, 1, None, ('code','sql_constraint'), lang, source)
+                    res = pool.get('ir.translation')._get_source(cr, SUPERUSER_ID, None, ('code','sql_constraint'), lang, source)
                 else:
                     _logger.debug('no context cursor detected, skipping translation for "%r"', source)
             else:
@@ -872,7 +873,7 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True,
 
         if not ids:
             # lets create the language with locale information
-            lang_obj.load_lang(cr, 1, lang=lang, lang_name=lang_name)
+            lang_obj.load_lang(cr, SUPERUSER_ID, lang=lang, lang_name=lang_name)
 
 
         # now, the serious things: we read the language file
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 57af9e45e89..6171b2ebd21 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -13,6 +13,7 @@ import yaml_tag
 import yaml
 import re
 from lxml import etree
+from openerp import SUPERUSER_ID
 
 # YAML import needs both safe and unsafe eval, but let's
 # default to /safe/.
@@ -286,20 +287,20 @@ class YamlInterpreter(object):
 
         view_id = record.view
         if view_id and (view_id is not True):
-            view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, 1, self.module, record.view)[1]
+            view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, SUPERUSER_ID, self.module, record.view)[1]
 
         if model.is_transient():
             record_dict=self.create_osv_memory_record(record, fields)
         else:
             self.validate_xml_id(record.id)
             try:
-                self.pool.get('ir.model.data')._get_id(self.cr, 1, self.module, record.id)
+                self.pool.get('ir.model.data')._get_id(self.cr, SUPERUSER_ID, self.module, record.id)
                 default = False
             except ValueError:
                 default = True
 
             if self.isnoupdate(record) and self.mode != 'init':
-                id = self.pool.get('ir.model.data')._update_dummy(self.cr, 1, record.model, self.module, record.id)
+                id = self.pool.get('ir.model.data')._update_dummy(self.cr, SUPERUSER_ID, record.model, self.module, record.id)
                 # check if the resource already existed at the last update
                 if id:
                     self.id_map[record] = int(id)
@@ -315,12 +316,12 @@ class YamlInterpreter(object):
             if view_id:
                 varg = view_id
                 if view_id is True: varg = False
-                view = model.fields_view_get(self.cr, 1, varg, 'form', context)
+                view = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
                 view_id = etree.fromstring(view['arch'].encode('utf-8'))
 
             record_dict = self._create_record(model, fields, view_id, default=default)
             _logger.debug("RECORD_DICT %s" % record_dict)
-            id = self.pool.get('ir.model.data')._update(self.cr, 1, record.model, \
+            id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
             self.id_map[record.id] = int(id)
             if config.get('import_partial'):
@@ -328,8 +329,8 @@ class YamlInterpreter(object):
 
     def _create_record(self, model, fields, view=False, parent={}, default=True):
         if view is not False:
-            defaults = default and model._add_missing_default_values(self.cr, 1, {}, context=self.context) or {}
-            fg = model.fields_get(self.cr, 1, context=self.context)
+            defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
+            fg = model.fields_get(self.cr, SUPERUSER_ID, context=self.context)
         else:
             defaults = {}
             fg = {}
@@ -360,7 +361,7 @@ class YamlInterpreter(object):
                     if (view is not False) and (fg[field_name]['type']=='one2many'):
                         view2 = view.find("field[@name='%s']/form"%(field_name,))
                         if not view2:
-                            view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, 1, False, 'form', self.context)
+                            view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
                             view2 = etree.fromstring(view2['arch'].encode('utf-8'))
 
                     field_value = self._eval_field(model, field_name, fields[field_name], view2, parent=record_dict, default=default)
@@ -395,7 +396,7 @@ class YamlInterpreter(object):
 
                 # Evaluation args
                 args = map(lambda x: eval(x, ctx), match.group(2).split(','))
-                result = getattr(model, match.group(1))(self.cr, 1, [], *args)
+                result = getattr(model, match.group(1))(self.cr, SUPERUSER_ID, [], *args)
                 for key, val in (result or {}).get('value', {}).items():
                     if key not in fields:
                         assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist on the object '%s'" % (key, match.group(1), model._name)
@@ -491,7 +492,7 @@ class YamlInterpreter(object):
         python, statements = node.items()[0]
         model = self.get_model(python.model)
         statements = statements.replace("\r\n", "\n")
-        code_context = {'model': model, 'cr': self.cr, 'uid': self.uid, 'log': self._log, 'context': self.context}
+        code_context = { 'model': model, 'cr': self.cr, 'uid': self.uid, 'log': self._log, 'context': self.context }
         code_context.update({'self': model}) # remove me when no !python block test uses 'self' anymore
         try:
             code_obj = compile(statements, self.filename, 'exec')
@@ -655,7 +656,7 @@ class YamlInterpreter(object):
 
         self._set_group_values(node, values)
 
-        pid = self.pool.get('ir.model.data')._update(self.cr, 1, \
+        pid = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
                 'ir.ui.menu', self.module, values, node.id, mode=self.mode, \
                 noupdate=self.isnoupdate(node), res_id=res and res[0] or False)
 
@@ -666,7 +667,7 @@ class YamlInterpreter(object):
             action_type = node.type or 'act_window'
             action_id = self.get_id(node.action)
             action = "ir.actions.%s,%d" % (action_type, action_id)
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', \
                     'tree_but_open', 'Menuitem', [('ir.ui.menu', int(parent_id))], action, True, True, xml_id=node.id)
 
     def process_act_window(self, node):
@@ -700,7 +701,7 @@ class YamlInterpreter(object):
 
         if node.target:
             values['target'] = node.target
-        id = self.pool.get('ir.model.data')._update(self.cr, 1, \
+        id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
                 'ir.actions.act_window', self.module, values, node.id, mode=self.mode)
         self.id_map[node.id] = int(id)
 
@@ -708,7 +709,7 @@ class YamlInterpreter(object):
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', keyword, \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', keyword, \
                     node.id, [node.src_model], value, replace=replace, noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
         # TODO add remove ir.model.data
 
@@ -729,7 +730,7 @@ class YamlInterpreter(object):
 
         res = {'name': node.name, 'url': node.url, 'target': node.target}
 
-        id = self.pool.get('ir.model.data')._update(self.cr, 1, \
+        id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, \
                 "ir.actions.url", self.module, res, node.id, mode=self.mode)
         self.id_map[node.id] = int(id)
         # ir_set
@@ -737,7 +738,7 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_action_multi'
             value = 'ir.actions.url,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', \
                     keyword, node.url, ["ir.actions.url"], value, replace=replace, \
                     noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
 
@@ -752,7 +753,7 @@ class YamlInterpreter(object):
             else:
                 value = expression
             res[fieldname] = value
-        self.pool.get('ir.model.data').ir_set(self.cr, 1, res['key'], res['key2'], \
+        self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, res['key'], res['key2'], \
                 res['name'], res['models'], res['value'], replace=res.get('replace',True), \
                 isobject=res.get('isobject', False), meta=res.get('meta',None))
 
@@ -781,7 +782,7 @@ class YamlInterpreter(object):
 
         self._set_group_values(node, values)
 
-        id = self.pool.get('ir.model.data')._update(self.cr, 1, "ir.actions.report.xml", \
+        id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, "ir.actions.report.xml", \
                 self.module, values, xml_id, noupdate=self.isnoupdate(node), mode=self.mode)
         self.id_map[xml_id] = int(id)
 
@@ -789,7 +790,7 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_print_multi'
             value = 'ir.actions.report.xml,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
+            self.pool.get('ir.model.data').ir_set(self.cr, SUPERUSER_ID, 'action', \
                     keyword, values['name'], [values['model']], value, replace=replace, isobject=True, xml_id=xml_id)
 
     def process_none(self):

From 31025afe28c289daa5a0c58096c75da316182800 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 31 Aug 2012 16:14:15 +0200
Subject: [PATCH 111/118] [FIX] base: Remove the default value for the image

bzr revid: stw@openerp.com-20120831141415-gqsvhh08fum874gn
---
 openerp/addons/base/res/res_users.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 0769a0c4166..ca45f03258c 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -251,7 +251,6 @@ class res_users(osv.osv):
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
-        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, context),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

From 77e92aeaad00b5ac2500cc9267f9a208577ac14e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 1 Sep 2012 02:37:12 +0200
Subject: [PATCH 112/118] [FIX] FieldTextHtml: allow using widget=html on
 regular char/text fields

This is required when we want to easily preview arbitrary
HTML content, such as the body of the email templates
used in marketing_campaign modules

bzr revid: odo@openerp.com-20120901003712-m1h9s5tlbn2kyvnn
---
 addons/web/static/src/js/view_form.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 893056419ca..24584413fee 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2385,13 +2385,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
  */
 instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldTextHtml',
-    init: function() {
-        this._super.apply(this, arguments);
-        if (this.field.type !== 'html') {
-            throw new Error(_.str.sprintf(
-                _t("Error with field %s, it is not allowed to use the widget 'html' with any other field type than 'html'"), this.string));
-        }
-    },
     initialize_content: function() {
         var self = this;
         if (! this.get("effective_readonly")) {

From 703ba01954bef5a8a7618e6d38d8e1b1630e0541 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Sat, 1 Sep 2012 16:17:19 +0200
Subject: [PATCH 113/118] [ADD] Add a script to install all the modules in a
 trunk database with the tests

bzr revid: stw@openerp.com-20120901141719-zsc2ow2u93kovri7
---
 scripts/run_all_with_tests.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 scripts/run_all_with_tests.sh

diff --git a/scripts/run_all_with_tests.sh b/scripts/run_all_with_tests.sh
new file mode 100755
index 00000000000..4103b6243e2
--- /dev/null
+++ b/scripts/run_all_with_tests.sh
@@ -0,0 +1,17 @@
+DATABASE=trunk
+dropdb ${DATABASE}
+REPOSITORIES=../../addons/trunk
+MODULES=`python -c "import os; print ','.join(os.listdir('${REPOSITORIES}'))"`
+createdb ${DATABASE}
+rm openerp-server.log
+./openerp-server \
+    --log-level=debug \
+    --addons=${REPOSITORIES},../../web/trunk/addons \
+    -d ${DATABASE} \
+    -i ${MODULES} \
+    --stop-after-init \
+    --no-xmlrpc \
+    --no-xmlrpcs \
+    --no-netrpc \
+    --test-enable \
+    --logfile=openerp-server.log 

From 972306d0157ca92b57462f3e3735767e5a3618fa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 14:58:05 +0200
Subject: [PATCH 114/118] [IMP] CSS

bzr revid: fp@openerp.com-20120902125805-jeivl4whuzzubv7l
---
 addons/web/static/src/css/base.css  | 5 +++--
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 06a37a54727..5ce814ef011 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -85,7 +85,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -503,6 +503,7 @@
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
   border: none;
+  margin-bottom: 10px;
 }
 .openerp .oe_avatar + div {
   margin-left: 5px;
@@ -2157,7 +2158,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 160px;
+  min-width: 140px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c238ef6ee07..f16e369f531 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -422,6 +422,7 @@ $sheet-max-width: 860px
             @include radius(3px)
             @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
             border: none
+            margin-bottom: 10px
     .oe_avatar + div
         margin-left: 5px
     .oe_image_small > img
@@ -1650,7 +1651,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 160px
+                min-width: 140px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group

From d7a2ea78dc50f17813e2d20712c146a427dece0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 15:30:23 +0200
Subject: [PATCH 115/118] [IMP] CSS

bzr revid: fp@openerp.com-20120902133023-dgdicbx0xnlht2l5
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 4 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5ce814ef011..dd168653f03 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -576,6 +576,9 @@
   background: #7c7bad;
   color: #eeeeee;
 }
+.openerp .oe_tags {
+  margin-bottom: 1px;
+}
 .openerp .oe_tags.oe_inline {
   min-width: 250px;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f16e369f531..537988e9c4a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -476,6 +476,7 @@ $sheet-max-width: 860px
         .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
             font-style: italic
             text-decoration: none
+        margin-bottom: 1px
     // }}}
     // Tooltips {{{
     &.oe_tooltip

From 1699e4dc97f4472dee01852dcd131f60d1817771 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 2 Sep 2012 19:05:56 +0200
Subject: [PATCH 116/118] [IMP] determine openerp_addons_namespace dynamically

bzr revid: al@openerp.com-20120902170556-vkt2a936am4vrmmc
---
 addons/web/common/http.py | 8 ++++----
 openerp-web               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 9c3664c8da0..6dc99f2c997 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -461,7 +461,7 @@ class Root(object):
                       only used in case the list of databases is requested
                       by the server, will be filtered by this pattern
     """
-    def __init__(self, options, openerp_addons_namespace=True):
+    def __init__(self, options):
         self.config = options
 
         if not hasattr(self.config, 'connector'):
@@ -474,7 +474,7 @@ class Root(object):
         self.httpsession_cookie = 'httpsessionid'
         self.addons = {}
 
-        static_dirs = self._load_addons(openerp_addons_namespace)
+        static_dirs = self._load_addons()
         if options.serve_static:
             app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
             self.dispatch = DisableCacheMiddleware(app)
@@ -520,7 +520,7 @@ class Root(object):
 
         return response(environ, start_response)
 
-    def _load_addons(self, openerp_addons_namespace=True):
+    def _load_addons(self):
         """
         Loads all addons at the specified addons path, returns a mapping of
         static URLs to the corresponding directories
@@ -535,7 +535,7 @@ class Root(object):
                         manifest = ast.literal_eval(open(manifest_path).read())
                         manifest['addons_path'] = addons_path
                         _logger.debug("Loading %s", module)
-                        if openerp_addons_namespace:
+                        if 'openerp.addons' in sys.modules:
                             m = __import__('openerp.addons.' + module)
                         else:
                             m = __import__(module)
diff --git a/openerp-web b/openerp-web
index 3340b95646e..7e536a99442 100755
--- a/openerp-web
+++ b/openerp-web
@@ -105,7 +105,7 @@ if __name__ == "__main__":
     else:
         logging.basicConfig(level=getattr(logging, options.log_level.upper()))
 
-    app = web.common.http.Root(options, openerp_addons_namespace=False)
+    app = web.common.http.Root(options)
 
     if options.proxy_mode:
         app = werkzeug.contrib.fixers.ProxyFix(app)

From 310aab1a572b05f2c82808da77e7e873af7143ac Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 2 Sep 2012 21:17:26 +0200
Subject: [PATCH 117/118] [IMP] usability partner logo as avatar class

bzr revid: fp@openerp.com-20120902191726-7zacp4mctooxao51
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 7e70e68c35c..a369be28dc9 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -95,7 +95,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="image" widget='image' class="oe_left" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
+                    <field name="image" widget='image' class="oe_left oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name"/> (

From e3f1c26e6afcf7c3df9bd98166614778e27645ea Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 3 Sep 2012 05:21:17 +0000
Subject: [PATCH 118/118] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
---
 addons/account_analytic_plans/i18n/nb.po |  546 +++++
 addons/import_google/i18n/mn.po          |  217 ++
 addons/point_of_sale/i18n/nb.po          | 2720 ++++++++++++++++++++++
 addons/sale_crm/i18n/zh_CN.po            |   20 +-
 addons/sale_mrp/i18n/zh_CN.po            |   12 +-
 5 files changed, 3499 insertions(+), 16 deletions(-)
 create mode 100644 addons/account_analytic_plans/i18n/nb.po
 create mode 100644 addons/import_google/i18n/mn.po
 create mode 100644 addons/point_of_sale/i18n/nb.po

diff --git a/addons/account_analytic_plans/i18n/nb.po b/addons/account_analytic_plans/i18n/nb.po
new file mode 100644
index 00000000000..27a6c0d9e24
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/nb.po
@@ -0,0 +1,546 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-02 09:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-03 05:21+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+"Denne fordeling modellen har vært lagret. Du vil kunne bruke den senere."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Plan ID"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Fra dato"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr "Krysset Analyse"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Analytisk Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Analytisk journal"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr "Analytisk plan linje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error"
+msgstr "Brukerfeil"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Analytisk Plan forekomst"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Modell Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Konto2 ID"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Konto6 ID"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi Planer"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid "Define your Analytic Plans"
+msgstr "Definer dine analytiske planer."
+
+#. module: account_analytic_plans
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden må være unik pr firma!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Analytisk konto Referanse."
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr "Distribusjon Model Lagret"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Analytisk distribusjon modeller"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "Prosentdel"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid ""
+"To setup a multiple analytic plans environment, you must define the root "
+"analytic accounts for each plan set. Then, you must attach a plan set to "
+"your account journals."
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "Value Error"
+msgstr ""
diff --git a/addons/import_google/i18n/mn.po b/addons/import_google/i18n/mn.po
new file mode 100644
index 00000000000..9b0376c0d98
--- /dev/null
+++ b/addons/import_google/i18n/mn.po
@@ -0,0 +1,217 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-31 07:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Тохируулга"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Зөвхөн хаяг оруулах"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/point_of_sale/i18n/nb.po b/addons/point_of_sale/i18n/nb.po
new file mode 100644
index 00000000000..42e5832b237
--- /dev/null
+++ b/addons/point_of_sale/i18n/nb.po
@@ -0,0 +1,2720 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-31 07:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "Produkt Nb"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid ""
+"You must define which payment method must be available through the point of "
+"sale by reusing existing bank and cash through \"Accounting > Configuration "
+"> Financial Accounting > Journals\". Select a journal and check the field "
+"\"PoS Payment Method\" from the \"Point of Sale\" tab. You can also create "
+"new payment methods directly from menu \"PoS Backend > Configuration > "
+"Payment Methods\"."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.pos.order:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.plain_water
+msgid "Plain Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Year from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Post All Orders"
+msgstr "Poster Alle Ordre"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_2l_product_template
+msgid "Spa Reine 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
+msgid "Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Details of Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,day:0
+#: view:report.pos.order:0 field:report.pos.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.out,name:0
+msgid "Description / Reason"
+msgstr "Beskrivelse / Årsak"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,product_name:0
+#: field:report.sales.by.margin.pos.month,product_name:0
+msgid "Product Name"
+msgstr "Produktnavn"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Month from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0 report:pos.invoice:0
+#: field:pos.make.payment,amount:0 report:pos.user.product:0
+#: field:report.transaction.pos,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "Konfigurasjonsfeil ! Valgt valuta må settes opp i kontoplan"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
+msgid "PoS Categories"
+msgstr "PoS Kategorier"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Take Money Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Opphav"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#, python-format
+msgid ""
+"You do not have any open cash register. You must create a payment method or "
+"open a cash register."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total of the day"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "Gjennomsnittspris"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Rab. (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash Register Management"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
+msgid "Lays Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_2l_product_template
+msgid "Coca-Cola Regular 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda_orange
+msgid "Orange"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+msgid "Sales by User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+msgid "Ref"
+msgstr "Ref"
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
+msgid "Leffe Brune 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
+#: report:pos.sales.user:0
+msgid "Sales Report"
+msgstr "Salgsrapport"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beverage
+msgid "Beverages"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_50cl_product_template
+msgid "Stella Artois 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: point_of_sale
+#: field:pos.category,parent_id:0
+msgid "Parent Category"
+msgstr "Overordnet kategori"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "["
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,total:0
+#: field:report.sales.by.margin.pos.month,total:0
+msgid "Margin"
+msgstr "Margin"
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0 field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_speciale_product_template
+msgid "Dr. Oetker Ristorante Speciale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Total ant"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
+msgid "Fanta Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
+msgid "Sales by User Monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Day from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:285
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.sparkling_water
+msgid "Sparkling Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
+msgid "Pepsi Max Cool Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "POS Ordre linje"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
+msgid "Fanta Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,child_id:0
+msgid "Children Categories"
+msgstr "Underordnede Kategorier"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment Date"
+msgstr "Betalingsdato"
+
+#. module: point_of_sale
+#: help:product.product,pos_categ_id:0
+msgid ""
+"If you want to sell this product through the point of sale, select the "
+"category it belongs to."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_1l_product_template
+msgid "Coca-Cola Light 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
+msgid "Chaudfontaine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line No"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid "No Cash Register Defined !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment Reference"
+msgstr "Betalingsreferanse"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Post POS Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:408
+#, python-format
+msgid "Customer Invoice"
+msgstr "Kundefaktura"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Rabatt totalt"
+
+#. module: point_of_sale
+#: view:pos.details:0 view:pos.payment.report:0 view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+msgid "Print Report"
+msgstr "Skriv ut rapport"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
+msgid "Dr. Oetker Ristorante Bolognese"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pizza
+msgid "Pizza"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:85
+#: code:addons/point_of_sale/wizard/pos_return.py:240
+#, python-format
+msgid "Add Product"
+msgstr "Legg til produkt"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.coke
+msgid "Coke"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm
+msgid "Create Sale Entries"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+#: report:pos.details:0 view:pos.order:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:87
+msgid "Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in current month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Sluttbalanse"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
+msgid "Pepsi Max 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
+msgid "San Pellegrino 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Post Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_1l_product_template
+msgid "Spa Reine 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Cash registers are already closed."
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Feil: Ugyldig ean kode"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "Sluttdato"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current year"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale view:pos.order:0
+msgid "PoS Orders"
+msgstr "POS Ordre"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "List of Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_50cl_product_template
+msgid "Maes 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Not Invoiced"
+msgstr "Ikke fakturert"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
+#: report:pos.user.product:0
+msgid "User's Product"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:641
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
+msgid "Fanta Orange 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_33cl_product_template
+msgid "Spa Reine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add a Global Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
+msgid "Dr. Oetker Ristorante Prosciutto"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
+#: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
+msgid "Lays Light Paprika 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
+msgid "Coca-Cola Light Lemon 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
+#: model:ir.model,name:point_of_sale.model_pos_close_statement
+msgid "Close Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
+msgid "Croky Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
+msgid "Cash Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Inngående saldo"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: field:product.product,pos_categ_id:0
+msgid "PoS Category"
+msgstr "PoS Kategori"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
+msgid "Chimay Bleu 75cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without controlling the closing "
+"balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
+msgid "Sale Details"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pils
+msgid "Pils"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr "Sum av subtotaler"
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Ordrelinjer"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
+msgid "Chaudfontaine Petillante 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Opprettet, dato:"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
+msgid "Lays Naturel XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS "
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:pos.user.product:0
+msgid "Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mine salg"
+
+#. module: point_of_sale
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "# av Ant"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:report.sales.by.margin.pos,date_order:0
+#: field:report.sales.by.margin.pos.month,date_order:0
+#: field:report.sales.by.user.pos,date_order:0
+#: field:report.sales.by.user.pos.month,date_order:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_33cl_product_template
+msgid "Stella Artois 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created during this year"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Fakturakladd"
+
+#. module: point_of_sale
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_2l_product_template
+msgid "Evian 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Mva"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_2l_product_template
+msgid "Coca-Cola Light 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_funghi_product_template
+msgid "Dr. Oetker Ristorante Funghi"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "Rab."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
+msgid "Lindemans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
+msgid "Coca-Cola Zero 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "MVA:"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "POS Ordre linjer"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "Kvittering"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: point_of_sale
+#: report:pos.details:0 field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0 report:pos.sales.user:0 report:pos.sales.user.today:0
+#: report:pos.user.product:0 view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
+#: field:report.transaction.pos,user_id:0
+#: model:res.groups,name:point_of_sale.group_pos_user
+msgid "User"
+msgstr "Bruker"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_33cl_product_template
+msgid "Coca-Cola Light 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_1l_product_template
+msgid "Perrier 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Total rabatt"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
+msgid "Boon Framboise 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+msgid "Code"
+msgstr "Engelsk"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
+#: field:pos.config.journal,journal_id:0 field:pos.order,sale_journal:0
+#: view:report.cash.register:0 field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
+msgid "Timmermans Faro 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.cash.register,state:0 field:report.pos.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "Antall transaksjoner"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0 view:pos.box.out:0 view:pos.confirm:0
+#: view:pos.make.payment:0 view:pos.open.statement:0 view:pos.receipt:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
+msgid "Timmermans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Control Balance Before Closing"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.transaction.pos:0
+msgid "Amount total"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+msgid "Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.food
+msgid "Food"
+msgstr "Mat"
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.invoice:0 report:pos.lines:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:30
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:69
+msgid "Price"
+msgstr "Pris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
+msgid "ijsboerke Stracciatella 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,journal_user:0
+msgid "PoS Payment Method"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,expense_pdt:0
+msgid ""
+"This is a product you can use to take cash from a statement for the point of "
+"sale backend, exemple: money lost, transfer to bank, etc."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
+msgid "Coca-Cola Regular 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "Unable to Delete !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
+msgid "Lays Paprika Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Start Period"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.category,complete_name:0
+#: field:pos.category,name:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+msgid "Name"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
+msgid "Spa Barisart 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:284
+#, python-format
+msgid ""
+"There is no receivable account defined to make payment for the partner: "
+"\"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid ""
+"Generate all sale journal entries for non invoiced orders linked to a closed "
+"cash register or statement."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/point_of_sale.py:472
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
+#: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
+msgid "Lays Light Naturel 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+msgid "Print Date"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:282
+#, python-format
+msgid "There is no receivable account defined to make payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Do you want to open cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "PoS Cash Output"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda
+msgid "Soda"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:640
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Update"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.categ_others
+msgid "Others"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Point-of-Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_50cl_product_template
+msgid "Evian 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
+msgid "Coca-Cola Light Lemon 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.invoice:0 field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
+msgid "Sale line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
+msgid "Lays Naturel Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
+msgid "Coca-Cola Light Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_normal_action
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
+msgid "Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
+msgid "Dr. Oetker Ristorante Quattro Formaggi"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_1l_product_template
+msgid "Coca-Cola Zero 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.pos.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products 'Put Money In'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
+msgid "Croky Bolognaise 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
+msgid "All Sales Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,income_pdt:0
+msgid ""
+"This is a product you can use to put cash into a statement for the point of "
+"sale backend."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the Receipt of the Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,journal:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
+msgid "Lays Paprika 45g"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0 field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:32
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:59
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "Month -1"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
+#: model:ir.model,name:point_of_sale.model_pos_sale_user
+#: view:pos.payment.report.user:0
+msgid "Sale by User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_1l_product_template
+msgid "Evian 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.water
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
+msgid "Lays Sel et Poivre Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Qty of product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
+msgid "Chimay Rouge 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_50cl_product_template
+msgid "Coca-Cola Light 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_50cl_product_template
+msgid "Jupiler 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "End Period"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
+msgid "Coca-Cola Light Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
+msgid "Lays Ketchup 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_50cl_product_template
+msgid "Perrier 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,state:0
+msgid "Synchronized"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,month:0
+#: view:report.pos.order:0 field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Year of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: field:pos.box.entries,journal_id:0 field:pos.box.out,journal_id:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Yes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
+msgid "Sales by User Daily margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Open Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.pos.order,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
+msgid "Dr. Oetker Ristorante Vegetale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
+msgid "Coca-Cola Zero 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0 selection:pos.order,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beers
+msgid "Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid ""
+"OpenERP will close all cash registers he can close automatically without "
+"validation. He will also open all cash registers for which you have to "
+"control the ending belance before closing manually."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
+msgid "Cash In"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:all.closed.cashbox.of.the.day:0 report:pos.invoice:0
+#: report:pos.lines:0 report:pos.payment.report.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:49
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:93
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:271
+msgid "Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
+msgid "Croky Paprika 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:231
+msgid "Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid ""
+"The system will open all cash registers, so that you can start recording "
+"payments. We suggest you to control the opening balance of each register, "
+"using their CashBox tab."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0 view:pos.order:0 field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
+msgid "Rochefort \"8\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.cash.register,state:0
+msgid "Open"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,name:0 field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
+msgid "Timmermans Geuze 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
+msgid "Lays Pickels 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,net_margin_per_qty:0
+#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
+msgid "Net margin per Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
+msgid "Spa et Fruit Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+msgid "Sales by User Margin"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:59
+#, python-format
+msgid "Paiement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
+msgid "Pepsi Max 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.model,name:point_of_sale.model_product_product
+#: report:pos.details:0 field:pos.order.line,product_id:0
+#: report:pos.payment.report.user:0 report:pos.user.product:0
+#: view:report.pos.order:0 field:report.pos.order,product_id:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:29
+msgid "Product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_pollo_product_template
+msgid "Dr. Oetker Ristorante Pollo"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
+msgid "Grisette Cerise 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
+msgid "Chaudfontaine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_margherita_product_template
+msgid "Dr. Oetker La Margherita"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "PoS Backend"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
+msgid "Sales lines by Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_2l_product_template
+msgid "Pepsi 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Order"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:472
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,user_ids:0
+msgid "Salesmen"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_cash_register
+#: view:report.cash.register:0
+msgid "Point of Sale Cash Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:pos.order,amount_total:0 report:pos.payment.report.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:33
+msgid "Total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
+msgid "Lindemans Pecheresse 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_33cl_product_template
+msgid "Pepsi 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
+msgid "Fanta Orange 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: field:pos.order,company_id:0 field:pos.order.line,company_id:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_33cl_product_template
+msgid "Orangina 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products 'Take Money Out'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
+msgid "Chimay Bleu 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
+#: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
+msgid "Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.chips
+msgid "Chips"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_spinaci_product_template
+msgid "Dr. Oetker Ristorante Spinaci"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Put Money In"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
+msgid "ijsboerke Vanille 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0 selection:report.pos.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
+msgid "Orangina 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.ice_cream
+msgid "Ice Cream"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
+msgid "Belle-Vue Kriek 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
+msgid "Chaudfontaine Petillante 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
+msgid "Chaudfontaine 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "In order to delete a sale, it must be new or cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
+msgid "Coca-Cola Regular 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid ""
+"This field authorize the automatic creation of the cashbox, without control "
+"of the initial balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
+msgid "Coca-Cola Zero 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_tonno_product_template
+msgid "Dr. Oetker Ristorante Tonno"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "New"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#, python-format
+msgid "In order to set to draft a sale, it must be cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
+msgid "Fanta Zero Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Day of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_33cl_product_template
+msgid "Maes 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orval_33cl_product_template
+msgid "Orval 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_1l_product_template
+msgid "Coca-Cola Regular 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Unable to cancel the picking."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current month"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
+msgid "Spa Barisart 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
+#, python-format
+msgid "Return Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_33cl_product_template
+msgid "Jupiler 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
+msgid "ijsboerke Chocolat 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Message"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0 model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root_touchscreen
+#: view:product.product:0
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0 field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0 field:report.pos.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 view:pos.order:0 selection:pos.order,state:0
+#: view:report.pos.order:0 selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "No"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
+msgid "Spa Barisart 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.special_beers
+msgid "Special Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Re-Print"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Draft"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
+msgid "Fanta Zero Orange 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.fruity_beers
+msgid "Fruity Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
+msgid "ijsboerke Dame Blanche 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
+msgid "ijsboerke Moka 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
+msgid ""
+"Payment methods are defined by accounting journals having the field Payment "
+"Method checked."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+msgid "Sales by user"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_hawaii_product_template
+msgid "Dr. Oetker Ristorante Hawaii"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
+msgid "Chaudfontaine Petillante 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.product_normal_action
+msgid ""
+"You must define a Product for everything you buy or sell. Products can be "
+"raw materials, stockable products, consumables or services. The Product form "
+"contains detailed information about your products related to procurement "
+"logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
+msgid "Pepsi Max 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
+msgid "Lays Paprika XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Do you want to close your cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#, python-format
+msgid "Please create an invoice for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
+msgid "Dr. Oetker Ristorante Mozzarella"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:66
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+#: view:pos.close.statement:0
+#, python-format
+msgid "Close Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "General Information"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:pos.details:0 view:pos.discount:0 view:pos.payment.report:0
+#: view:pos.payment.report.user:0 view:pos.sale.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:13
+msgid "Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_50cl_product_template
+msgid "Spa Reine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
+msgid "Leffe Blonde 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#, python-format
+msgid "please check that account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config.journal,name:0 report:pos.invoice:0 report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Yesterday"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
+msgid "Coca-Cola Zero Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.order,partner_id:0 view:report.pos.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
+msgid "Sales by User Monthly margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
+msgid "Leffe Brune \"9\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,journal_user:0
+msgid ""
+"Check this box if this journal define a payment method that can be used in "
+"point of sales."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
+#, python-format
+msgid "Make Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:pos.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+msgid "Sales User Today"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Month of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "PoS Cash Input"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,year:0
+#: view:report.pos.order:0 field:report.pos.order,year:0
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
+msgid "Disc (%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
+msgid "Subtotal:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
+msgid "Tax:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
+msgid "Disc"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
+msgid "+/-"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
+msgid "Paid:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
+msgid "Change:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
+msgid "Back to Products"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
+msgid "Validate"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
+msgid "pending orders"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
+msgid ""
+"There are pending operations that could not be saved into the database, are "
+"you sure you want to exit?"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
+msgid "Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
+msgid "Next Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
+msgid "Phone:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
+msgid "User:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
+msgid "Shop:"
+msgstr ""
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index bbae3770541..6678287c01e 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-08-18 17:40+0000\n"
-"Last-Translator: Heling Yao <Unknown>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <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: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "转换为销售报价单(%s)。"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -73,7 +73,7 @@ msgstr "在生成销售订单后检查是否关闭商机。"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商机"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -104,13 +104,13 @@ msgstr "关闭商机"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "这阶段我的计划收入"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "商机 '%s'  被转换为报价单"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index 86105255a19..bb04533ef97 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 05:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -40,12 +40,12 @@ msgstr "销售名称"
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "订单数量不能是负数或者0！"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0