From e9ae0b4906921dad23a9c6c3ce95994d2bfc5a21 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 8 Feb 2012 14:31:45 +0100
Subject: [PATCH 01/50] [IMP] Kanban: renamed button 'New' to 'Create' in order
 to match list view

bzr revid: fme@openerp.com-20120208133145-jvx9u1i3tdvkw250
---
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 3490b7a171f..fb506d6ffa7 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -2,7 +2,7 @@
 <t t-name="KanbanView">
     <div class="oe_kanban_header">
     <t t-if="widget.options.action_buttons !== false">
-        <button type="button" class="oe_button oe_kanban_button_new">New</button>
+        <button type="button" class="oe_button oe_kanban_button_new">Create</button>
     </t>
     </div>
     <div class="oe_kanban_view">

From 301afd4baa4b2cd8ae10f3de3fe525104f993d0a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 8 Feb 2012 14:50:10 +0100
Subject: [PATCH 02/50] [REM] hide menutip option from user preference

bzr revid: al@openerp.com-20120208135010-u6s6tl1loss9a74u
---
 openerp/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index aa38561dacd..c5594f76e22 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -89,7 +89,7 @@
                         <field name="view" readonly="0"/>
                         <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
-                        <field name="menu_tips" readonly="0"/>
+                        <field name="menu_tips" readonly="0" groups="base.group_no_one"/>
                     </group>
                     <group name="default_filters" colspan="2" col="2">
                         <separator string="Default Filters" colspan="2"/>

From 9cc531505f7a00083b32a91215dbef3213dc2a02 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 8 Feb 2012 14:56:55 +0100
Subject: [PATCH 03/50] [FIX] formatting of float_time fields

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

bzr revid: xmo@openerp.com-20120208135655-79qnr5tl6admxr1e
---
 addons/web/static/src/js/formats.js | 7 ++++++-
 addons/web/static/test/formats.js   | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index eb7d6c335ac..d35a28f36b7 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -101,7 +101,12 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
             formatted[0] = openerp.web.insert_thousand_seps(formatted[0]);
             return formatted.join(l10n.decimal_point);
         case 'float_time':
-            return _.str.sprintf("%02d:%02d",
+            var pattern = '%02d:%02d';
+            if (value < 0) {
+                value = Math.abs(value);
+                pattern = '-' + pattern;
+            }
+            return _.str.sprintf(pattern,
                     Math.floor(value),
                     Math.round((value % 1) * 60));
         case 'many2one':
diff --git a/addons/web/static/test/formats.js b/addons/web/static/test/formats.js
index 640eaaadca7..2e292af41c8 100644
--- a/addons/web/static/test/formats.js
+++ b/addons/web/static/test/formats.js
@@ -71,6 +71,15 @@ $(document).ready(function () {
         strictEqual(
             openerp.web.format_value(0.0085, {type:'float', widget:'float_time'}),
             '00:01');
+        strictEqual(
+            openerp.web.format_value(-1.0, {type:'float', widget:'float_time'}),
+            '-01:00');
+        strictEqual(
+            openerp.web.format_value(-0.9853, {type:'float', widget:'float_time'}),
+            '-00:59');
+        strictEqual(
+            openerp.web.format_value(-0.0085, {type:'float', widget:'float_time'}),
+            '-00:01');
     });
     test("format_float", function () {
         var fl = 12.1234;

From 5af49817f451584930b762ad6ccf7b572037fb07 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 8 Feb 2012 14:59:45 +0100
Subject: [PATCH 04/50] [FIX] allow text inside <label> tags

bzr revid: chs@openerp.com-20120208135945-6p22z3e69r7z0tty
---
 openerp/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 167499145ac..792bc89f7a8 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -303,6 +303,7 @@
             <rng:optional><rng:attribute name="name"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
+                    <rng:text/>
                     <rng:ref name="notebook"/>
                     <rng:ref name="field"/>
                     <rng:ref name="group"/>

From 01f3d0fc985fe4f98d10c88921f33676c84c4757 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 8 Feb 2012 16:08:15 +0100
Subject: [PATCH 05/50] =?UTF-8?q?[FIX]=C2=A0the=20embedded=20pychart=20lib?=
 =?UTF-8?q?rary=20is=20not=20used.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: florent.xicluna@gmail.com-20120208150815-8th86hvpp11yiv4x
---
 openerp/__init__.py        | 1 -
 openerp/report/__init__.py | 1 -
 setup.py                   | 8 ++------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/openerp/__init__.py b/openerp/__init__.py
index 7e723c41f9d..5827b744cf8 100644
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -32,7 +32,6 @@ import modules
 import netsvc
 import osv
 import pooler
-import pychart
 import release
 import report
 import run_tests
diff --git a/openerp/report/__init__.py b/openerp/report/__init__.py
index 646967f00d1..48b654fdd86 100644
--- a/openerp/report/__init__.py
+++ b/openerp/report/__init__.py
@@ -24,7 +24,6 @@ import print_xml
 import print_fnc
 import custom
 import render
-import openerp.pychart
 import int_to_text
 
 import report_sxw
diff --git a/setup.py b/setup.py
index 6e1adadde82..037d288d7e5 100755
--- a/setup.py
+++ b/setup.py
@@ -87,14 +87,10 @@ setuptools.setup(
       scripts          = ['openerp-server'],
       data_files       = data(),
       packages         = setuptools.find_packages(),
+      dependency_links = ['http://download.gna.org/pychart/'],
       #include_package_data = True,
       install_requires = [
-        # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
-        # It seems there is a single difference, which is a spurious print in generate_docs.py.
-        # It is probably safe to move to PyChart 1.39 (the latest one).
-        # (Let setup.py choose the latest one, and we should check we can remove pychart from
-        # our tree.) http://download.gna.org/pychart/
-        # TODO  'pychart',
+          'pychart',
           'babel',
           'feedparser',
           'gdata',

From fbd5d24aaa6f0dfa3077f1bab002f48002bab11c Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 4 Jul 2012 14:48:45 +0530
Subject: [PATCH 06/50] [IMP]server-log-warning

bzr revid: pna@tinyerp.com-20120704091845-sox7tsm9pjpqn812
---
 openerp/addons/base/ir/ir.xml                 |  1 -
 .../addons/base/security/ir.model.access.csv  |  4 ++++
 .../addons/base/test/test_osv_expression.yml  | 23 +++++++++----------
 openerp/tools/amount_to_text_en.py            |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 88843b207f9..483f3f6ab37 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -598,7 +598,6 @@
             <field name="name">ir.needaction_users_rel.tree</field>
             <field name="model">ir.needaction_users_rel</field>
             <field name="type">tree</field>
-            <field name="sequence">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
                     <field name="user_id"/>
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index cc382fcbd11..8f9ac8a6eaa 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -9,10 +9,14 @@
 "access_ir_exports_group_system","ir_exports group_system","model_ir_exports","base.group_user",1,1,1,1
 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
+"access_ir_model_constraint_group_erp_manager","ir_model_constraint group_erp_manager","model_ir_model_constraint","group_erp_manager",1,1,1,1
+"access_ir_model_relation_group_erp_manager","ir_model_relation group_erp_manager","model_ir_model_relation","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
+"access_ir_model_constraint","ir_model_constraint","model_ir_model_constraint",,1,0,0,0
+"access_ir_model_relation","ir_model_relation","model_ir_model_relation",,1,0,0,0
 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index fa7a69b74e9..03e8b7686b8 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -220,8 +220,7 @@
         # that don't have OpenERP has a parent company, you expect to find,
         # among others, the companies that don't have parent company.
         #
-        # ('parent_id', 'not in', [0]) must give the same result than
-        # ('parent_id', 'not in', []), i.e. a empty set or a set with non-
+       
         # existing values be treated similarly if we simply check that some
         # existing value belongs to them.
 
@@ -229,7 +228,7 @@
         res_0.sort()
         res_1 = self.search(cr, uid, [('parent_id', 'not in', [max_partner_id + 1])]) # get all rows, included null parent_id
         res_1.sort()
-        res_2 = self.search(cr, uid, [('parent_id', 'not in', False)]) # get rows with not null parent_id, deprecated syntax
+        res_2 = self.search(cr, uid, [('parent_id', '!=', False)]) # get rows with not null parent_id, deprecated syntax
         res_2.sort()
         res_3 = self.search(cr, uid, [('parent_id', 'not in', [])]) # get all rows, included null parent_id
         res_3.sort()
@@ -249,7 +248,7 @@
         res_5.sort()
         res_6 = self.search(cr, uid, [('parent_id', 'in', [max_partner_id + 1])])
         res_6.sort()
-        res_7 = self.search(cr, uid, [('parent_id', 'in', False)])
+        res_7 = self.search(cr, uid, [('parent_id', '=', False)])
         res_7.sort()
         res_8 = self.search(cr, uid, [('parent_id', 'in', [])])
         res_8.sort()
@@ -270,7 +269,7 @@
         res_10.sort()
         res_11 = self.search(cr, uid, ['!', ('parent_id', 'in', [max_partner_id + 1])])
         res_11.sort()
-        res_12 = self.search(cr, uid, ['!', ('parent_id', 'in', False)])
+        res_12 = self.search(cr, uid, ['!', ('parent_id', '=', False)])
         res_12.sort()
         res_13 = self.search(cr, uid, ['!', ('parent_id', 'in', [])])
         res_13.sort()
@@ -291,7 +290,7 @@
         res_16.sort()
         assert res_16 == partner_ids
 
-        res_17 = self.search(cr, uid, [('website', 'not in', False)])
+        res_17 = self.search(cr, uid, [('website', '!=', False)])
         res_17.sort()
         assert res_17 == with_website
 
@@ -306,21 +305,21 @@
         assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101)
         assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102)
 -
-    Property of the query (one2many not in False).
+    Property of the query (one2many != False).
 -
     !python {model: res.currency }: |
         ids = self.search(cr, uid, [])
         referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
-        companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', 'not in', False)]))
+        companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)]))
         assert referenced_companies == companies
 -
-    Property of the query (one2many in False).
+    Property of the query (one2many = False).
 -
     !python {model: res.currency }: |
         ids = self.search(cr, uid, [])
         referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
         unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies)
-        companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', 'in', False)]))
+        companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)]))
         assert unreferenced_companies == companies
 -
     Equivalent queries.
@@ -331,7 +330,7 @@
         res_1 = self.search(cr, uid, [('name', 'not like', 'probably_unexisting_name')])
         res_2 = self.search(cr, uid, [('id', 'not in', [max_currency_id + 1003])])
         res_3 = self.search(cr, uid, [('id', 'not in', [])])
-        res_4 = self.search(cr, uid, [('id', 'not in', False)])
+        res_4 = self.search(cr, uid, [('id', '!=', False)])
         res_0.sort()
         res_1.sort()
         res_2.sort()
@@ -414,7 +413,7 @@
         # get the companies referenced by some currency (this is normally the main company)
         res_10 = self.search(cr, uid, [('currency_ids', 'not like', 'probably_unexisting_name')])
         res_11 = self.search(cr, uid, [('currency_ids', 'not in', [max_currency_id + 1])])
-        res_12 = self.search(cr, uid, [('currency_ids', 'not in', False)])
+        res_12 = self.search(cr, uid, [('currency_ids', '!=', False)])
         res_13 = self.search(cr, uid, [('currency_ids', 'not in', [])])
         res_10.sort()
         res_11.sort()
diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py
index 9a1ac939e6b..9e0d908f16e 100644
--- a/openerp/tools/amount_to_text_en.py
+++ b/openerp/tools/amount_to_text_en.py
@@ -116,7 +116,7 @@ def amount_to_text(nbr, lang='en', currency='euro'):
         _logger.warning(_("no translation function found for lang: '%s'"), lang)
         #TODO: (default should be en) same as above
         lang = 'en'
-    return _translate_funcs[lang](abs(nbr), currency)
+    return _translate_funcs[lang](abs(nbr), currency='euro')
 
 if __name__=='__main__':
     from sys import argv

From 59d182672fef83a646be8ca084c4ef45565a8cd1 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 5 Jul 2012 16:03:48 +0530
Subject: [PATCH 07/50] [IMP]remove specific allocation of currency="euro"

bzr revid: dbr@tinyerp.com-20120705103348-rzux5u9zi40ir3kn
---
 openerp/tools/amount_to_text_en.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py
index 9e0d908f16e..9a1ac939e6b 100644
--- a/openerp/tools/amount_to_text_en.py
+++ b/openerp/tools/amount_to_text_en.py
@@ -116,7 +116,7 @@ def amount_to_text(nbr, lang='en', currency='euro'):
         _logger.warning(_("no translation function found for lang: '%s'"), lang)
         #TODO: (default should be en) same as above
         lang = 'en'
-    return _translate_funcs[lang](abs(nbr), currency='euro')
+    return _translate_funcs[lang](abs(nbr), currency)
 
 if __name__=='__main__':
     from sys import argv

From 72c5fe278bab4c52f5efb70364534b3ad54936fd Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 21 Aug 2012 01:40:08 +0200
Subject: [PATCH 08/50] generate url from the widget if needed

bzr revid: al@openerp.com-20120820234008-olfcnxj7np6hwwgz
---
 addons/pad/res_company.py              |  3 +-
 addons/pad/static/src/css/etherpad.css | 51 ++++++++++----------------
 addons/pad/static/src/js/pad.js        | 45 +++++++++++++++--------
 addons/pad/static/src/xml/pad.xml      | 22 ++++++-----
 addons/pad_project/project_task.py     |  3 --
 5 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py
index bd955cd0481..703e655219b 100644
--- a/addons/pad/res_company.py
+++ b/addons/pad/res_company.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-DEFAULT_PAD_TEMPLATE = 'http://beta.etherpad.org/p/%(db)s-%(model)s-%(salt)s'
+DEFAULT_PAD_TEMPLATE = 'http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s'
+DEFAULT_PAD_TEMPLATE = ''
 
 class company_pad(osv.osv):
     _inherit = 'res.company'
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index a0240afcab7..8ea7972071e 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -1,52 +1,39 @@
-.oe_etherpad_head{
+.oe_pad_head {
     width: 100%;
     display: block;
-    padding-left:3px;
-    cursor:pointer;
+    padding: 4px;
 }
-.oe_etherpad_fullscreen div.oe_etherpad_head .oe_normal {
-    display: none;
+
+.oe_pad_readonly {
+    border: 1px solid #ddd;
+    padding: 8px;
 }
-.oe_etherpad_normal div.oe_etherpad_head .oe_fullscreen {
-    display: none;
-}
-.oe_etherpad_fullscreen {
+
+.oe_pad_fullscreen {
     position: fixed;
     top: 0px;
     left: 0px;
     width: 100%;
     height: 100%;
     background-color: white;
-    z-index:10001 !important;
-}
-.etherpad_default{  
-    width: 100%;
-    height: 450px;
-}
-.oe_etherpad_fullscreen .etherpad_default{  
-    height: 100%
+    z-index: 1000;
 }
 
-.etherpad_body{
-    overflow:hidden;
+.oe_pad_fullscreen .oe_pad_content {
+    height: 100%;
 }
 
-.etherpad_readonly{
-    width: 100%;
-    height: 450px;
-    overflow:auto;    
+.etherpad_readonly ul, .etherpad_readonly ol {
+    margin-before: 1em;
+    margin-after: 1em;
+    margin-start: 0px;
+    margin-end: 0px;
+    padding-start: 40px !important;
 }
-.etherpad_readonly ul,.etherpad_readonly ol{
-    -webkit-margin-before: 1em;
-    -webkit-margin-after: 1em;
-    -webkit-margin-start: 0px;
-    -webkit-margin-end: 0px;
-    -webkit-padding-start: 40px !important;
-}
-.etherpad_readonly ul li{  
+.etherpad_readonly ul li{
     list-style-type: disc;
 }
-.etherpad_readonly ol li{  
+.etherpad_readonly ol li{
     list-style-type: decimal;
 }
 .etherpad_readonly .indent li{
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 6384eb72da8..314c751785a 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,32 +1,47 @@
 openerp.pad = function(instance) {
 
-instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
     template: 'FieldPad',
-    initialize_content: function() {
+    start: function() {
+        this._super();
         var self = this;
-        this.$textarea = undefined;
-        this.$element.find('div.oe_etherpad_head').click(function(ev) {
-            self.$element.toggleClass('oe_etherpad_fullscreen').toggleClass('oe_etherpad_normal');
+        this.$element.find('div.oe_pad_head').click(function(ev) {
+            self.$element.toggleClass('oe_pad_fullscreen');
+        });
+        this.on("change:effective_readonly", this, function() {
+            this.render_value();
         });
     },
-    set_value: function(value_) {
-        this._super(value_);
-        this.render_value();
+    set_value: function(val) {
+        var self = this;
+        var _super = self._super;
+        _super.apply(self,[val]);
+        if (val === false || val === "") {
+            self.field_manager.dataset.call('pad_generate_url').then(function(r) {
+                _super.apply(self,[r]);
+                self.render_value();
+            });
+        } else {
+            self.render_value();
+        }
     },
     render_value: function() {
+        console.log("display");
         var self = this;
         var value = this.get('value');
-        if(value !== false) {
-            var url = value.split('\n')[0];
+
+        if (!_.str.startsWith(value, "http")) {
+            self.$('.oe_pad_content').html(instance.web.qweb.render('FieldPad.unconfigured'));
+        } else {
             if (!this.get("effective_readonly")) {
                 var pad_username = this.session.username;
-                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+url+'?showChat=false&userName='+pad_username+'"></iframe>';
-                this.$element.find('div.oe_etherpad_default').html(code);
+                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+pad_username+'"></iframe>';
+                this.$('.oe_pad_content').html(code);
             } else {
-                $.get(url+'/export/html').success(function(data) {
-                    self.$element.html('<div class="etherpad_readonly">'+data+'</div>');
+                $.get(value+'/export/html').success(function(data) {
+                    self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'</div>');
                 }).error(function() {
-                    self.$element.text('Unable to load pad');
+                    self.$('.oe_pad_content').text('Unable to load pad');
                 });
             }
         }
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index e128fb183fb..58266a2594a 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -2,17 +2,19 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-
 <t t-name="FieldPad">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_text oe_etherpad_normal">
-            <div class="oe_etherpad_head">
-                    <span class="oe_normal">Fullscreen</span>
-                    <span class="oe_fullscreen">Return to Record</span>
-            </div>
-            <div class="oe_etherpad_default" ></div>
+    <div class="oe_form_field_text oe_pad">
+        <div class="oe_pad_head">
+            <span class="oe_pad_switch">Fullscreen</span>
         </div>
-    </t>
+        <div class="oe_pad_content"></div>
+    </div>
+</t>
+<t t-name="FieldPad.unconfigured">
+    Please configure your etherpad server.<br/>
+    OpenERP Entreprise customers may safely use pad.openerp.com as a server using the following template:<br/>
+    <blockquote>
+    http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s
+    </blockquote>
 </t>
-
 </templates>
diff --git a/addons/pad_project/project_task.py b/addons/pad_project/project_task.py
index 46c2c54cd46..513fc3fef5d 100644
--- a/addons/pad_project/project_task.py
+++ b/addons/pad_project/project_task.py
@@ -9,6 +9,3 @@ class task(osv.osv):
     _columns = {
         'description_pad': fields.char('Description PAD', size=250)
     }
-    _defaults = {
-        'description_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
-    }

From 6f28fde4ae74f368b9017b41d49c89f309a63021 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 12:07:18 +0530
Subject: [PATCH 09/50] [IMP]Renamed EAN13,supply method visible only when mrp
 is installed and suppliers tab comes when purchase is installed

bzr revid: dhr@tinyerp.com-20120821063718-uobafa8ij65an5b0
---
 addons/mrp/mrp_view.xml           |  3 +++
 addons/product/product.py         |  2 +-
 addons/product/product_view.xml   |  4 ----
 addons/purchase/purchase_view.xml | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c394544574d..30480901b29 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -987,6 +987,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='procure_method']" position="after">
+            		<field name="supply_method" groups="base.group_user"/>
+            	</xpath>
                 <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}">
diff --git a/addons/product/product.py b/addons/product/product.py
index ae99711a5ec..586d241d998 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -526,7 +526,7 @@ class product_product(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
-        'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
+        'ean13': fields.char('EAN13/Code', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 70651a0a795..871283791ef 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -87,7 +87,6 @@
                                     <group string="Procurement">
                                         <field name="type"/>
                                         <field name="procure_method" groups="base.group_user"/>
-                                        <field name="supply_method" groups="base.group_user"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
@@ -137,9 +136,6 @@
                                 </group>
 
                             </page>
-                            <page string="Suppliers" groups="base.group_user">
-                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                            </page>
                             <page string="Descriptions" groups="base.group_user">
                                 <separator string="Description"/>
                                 <field name="description"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index aec55bf93c2..f513e2a60e8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -554,5 +554,20 @@
                 </xpath>
             </field>
         </record>
+        
+        <!-- Product Suppliers-->
+        
+        <record id="view_product_supplier_inherit" model="ir.ui.view">
+            <field name="name">product.normal.supplier.form.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="//page[@string='Descriptions']" position="before">
+                    <page string="Suppliers" groups="base.group_user">
+                         <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>

From 95517df97cddd164a80ebe3d0836a45d60a04c74 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 14:13:50 +0530
Subject: [PATCH 10/50] [IMP]Changes in event_sale_view and
 purchase_requisition as per changes in supply_method

bzr revid: dhr@tinyerp.com-20120821084350-487odxa5rk2k9nze
---
 addons/event_sale/event_sale_view.xml                     | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 82c1c05b714..53e8a4cc18f 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -9,7 +9,7 @@
                 <field name="purchase_ok" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                 </field>
-                <field name='supply_method' position='after'>
+                <field name='procure_method' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                 </field>
              </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 188f81b6cbe..a1b270934e2 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -182,7 +182,7 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
-            <field name="supply_method" position="after">
+            <field name="procure_method" position="before">
                 <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
                 <field name="purchase_requisition"/>
                 </group>

From 2d7817bbe57ae4e7c701279af2d595ad5501f09d Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 21 Aug 2012 15:46:32 +0530
Subject: [PATCH 11/50] [ADD] Added autosize functionality for textarea

bzr revid: bde@tinyerp.com-20120821101632-gx3nu1xpfv3si1la
---
 addons/web/__openerp__.py             |  1 +
 addons/web/static/src/js/view_form.js | 26 +++-----------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 822d2fa3cbf..8c2a8fa0909 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -38,6 +38,7 @@ This module provides the core of the OpenERP Web Client.
         "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/src/js/boot.js",
         "static/src/js/corelib.js",
         "static/src/js/coresetup.js",
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4f3f1c62f13..3efee9a140f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2342,8 +2342,8 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
     render_value: function() {
         var show_value = instance.web.format_value(this.get('value'), this, '');
         this.$textarea.val(show_value);
-        if (show_value && this.view.options.resize_textareas) {
-            this.do_resize(this.view.options.resize_textareas);
+        if (show_value) {
+            this.$textarea.autosize();
         }
     },
     is_syntax_valid: function() {
@@ -2363,26 +2363,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
     focus: function($element) {
         this.$textarea.focus();
     },
-    do_resize: function(max_height) {
-        max_height = parseInt(max_height, 10);
-        var $input = this.$textarea,
-            $div = $('<div style="position: absolute; z-index: 1000; top: 0"/>').width($input.width()),
-            new_height;
-        $div.text($input.val());
-        _.each('font-family,font-size,white-space'.split(','), function(style) {
-            $div.css(style, $input.css(style));
-        });
-        $div.appendTo($('body'));
-        new_height = $div.height();
-        if (new_height < 90) {
-            new_height = 90;
-        }
-        if (!isNaN(max_height) && new_height > max_height) {
-            new_height = max_height;
-        }
-        $div.remove();
-        $input.height(new_height);
-    },
 });
 
 /**
@@ -2407,7 +2387,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
             self._updating_editor = false;
             this.$textarea = this.$element.find('textarea');
             var width = ((this.node.attrs || {}).editor_width || 468);
-            var height = ((this.node.attrs || {}).editor_height || 100);
+            var height = ((this.node.attrs || {}).editor_height || 250);
             this.$textarea.cleditor({
                 width:      width, // width not including margins, borders or padding
                 height:     height, // height not including margins, borders or padding

From d1ef48537c2959b115a3133b7ed09c546b1c9b85 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 15:46:37 +0530
Subject: [PATCH 12/50] [IMP]Change made for procurement method and stock and
 expected variations section to appear only for stockable product

bzr revid: dhr@tinyerp.com-20120821101637-o83hcputt5y3d9n9
---
 addons/product/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 871283791ef..2559b127dda 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -86,7 +86,7 @@
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user"/>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','in', ('service', 'consu'))]}"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1efc552bfa6..abad5b9ec21 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -98,7 +98,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}">
+                    <group string="Stock and Expected Variations" attrs="{'invisible':[('type','in', ('service', 'consu'))]}">
                         <label for="qty_available"/>
                         <div>
                             <field name="qty_available" class="oe_inline"/>

From 3e1982827f12ff9566a991912622db5055b4aa54 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 21 Aug 2012 15:48:43 +0530
Subject: [PATCH 13/50] [ADD] added autosize library

bzr revid: bde@tinyerp.com-20120821101843-gutt7h0ws3jtfah8
---
 .../lib/jquery.autosize/jquery.autosize.js    | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 addons/web/static/lib/jquery.autosize/jquery.autosize.js

diff --git a/addons/web/static/lib/jquery.autosize/jquery.autosize.js b/addons/web/static/lib/jquery.autosize/jquery.autosize.js
new file mode 100644
index 00000000000..29729d2fd42
--- /dev/null
+++ b/addons/web/static/lib/jquery.autosize/jquery.autosize.js
@@ -0,0 +1,160 @@
+// Autosize 1.10 - jQuery plugin for textareas
+// (c) 2012 Jack Moore - jacklmoore.com
+// license: www.opensource.org/licenses/mit-license.php
+
+(function ($) {
+	var
+	hidden = 'hidden',
+	borderBox = 'border-box',
+	lineHeight = 'lineHeight',
+	copy = '<textarea tabindex="-1" style="position:absolute; top:-9999px; left:-9999px; right:auto; bottom:auto; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden">',
+	// line-height is omitted because IE7/IE8 doesn't return the correct value.
+	copyStyle = [
+		'fontFamily',
+		'fontSize',
+		'fontWeight',
+		'fontStyle',
+		'letterSpacing',
+		'textTransform',
+		'wordSpacing',
+		'textIndent'
+	],
+	oninput = 'oninput',
+	onpropertychange = 'onpropertychange',
+	test = $(copy)[0];
+
+	// For testing support in old FireFox
+	test.setAttribute(oninput, "return");
+
+	if ($.isFunction(test[oninput]) || onpropertychange in test) {
+
+		// test that line-height can be accurately copied to avoid
+		// incorrect value reporting in old IE and old Opera
+		$(test).css(lineHeight, '99px');
+		if ($(test).css(lineHeight) === '99px') {
+			copyStyle.push(lineHeight);
+		}
+
+		$.fn.autosize = function (className) {
+			return this.each(function () {
+				var
+				ta = this,
+				$ta = $(ta),
+				mirror,
+				minHeight = $ta.height(),
+				maxHeight = parseInt($ta.css('maxHeight'), 10),
+				active,
+				i = copyStyle.length,
+				resize,
+				boxOffset = 0;
+
+				if ($ta.css('box-sizing') === borderBox || $ta.css('-moz-box-sizing') === borderBox || $ta.css('-webkit-box-sizing') === borderBox){
+					boxOffset = $ta.outerHeight() - $ta.height();
+				}
+
+				if ($ta.data('mirror') || $ta.data('ismirror')) {
+					// if autosize has already been applied, exit.
+					// if autosize is being applied to a mirror element, exit.
+					return;
+				} else {
+					mirror = $(copy).data('ismirror', true).addClass(className || 'autosizejs')[0];
+
+					resize = $ta.css('resize') === 'none' ? 'none' : 'horizontal';
+
+					$ta.data('mirror', $(mirror)).css({
+						overflow: hidden,
+						overflowY: hidden,
+						wordWrap: 'break-word',
+						resize: resize
+					});
+				}
+
+				// Opera returns '-1px' when max-height is set to 'none'.
+				maxHeight = maxHeight && maxHeight > 0 ? maxHeight : 9e4;
+
+				// Using mainly bare JS in this function because it is going
+				// to fire very often while typing, and needs to very efficient.
+				function adjust() {
+					var height, overflow;
+					// the active flag keeps IE from tripping all over itself.  Otherwise
+					// actions in the adjust function will cause IE to call adjust again.
+					if (!active) {
+						active = true;
+
+						mirror.value = ta.value;
+
+						mirror.style.overflowY = ta.style.overflowY;
+
+						// Update the width in case the original textarea width has changed
+						mirror.style.width = $ta.css('width');
+
+						// Needed for IE to reliably return the correct scrollHeight
+						mirror.scrollTop = 0;
+
+						// Set a very high value for scrollTop to be sure the
+						// mirror is scrolled all the way to the bottom.
+						mirror.scrollTop = 9e4;
+
+						height = mirror.scrollTop;
+						overflow = hidden;
+						if (height > maxHeight) {
+							height = maxHeight;
+							overflow = 'scroll';
+						} else if (height < minHeight) {
+							height = minHeight;
+						}
+						ta.style.overflowY = overflow;
+
+						ta.style.height = height + boxOffset + 'px';
+						
+						// This small timeout gives IE a chance to draw it's scrollbar
+						// before adjust can be run again (prevents an infinite loop).
+						setTimeout(function () {
+							active = false;
+						}, 1);
+					}
+				}
+
+				// mirror is a duplicate textarea located off-screen that
+				// is automatically updated to contain the same text as the
+				// original textarea.  mirror always has a height of 0.
+				// This gives a cross-browser supported way getting the actual
+				// height of the text, through the scrollTop property.
+				while (i--) {
+					mirror.style[copyStyle[i]] = $ta.css(copyStyle[i]);
+				}
+
+				$('body').append(mirror);
+
+				if (onpropertychange in ta) {
+					if (oninput in ta) {
+						// Detects IE9.  IE9 does not fire onpropertychange or oninput for deletions,
+						// so binding to onkeyup to catch most of those occassions.  There is no way that I
+						// know of to detect something like 'cut' in IE9.
+						ta[oninput] = ta.onkeyup = adjust;
+					} else {
+						// IE7 / IE8
+						ta[onpropertychange] = adjust;
+					}
+				} else {
+					// Modern Browsers
+					ta[oninput] = adjust;
+				}
+
+				$(window).resize(adjust);
+
+				// Allow for manual triggering if needed.
+				$ta.bind('autosize', adjust);
+
+				// Call adjust in case the textarea already contains text.
+				adjust();
+			});
+		};
+	} else {
+		// Makes no changes for older browsers (FireFox3- and Safari4-)
+		$.fn.autosize = function () {
+			return this;
+		};
+	}
+
+}(jQuery));
\ No newline at end of file

From 4655aebff83ceb76f1921c36eb920b3e4346933a Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 17:08:14 +0530
Subject: [PATCH 14/50] [IMP]Fixed for procurement and locations tab  come from
 module stock

bzr revid: dhr@tinyerp.com-20120821113814-v2ymtmi80kukrzch
---
 addons/mrp/mrp_view.xml                 | 11 ++++-
 addons/procurement/procurement_view.xml |  2 +-
 addons/product/product_view.xml         | 19 ---------
 addons/stock/product_view.xml           | 54 +++++++++++++++++--------
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 30480901b29..9cb3d8dbfa2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -981,8 +981,7 @@
                </data>
             </field>
         </record>
-
-        <record id="product_normal_form_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"/>
@@ -990,6 +989,14 @@
             	<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}">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index dbdc65c6763..f2a8dc98cb0 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -286,7 +286,7 @@
         <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="product.product_normal_form_view"/>
+            <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"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2559b127dda..2998897e3ca 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -117,25 +117,6 @@
 
                                 </group>
                             </page>
-                            <page string="Procurement &amp; Locations" groups="base.group_user">
-                                <group>
-                                    <group name="delay" string="Delays">
-                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                        <field name="warranty"/>
-                                    </group>
-                                    <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                    </group>
-                                    <group name="misc" string="Miscellaneous">
-                                        <field name="active"/>
-                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    </group>
-                                </group>
-
-                            </page>
                             <page string="Descriptions" groups="base.group_user">
                                 <separator string="Description"/>
                                 <field name="description"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index abad5b9ec21..43647ee88c4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+
+
         <record id="product_search_form_view_stock" model="ir.ui.view">
             <field name="name">product.search.stock.form</field>
             <field name="model">product.product</field>
@@ -50,6 +52,40 @@
                 </page>
             </field>
         </record>
+        
+        <record id="view_normal_procurement_locations_form" model="ir.ui.view">
+            <field name="name">product.normal.procurement.locations.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Procurement &amp; Locations" groups="base.group_user">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="store" groups="stock.group_locations">
+				                        <separator string="Counter-Part Locations Properties" colspan="2"/>
+				                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+				                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+				                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
+				                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+                            </page>
+                </notebook>
+            </field>
+        </record>
 
         <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
@@ -91,6 +127,8 @@
                 </xpath>
             </field>
         </record>
+        
+        
 
         <record id="view_normal_stock_property_form" model="ir.ui.view">
             <field name="name">product.normal.stock.form.inherit</field>
@@ -210,21 +248,5 @@
             </field>
         </record>
 
-        <record id="view_normal_property_form" model="ir.ui.view">
-            <field name="name">product.normal.stock.property.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <group name="store" position="after">
-                    <group name="store" groups="stock.group_locations">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
-                    </group>
-                </group>
-            </field>
-        </record>
-
     </data>
 </openerp>

From 3ecb0798a3d45461c9949657d5d292bd14e67567 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 18:12:41 +0530
Subject: [PATCH 15/50] [IMP]Fixing inherit id issues related to procurement
 and location changes

bzr revid: dhr@tinyerp.com-20120821124241-mibvnmuxby5xuzsv
---
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 addons/project_mrp/project_mrp_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 47a41260378..000b68e3495 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -621,7 +621,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <group name="misc" position="after">
                     <group name="pos" colspan="2" col="2">
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index ffceb33a611..841a61e6c31 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -14,7 +14,7 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
                     <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />

From 18ffbff5f18211e4cf6944565193439c7aa55c6a Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (Open ERP)" <jir@tinyerp.com>
Date: Wed, 22 Aug 2012 15:24:33 +0530
Subject: [PATCH 16/50] [FIX]  read of a single id in int in res.currency

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

bzr revid: jir@tinyerp.com-20120822095433-55l2n56fplfiglwv
---
 openerp/addons/base/res/res_currency.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index ac8ce1758cf..81dedbc992f 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -98,7 +98,10 @@ class res_currency(osv.osv):
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         res = super(res_currency, self).read(cr, user, ids, fields, context, load)
         currency_rate_obj = self.pool.get('res.currency.rate')
-        for r in res:
+        values = res
+        if not isinstance(values, (list)):
+            values = [values]
+        for r in values:
             if r.__contains__('rate_ids'):
                 rates=r['rate_ids']
                 if rates:

From abf966ceb5fc912cbba745a7b8537de344d61bb0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 17:45:15 +0530
Subject: [PATCH 17/50] [IMP]Adding an option in purchase wizard to hide
 costing method

bzr revid: dhr@tinyerp.com-20120822121515-1r7e8ufv6ojm5cdm
---
 addons/product/product_view.xml              | 2 +-
 addons/product/security/product_security.xml | 7 ++++++-
 addons/purchase/res_config.py                | 3 +++
 addons/purchase/res_config_view.xml          | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2998897e3ca..49c4d5d1083 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -90,7 +90,7 @@
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
-                                        <field name="cost_method" groups="base.group_user"/>
+                                        <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 1d2c795083a..73ab6f8a3d5 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -23,7 +23,12 @@
         <field name="name">Purchase Pricelists</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-
+	
+	<record id="group_costing_method" model="res.groups">
+        <field name="name">Costing Method</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+	
     <record id="group_uom" model="res.groups">
         <field name="name">Manage Multiple Units of Measure</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 6beac5a4cd0..3d9c858cec5 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -40,6 +40,9 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
+        'group_costing_method':fields.boolean("compute product cost price based on average cost",
+            implied_group='product.group_costing_method',
+            help="""Allows you to compute product cost price based on average cost."""),
         'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 23d89f1a7f1..00e0b6108e8 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -59,6 +59,10 @@
                                 <field name="group_purchase_delivery_address" class="oe_inline"/>
                                 <label for="group_purchase_delivery_address"/>
                             </div>
+                            <div>
+                                <field name="group_costing_method" class="oe_inline"/>
+                                <label for="group_costing_method"/>
+                            </div>
                             <div name="module_purchase_double_validation">
                                 <field name="module_purchase_double_validation" class="oe_inline"/>
                                 <label for="module_purchase_double_validation"/>

From b4ed7eb4eaf4d2abedb0103ec5444523c04741de Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 18:17:10 +0530
Subject: [PATCH 18/50] [IMP]Adding taxes to product category

bzr revid: dhr@tinyerp.com-20120822124710-loo8pjj33g1dgzp5
---
 addons/account/product.py       | 6 ++++++
 addons/account/product_view.xml | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/addons/account/product.py b/addons/account/product.py
index 9be49b4c56a..365518e4c01 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -24,6 +24,12 @@ from osv import fields, osv
 class product_category(osv.osv):
     _inherit = "product.category"
     _columns = {
+        'taxes_id': fields.many2many('account.tax', 'product_taxes_categ_rel',
+            'prod_id', 'tax_id', 'Customer Taxes',
+            domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])]),
+        'supplier_taxes_id': fields.many2many('account.tax',
+            'product_supplier_taxes_categ_rel', 'prod_id', 'tax_id',
+            'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]),
         'property_account_income_categ': fields.property(
             'account.account',
             type='many2one',
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 659a4f6ac36..610cfb12e4a 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -52,6 +52,8 @@
                     <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
                         <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="taxes_id" widget="many2many_tags"/>
+                        <field name="supplier_taxes_id"  widget="many2many_tags"/>
                     </xpath>
                 </data>
             </field>

From 75befda5e82a4f2f9c26549e8efd53fa7bc65371 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 18:48:16 +0530
Subject: [PATCH 19/50] [IMP]Tax related fixes in account_invoice,delivery sale
 and stock ,purchase requistion

bzr revid: dhr@tinyerp.com-20120822131816-g4o83w2ot084wyeo
---
 addons/account/account_invoice.py                   | 10 ++++++++--
 addons/delivery/sale.py                             |  5 ++++-
 addons/delivery/stock.py                            |  5 ++++-
 addons/purchase_requisition/purchase_requisition.py |  5 ++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 012bde42eff..e32dda862e4 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1416,9 +1416,15 @@ class account_invoice_line(osv.osv):
             result['account_id'] = a
 
         if type in ('out_invoice', 'out_refund'):
-            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             if res.taxes_id:
+                taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             else:
+                taxes = res.categ_id.taxes_id and res.categ_id.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         else:
-            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             if res.supplier_taxes_id:
+                taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             else:
+                taxes = res.categ_id.supplier_taxes_id and res.categ_id.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
         if type in ('in_invoice', 'in_refund'):
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 3ed3756a733..5f56ed366ac 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -59,7 +59,10 @@ class sale_order(osv.osv):
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)
 
-            taxes = grid.carrier_id.product_id.taxes_id
+            if grid.carrier_id.product_id.taxes_id:
+                taxes = grid.carrier_id.product_id.taxes_id
+            else:
+                taxes = grid.carrier_id.product_id.categ_id.taxes_id
             fpos = order.fiscal_position or False
             taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes)
             #create the sale order line
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index f4d133e967a..5351d59c077 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -98,7 +98,10 @@ class stock_picking(osv.osv):
             account_id = picking.carrier_id.product_id.categ_id\
                     .property_account_income_categ.id
 
-        taxes = picking.carrier_id.product_id.taxes_id
+        if picking.carrier_id.product_id.taxes_id:
+            taxes = picking.carrier_id.product_id.taxes_id
+        else:
+            taxes = picking.carrier_id.product_id.categ_id.taxes_id
         partner = picking.partner_id or False
         if partner:
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cf0294730a7..7ecbca5c57c 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -167,7 +167,10 @@ class purchase_requisition(osv.osv):
             for line in requisition.line_ids:
                 product = line.product_id
                 seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
-                taxes_ids = product.supplier_taxes_id
+                if product.supplier_taxes_id:
+                    taxes_ids = product.supplier_taxes_id
+                else:
+                    taxes_ids = product.categ_id.supplier_taxes_id
                 taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
                 purchase_order_line.create(cr, uid, {
                     'order_id': purchase_id,

From 1dd5177e11ca6effd4d38fb4fb16326a33bbdbb8 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 19:04:28 +0530
Subject: [PATCH 20/50] [IMP]

bzr revid: dhr@tinyerp.com-20120822133428-24wti3kz7lh469jh
---
 .../wizard/hr_timesheet_invoice_create.py             |  5 ++++-
 addons/point_of_sale/point_of_sale.py                 |  5 ++++-
 addons/sale/sale.py                                   |  5 ++++-
 addons/stock/stock.py                                 | 11 +++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 76314e1986a..f8c1c3d3149 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -115,7 +115,10 @@ class account_analytic_line(osv.osv):
                 else:
                     price = 0.0
 
-                taxes = product.taxes_id
+                if product.taxes_id:
+                    taxes = product.taxes_id
+                else:
+                    taxes = product.categ_id.taxes_id
                 tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
                 account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
                 if not account_id:
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 690d371e9db..6871f072cfd 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1108,7 +1108,10 @@ class pos_order_line(osv.osv):
         account_tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            taxes = line.product_id.taxes_id
+            if line.product_id.taxes_id:
+                taxes = line.product_id.taxes_id
+            else:
+                taxes = line.product_id.categ_id.taxes_id
             price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
             taxes = account_tax_obj.compute_all(cr, uid, line.product_id.taxes_id, price, line.qty, product=line.product_id, partner=line.order_id.partner_id or False)
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..ed5ac3d43f6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1382,7 +1382,10 @@ class sale_order_line(osv.osv):
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
         if update_tax: #The quantity only have changed
             result['delay'] = (product_obj.sale_delay or 0.0)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            if product_obj.taxes_id:
+                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            else:
+                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.categ_id.taxes_id)
             result.update({'type': product_obj.procure_method})
 
         if not flag:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b770712429c..7b65cc99847 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -915,9 +915,16 @@ class stock_picking(osv.osv):
         @return: Taxes Ids for the move line
         """
         if type in ('in_invoice', 'in_refund'):
-            taxes = move_line.product_id.supplier_taxes_id
+            if product_id.supplier_taxes_id:
+                taxes = move_line.product_id.supplier_taxes_id
+            else:
+                taxes = move_line.product_id.categ_id.supplier_taxes_id
         else:
-            taxes = move_line.product_id.taxes_id
+             if product_id.taxes_id:
+                taxes = move_line.product_id.taxes_id
+             else:
+                taxes = move_line.product_id.categ_id.taxes_id
+ 
 
         if move_line.picking_id and move_line.picking_id.partner_id and move_line.picking_id.partner_id.id:
             return self.pool.get('account.fiscal.position').map_tax(

From 73025425f065cb82bb171d5dd09f2569577727a0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 23 Aug 2012 10:41:20 +0530
Subject: [PATCH 21/50] [IMP]Tax related changes in mrp and pos

bzr revid: dhr@tinyerp.com-20120823051120-en7wvauuwgop2w26
---
 addons/mrp_repair/mrp_repair.py       | 5 ++++-
 addons/point_of_sale/point_of_sale.py | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f41abb58c08..c099679b87a 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -634,7 +634,10 @@ class ProductChangeMixin(object):
             product_obj = self.pool.get('product.product').browse(cr, uid, product)
             if partner_id:
                 partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
-                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, product_obj.taxes_id)
+                if product_obj.taxes_id:
+                    result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, product_obj.taxes_id)
+                else:
+                    result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, product_obj.categ_id.taxes_id)
 
             result['name'] = product_obj.partner_ref
             result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id or False
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 6871f072cfd..302c3a2cb71 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -967,7 +967,10 @@ class pos_order(osv.osv):
 
             for line in order.lines:
                 tax_amount = 0
-                taxes = [t for t in line.product_id.taxes_id]
+                if line.product_id.taxes_id:
+                    taxes = [t for t in line.product_id.taxes_id]
+                else:
+                    taxes = [t for t in line.product_id.categ_id.taxes_id]
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
 
                 for tax in computed_taxes:

From 39ac8404ffa3ae437c6544247af8916e8c8d8af3 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 23 Aug 2012 12:40:44 +0530
Subject: [PATCH 22/50] [IMP]Tax fix related to stock and pos

bzr revid: dhr@tinyerp.com-20120823071044-aonyui4dq2li8xnj
---
 addons/point_of_sale/point_of_sale.py | 11 +++++------
 addons/stock/stock.py                 |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 302c3a2cb71..fd9ce12251a 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -967,10 +967,7 @@ class pos_order(osv.osv):
 
             for line in order.lines:
                 tax_amount = 0
-                if line.product_id.taxes_id:
-                    taxes = [t for t in line.product_id.taxes_id]
-                else:
-                    taxes = [t for t in line.product_id.categ_id.taxes_id]
+                taxes = [t for t in line.product_id.taxes_id]
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
 
                 for tax in computed_taxes:
@@ -1147,8 +1144,10 @@ class pos_order_line(osv.osv):
         cur_obj = self.pool.get('res.currency')
 
         prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
-
-        taxes = prod.taxes_id
+        if prod.taxes_id:
+            taxes = prod.taxes_id
+        else:
+            taxes = prod.categ_id.taxes_id
         price = price_unit * (1 - (discount or 0.0) / 100.0)
         taxes = account_tax_obj.compute_all(cr, uid, prod.taxes_id, price, qty, product=prod, partner=False)
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7b65cc99847..36538175e27 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -915,12 +915,12 @@ class stock_picking(osv.osv):
         @return: Taxes Ids for the move line
         """
         if type in ('in_invoice', 'in_refund'):
-            if product_id.supplier_taxes_id:
+            if move_line.product_id.supplier_taxes_id:
                 taxes = move_line.product_id.supplier_taxes_id
             else:
                 taxes = move_line.product_id.categ_id.supplier_taxes_id
         else:
-             if product_id.taxes_id:
+             if move_line.product_id.taxes_id:
                 taxes = move_line.product_id.taxes_id
              else:
                 taxes = move_line.product_id.categ_id.taxes_id

From d67d8ebdd16fcbc22609f5443d20b47f9bad48cf Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 24 Aug 2012 18:08:26 +0530
Subject: [PATCH 23/50] [FIX]Fixed for  'Procurement Method' and  'Stock and
 Expected Variations' section should be hide for none type product

bzr revid: dhr@tinyerp.com-20120824123826-57g7ieosoyrjvpeo
---
 addons/product/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 49c4d5d1083..21206992044 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -86,7 +86,7 @@
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','in', ('service', 'consu'))]}"/>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','!=', 'product')]}"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 43647ee88c4..da46c345a4a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -136,7 +136,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible':[('type','in', ('service', 'consu'))]}">
+                    <group string="Stock and Expected Variations" attrs="{'invisible':[('type','!=', 'product')]}">
                         <label for="qty_available"/>
                         <div>
                             <field name="qty_available" class="oe_inline"/>

From 393b477ffe1576e9c034df04b0c92fb35c2d131b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 28 Aug 2012 14:07:32 +0200
Subject: [PATCH 24/50] [IMP] product form improvement

bzr revid: fp@tinyerp.com-20120828120732-e2wg7kst61swskxc
---
 addons/stock/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1efc552bfa6..3264057ae21 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -81,9 +81,9 @@
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                            <field name="property_stock_account_input" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
                                 domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_account_output" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                            <field name="property_stock_account_output" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
                                 domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         </group>
                     </group>

From 232a51901ca06cb5c8362820b32f8f0187f4427d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Aug 2012 14:39:06 +0200
Subject: [PATCH 25/50] [FIX] When drag&dropping a card in kanban view, the
 record is opened under Firefox.

bzr revid: fme@openerp.com-20120828123906-mc9pbcwb6tiv8da1
---
 addons/web_kanban/static/src/js/kanban.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 25d83b5c905..7a3c782f44b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -286,6 +286,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 start: function(event, ui) {
                     self.currently_dragging.index = ui.item.index();
                     self.currently_dragging.group = ui.item.parents('.oe_kanban_column:first').data('widget');
+                    ui.item.find('*').on('click.prevent', function(ev) {
+                        return false;
+                    });
                 },
                 stop: function(event, ui) {
                     var record = ui.item.data('widget');
@@ -296,6 +299,11 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                     if (!(old_group.title === new_group.title && old_group.value === new_group.value && old_index == new_index)) {
                         self.on_record_moved(record, old_group, old_index, new_group, new_index);
                     }
+                    setTimeout(function() {
+                        // A bit hacky but could not find a better solution for Firefox (problem not present in chrome)
+                        // http://stackoverflow.com/questions/274843/preventing-javascript-click-event-with-scriptaculous-drag-and-drop
+                        ui.item.find('*').off('click.prevent');
+                    }, 0);
                 },
                 scroll: false
             });

From 67ea7a40a440deb6589952934cac986fe24b4091 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Aug 2012 16:29:35 +0200
Subject: [PATCH 26/50] [FIX] State widget elements overlapping with dropdowns
 and menus

bzr revid: fme@openerp.com-20120828142935-pdq8zb74f665bznt
---
 addons/web/static/src/css/base.css  | 2 --
 addons/web/static/src/css/base.sass | 2 --
 2 files changed, 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 908d407380c..02a5c155476 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2001,7 +2001,6 @@
   padding-left: 24px;
   margin: 0;
   position: relative;
-  z-index: 10;
 }
 .openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow {
   width: 17px;
@@ -2012,7 +2011,6 @@
 }
 .openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span {
   position: relative;
-  z-index: 11;
   width: 24px;
   height: 24px;
   display: inline-block;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 52d54de3fbb..d3a04be28b8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1554,7 +1554,6 @@ $sheet-max-width: 860px
                 padding-left: 24px
                 margin: 0
                 position: relative
-                z-index: 10
             .arrow
                 width: 17px
                 display: inline-block
@@ -1563,7 +1562,6 @@ $sheet-max-width: 860px
                 margin-left: -5px
                 span 
                     position: relative
-                    z-index: 11
                     width: 24px
                     height: 24px
                     display: inline-block

From 03383c740854af038a8757fd6c6591793f18962f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Aug 2012 16:46:13 +0200
Subject: [PATCH 27/50] [IMP] If any attachment on a record, display 'X
 Attachment(s)' in sidebar

bzr revid: fme@openerp.com-20120828144613-6a47a4o5iwqb8t0o
---
 addons/web/static/src/js/views.js  | 2 +-
 addons/web/static/src/xml/base.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b37545fe2df..c608e662f0a 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -874,7 +874,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
         var view = this.getParent();
         this.sections = [
             { 'name' : 'print', 'label' : _t('Print'), },
-            { 'name' : 'files', 'label' : _t('Attachment'), },
+            { 'name' : 'files', 'label' : _t('Attachment(s)'), },
             { 'name' : 'other', 'label' : _t('More'), }
         ];
         this.items = {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 766aa7901ee..8478ffeda22 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -540,6 +540,7 @@
         <t t-foreach="widget.sections" t-as="section">
             <div class="oe_form_dropdown_section">
                 <button class="oe_dropdown_toggle oe_dropdown_arrow">
+                    <t t-if="section.name == 'files'" t-raw="widget.items[section.name].length || ''"/>
                     <t t-esc="section.label"/>
                 </button>
                 <ul class="oe_dropdown_menu">

From 715480a9de7ce7c05dc67bc02c108fa79251463c Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 28 Aug 2012 18:39:18 +0200
Subject: [PATCH 28/50] [FIX] mail alias: properly fetch inactive users

bzr revid: abo@openerp.com-20120828163918-7hexk4xtotqakobm
---
 addons/mail/mail_alias.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 70280e64a5d..5bcce0b8927 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -161,7 +161,7 @@ class mail_alias(osv.Model):
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
         child_class_model = registry.get(child_model_name)
-        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
+        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
         for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
             alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }

From 3ae5a108ab40ccbcd4c2a38302195c6c2df90583 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 28 Aug 2012 20:02:37 +0200
Subject: [PATCH 29/50] Restyling of project kanban view

bzr revid: mit@openerp.com-20120828180237-w14dhdufbx6dxc2i
---
 addons/project/project_view.xml           | 54 ++++++++++++++++-------
 addons/project/static/src/css/project.css | 39 +++++++++++-----
 2 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6dbcaebd045..6195ca909d2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -239,30 +239,52 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
+                                    <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value"
-                                            name="%(act_project_project_2_project_task_all)d" type="action">
-                                            Tasks(<field name="task_count"/>)</a>
-                                    </div>
-
-                                    <div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
-                                        <div>Deadline</div>
-                                        <div><field name="date"/></div>
-                                    </div>
-                                    <div class="oe_kanban_project_fields oe_kanban_project_progress">
-                                        <div>Progress</div>
-                                        <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
-                                    </div>
-                                    <div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">
-                                        <a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
+                                    <table>
+                                      <tr t-if="record.date.raw_value">
+                                        <th class="oe_kanban_project_fields oe_kanban_project_deadline">Deadline</th>
+                                        <td><field name="date"/></td>
+                                      </tr>
+                                      <tr class="oe_kanban_project_fields oe_kanban_project_progress">
+                                        <th>Progress</th>
+                                        <td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td>
+                                      </tr>
+                                    </table>
                                     <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
+
+                                    <!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>-->
+
+                                    <!--<div class="oe_kanban_project_list">-->
+                                        <!--<a t-if="record.use_tasks.raw_value"-->
+                                            <!--name="%(act_project_project_2_project_task_all)d" type="action">-->
+                                            <!--Tasks(<field name="task_count"/>)</a>-->
+                                    <!--</div>-->
+
+                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">-->
+                                        <!--<div>Deadline</div>-->
+                                        <!--<div><field name="date"/></div>-->
+                                    <!--</div>-->
+                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_progress">-->
+                                        <!--<div>Progress</div>-->
+                                        <!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>-->
+                                    <!--</div>-->
+                                    <!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">-->
+                                        <!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>-->
+                                    <!--</div>-->
+                                    <!--<div class="oe_kanban_project_avatars">-->
+                                        <!--<t t-foreach="record.members.raw_value" t-as="member">-->
+                                            <!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>-->
+                                        <!--</t>-->
+                                    <!--</div>-->
+
                                 </div>
                             </div>
                         </t>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ebab44e225a..51bb8f45ee9 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,23 +1,41 @@
+.oe_kanban_card {
+  margin: 2px;
+}
+
 .oe_kanban_project {
-    width: 300px;
+    width: 250px;
+    min-height: 160px;
 }
 .oe_kanban_project_list {
-    margin: 8px 0 8px 0;
+    margin: 4px 0;
 }
-/*.oe_kanban_project_list a:not(:first-child):before {
-    content: ' - ';
-}*/
-.oe_kanban_project_fields div {
-    display: inline-block;
-    width: 49%;
-    box-sizing: border-box;
-    padding: 2px 0 2px 0;
+
+.openerp .oe_kanban_content h4 {
+    margin: 0 0 8px;
 }
+
+.oe_kanban_content > table {
+    width: 100%;
+}
+
+.oe_kanban_content > table > th {
+    padding: 0;
+    border-right: 1px solid #DDD;
+    vertical-align: top;
+    font-weight: normal;
+}
+
+.oe_kanban_content > table > td {
+    padding: 2px 0 2px 8px;
+    color: #888;
+}
+
 .oe_kanban_project_fields div:nth-child(odd) {
     border-right: 1px solid #dddddd;
     vertical-align: top;
     padding-right: 8px;
 }
+
 .oe_kanban_project_fields div:nth-child(even) {
     padding-left: 8px;
     color: #888888;
@@ -27,6 +45,7 @@
     padding-top: 1em;
     margin-top: 8px;
 }
+
 .oe_kanban_project_avatars img {
     width: 30px;
     height: 30px;

From fcfa02f70050f4b16d286c0fa129170fea5709a1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 29 Aug 2012 05:05:32 +0000
Subject: [PATCH 30/50] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120829050532-9tyfsc8n79btqrv2
---
 addons/account_asset/i18n/nb.po               | 839 ++++++++++++++++++
 .../i18n/nb.po                                | 382 ++++++++
 addons/account_sequence/i18n/zh_TW.po         |   2 +-
 addons/account_voucher/i18n/zh_TW.po          |   2 +-
 addons/anonymization/i18n/nb.po               | 213 +++++
 addons/anonymization/i18n/zh_TW.po            | 213 +++++
 addons/association/i18n/nb.po                 | 144 +++
 addons/association/i18n/zh_TW.po              |   2 +-
 addons/base_iban/i18n/nb.po                   |  95 ++
 addons/base_tools/i18n/lt.po                  |  30 +
 addons/caldav/i18n/zh_TW.po                   |   2 +-
 addons/crm_caldav/i18n/zh_TW.po               |  33 +
 12 files changed, 1953 insertions(+), 4 deletions(-)
 create mode 100644 addons/account_asset/i18n/nb.po
 create mode 100644 addons/account_bank_statement_extensions/i18n/nb.po
 create mode 100644 addons/anonymization/i18n/nb.po
 create mode 100644 addons/anonymization/i18n/zh_TW.po
 create mode 100644 addons/association/i18n/nb.po
 create mode 100644 addons/base_iban/i18n/nb.po
 create mode 100644 addons/base_tools/i18n/lt.po
 create mode 100644 addons/crm_caldav/i18n/zh_TW.po

diff --git a/addons/account_asset/i18n/nb.po b/addons/account_asset/i18n/nb.po
new file mode 100644
index 00000000000..891a7979735
--- /dev/null
+++ b/addons/account_asset/i18n/nb.po
@@ -0,0 +1,839 @@
+# 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-28 14:30+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-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Eiendeler i utkastet og åpen stater"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Slutt dato"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "restverdi"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Avskr. utgiftskonto"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Beregn eiendel"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "bruttobeløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Eiendel"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Angir at den første avskrivninger oppføring for denne eiendelen må gjøres "
+"fra kjøpsdato i stedet for første januar"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Historie navn"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modifiser"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Løper"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "avskrivningsbeløpet"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "eiendeler Analyse"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Grunn"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "degressive faktor"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+"Denne veiviseren vil legge inn avskrivning linjer som kjører eiendeler som "
+"tilhører den valgte perioden."
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Inngang"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Avskrivninger linjer"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "det er mengden du har tenkt å ha du ikke kan avskrive."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Avskrivninger  Dato"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Eiendel Konto"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Skrevet Beløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "avskrivnings konto"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Avskrivnings Inngang"
+
+#. module: account_asset
+#: 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_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "Ant. Avskrivninger linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Eiendeler i utkast"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Sluttdato"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr "Konto Eiendel"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Beregn Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "Sekvens av svekkelsen"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Periode lengde"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Dato for kjøpsavtalen"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Beregner Avskrivninger innen angitt intervall"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Endre Varighet"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analytisk konto"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Beregningsmetoden"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Oppgi her tiden under 2 avskrivninger, i måneder."
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis kan bare brukes for tiden metoden \"antall avskrivninger\"."
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Metode for å beregne datoene og antall avskrivninger linjer.\n"
+"Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+"Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke gå "
+"utover."
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "Bruttoverdi "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "Feil! Du kan ikke lage rekrusive eiendeler."
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiden i måneden mellom to avskrivninger"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Endre eiendel"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Annen informasjon"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Restverdi"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Satt til Lukk."
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "Beregn eiendeler"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Endre eiendel."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Eiendeler i lukket tilstand"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "overordnede Eiendel"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Eiendel historie"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "Eiendeler som er kjøpt i inneværende år"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_asset
+#: 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 ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Avskrivninger Styret"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Elementer"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Ikke resultatført beløp"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "tid Metode"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: 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_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Velg metoden som skal brukes for å beregne mengden av avskrivninger linjer.\n"
+"* Lineær: Beregnet på grunnlag av: bruttoverdi / Antall Avskrivninger\n"
+"* Degressiv: Beregnet på grunnlag av: restverdi * degressiv faktor"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Velg metoden som skal brukes for å beregne datoene og antall avskrivninger "
+"linjer.\n"
+" * Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+" * Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke "
+"gå utover."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Eiendeler i rennende staten"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Størrelsen på avskrivningene linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Postet avskrivninger linjer"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Barn Eiendeler"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Dato av avskrivninger"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "Eiendeler som er kjøpt i inneværende måned"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Beregn"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Søk eiendel Kategori"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "eiendel.avskrivninger.bekreftelse.veiviseren"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Lukket eiendel"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "State av eiendel."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Avskrivninger Navn"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Historie"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Genrelt"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "Gjennomgå eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Avskrivningsmetode"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Kjøpsdato"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+"Velg den perioden du ønsker å automatisk legge inn avskrivninger linjer av "
+"kjører eiendeler."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Beløp å avskrive"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Hopp over Utkast stat"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "Avskrivninger datoer"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "Beløp Allerede Avskrives"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Lagt inn"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+"Når en eiendel er opprettet, er staten \"Kladd\".\n"
+"Dersom eiendelen er bekreftet, går staten i 'Running' og avskrivninger "
+"linjer kan bli lagt i regnskapssystemet.\n"
+"Du kan manuelt lukke et aktivum når avskrivningen er over. Hvis den siste "
+"linjen av avskrivninger er lagt ut, går eiendelen automatisk i den "
+"tilstanden."
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Sjekk dette hvis du ønsker å automatisk bekrefte eiendeler i denne "
+"kategorien når laget av fakturaer."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sett som utkast"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineær"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "Måned-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Eiendel avskrinings linje"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "Eiendeler som er kjøpt i forrige måned."
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Opprettet eiendel trekk."
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+"Fra denne rapporten, kan du ha en oversikt over alle avskrivninger. "
+"Verktøyet søk kan også brukes til å tilpasse dine eiendeler rapporter og så "
+"matche denne analysen til dine behov;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Angi tiden mellom to avskrivninger, i måneder"
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Antall Avskrivninger"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr "Innlegg Avskrivninger linjer"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Bekreft eiendel"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "Eiendel Hierarki."
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "Eiendel lengder å endre"
+
+#~ msgid "Analytic information"
+#~ msgstr "analytisk informasjon"
+
+#~ msgid "Accounting information"
+#~ msgstr "Regnskapsopplysninger"
diff --git a/addons/account_bank_statement_extensions/i18n/nb.po b/addons/account_bank_statement_extensions/i18n/nb.po
new file mode 100644
index 00000000000..a8ab466cee3
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/nb.po
@@ -0,0 +1,382 @@
+# 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-08-28 12:44+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-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Søk Bank Transaksjon"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "overordnede kode"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Avbryt valgte setning linjer"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Uttalelse"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Bank erklæring Balanserer Rapporter"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Avbryt linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Satsvis Betalingsinformasjon"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Bekreft linjer."
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Slett operasjonen ikke tillatt! Vennligst gå til den tilknyttede "
+"kontoutskrift for å slette og / eller endre denne kontoutskrift linjen."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Bekreftet erklæring linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Kreditt transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Avbryte utvalgte uttalelse linjer."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Motpart nummer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transaksjoner"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "glob Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Debet transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Bekreftet samband kan ikke lenger endres."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Valuta dato"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil avbryte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manuell"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Konto"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Motpart Valuta"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "Motpart BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Underordnet kode"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil bekrefte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: 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 ""
+"Mengden av bilaget må være det samme beløp som den på setningen linje"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Kode for å identifisere transaksjoner tilhører samme globalisering nivå "
+"innenfor en batch betaling"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Utkast linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob.Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Kode"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Motpartens navn"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Kommunikasjon"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: account_bank_statement_extensions
+#: 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_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Kontoutskrift"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "erklæring Linje"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Koden må være unik!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Kontoutskrift linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Underholdene Batch Betalinger."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Erklæring linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Totalt beløp"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalisering ID"
diff --git a/addons/account_sequence/i18n/zh_TW.po b/addons/account_sequence/i18n/zh_TW.po
index c9b4efee138..4a88a5a47a3 100644
--- a/addons/account_sequence/i18n/zh_TW.po
+++ b/addons/account_sequence/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 5a448af3e0c..e73d8e3cd81 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
diff --git a/addons/anonymization/i18n/nb.po b/addons/anonymization/i18n/nb.po
new file mode 100644
index 00000000000..4c3535f0ef9
--- /dev/null
+++ b/addons/anonymization/i18n/nb.po
@@ -0,0 +1,213 @@
+# 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-08-28 12:11+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-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.modell.felt.anonymisere.veiviseren"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Felt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importer"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.modell.felt.anonymisering"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Retning"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonymiserte Felter"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "klar -> anonymiseres"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymiseres"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "filbane"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Eksporter"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Reversere Database anonymisering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "anonymisere database"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Felter"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "fjerne"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Oppsummering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonymisert Felt"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Ustabil"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "unntak oppstod"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Eksisterer ikke"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektnavn"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonymisering Historie"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.modell.felt.anonymisering.historie"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonymisere Database"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Filnavn"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anonymisert -> klart"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Startet"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Beskjed"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Du kan ikke ha to felt med samme navn på samme objekt!"
diff --git a/addons/anonymization/i18n/zh_TW.po b/addons/anonymization/i18n/zh_TW.po
new file mode 100644
index 00000000000..250810cc11e
--- /dev/null
+++ b/addons/anonymization/i18n/zh_TW.po
@@ -0,0 +1,213 @@
+# 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:35+0000\n"
+"PO-Revision-Date: 2012-08-29 03:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@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-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "欄位名稱"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "匯入"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "方向"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "清楚->匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "匿名"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "物件"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "檔案路徑"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "匯出"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "回復資料庫匿名"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "清除"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "不穩定版"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "發生意外狀況"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "不存在"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "物件名稱"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "匿名紀錄"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "檔案名稱"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "匿名->清楚"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "開始"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "訊息"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "在同一個物件不能有二個相同名稱的欄位!"
diff --git a/addons/association/i18n/nb.po b/addons/association/i18n/nb.po
new file mode 100644
index 00000000000..7314a14d9ed
--- /dev/null
+++ b/addons/association/i18n/nb.po
@@ -0,0 +1,144 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 11:22+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-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "Arrangementsledelse"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Å få ting gjort"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Denne modulen er å skape profil for Tilknyttede."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurasjonsprosess"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Her er spesifikke programmer knyttet til foreningen profil du har valgt."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "tittel"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Hjelper deg å administrere og organisere hendelser."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Spor og styrer ansattes utgifter, og kan automatisk re-faktura klienter "
+"dersom utgiftene prosjekt-relatert."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD er en metode for å effektivt organisere deg selv og dine oppgaver. Denne "
+"modulen integrerer fullt GTD prinsippet med OpenERP prosjektledelse."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Ressurser ledelse"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Tilknytning profilen"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Utgift Sporing"
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr "Tilknytning applikasjon konfigurasjon"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+"Lar deg opprette wikisider og sidegrupper for å holde oversikt over "
+"virksomheten kunnskap og dele den med og mellom de ansatte."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Hjelper deg med å håndtere dine prosjekter og oppgaver ved å spore dem, "
+"generere planer, osv..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "Profil.foreningen.konfigurasjon.installere_moduler_veiviseren"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Arrangementer"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Prosjektledelse"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Konfigurer"
diff --git a/addons/association/i18n/zh_TW.po b/addons/association/i18n/zh_TW.po
index 16198a8a748..164f456dbee 100644
--- a/addons/association/i18n/zh_TW.po
+++ b/addons/association/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
diff --git a/addons/base_iban/i18n/nb.po b/addons/base_iban/i18n/nb.po
new file mode 100644
index 00000000000..ee8d4d1cc38
--- /dev/null
+++ b/addons/base_iban/i18n/nb.po
@@ -0,0 +1,95 @@
+# 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:36+0000\n"
+"PO-Revision-Date: 2012-08-28 13:04+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-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:139
+#, python-format
+msgid "This IBAN does not pass the validation check, please verify it"
+msgstr "Dette IBAN passer ikke valideringskontrollen, du bekrefte den."
+
+#. module: base_iban
+#: model:res.partner.bank.type,format_layout:base_iban.bank_iban
+msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
+msgstr "%(bank_navn)s: IBAN %(konto_nummer)s - BIC %(bank_bic)s"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bank_bic"
+msgstr "bank_bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Internasjonal bank kontonummer"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:136
+#, python-format
+msgid ""
+"The IBAN does not seem to be correct. You should have entered something like "
+"this %s"
+msgstr ""
+"IBAN synes ikke å være korrekt. Du bør ha angitt noe sånt som dette% s"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:140
+#, python-format
+msgid "The IBAN is invalid, it should begin with the country code"
+msgstr "IBAN er ugyldig, Det burde begynne med landskode"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Konto"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
diff --git a/addons/base_tools/i18n/lt.po b/addons/base_tools/i18n/lt.po
new file mode 100644
index 00000000000..005bf36218f
--- /dev/null
+++ b/addons/base_tools/i18n/lt.po
@@ -0,0 +1,30 @@
+# Lithuanian 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 13:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@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-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr ""
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
diff --git a/addons/caldav/i18n/zh_TW.po b/addons/caldav/i18n/zh_TW.po
index 6d6d628aef3..85e3b6b1468 100644
--- a/addons/caldav/i18n/zh_TW.po
+++ b/addons/caldav/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
diff --git a/addons/crm_caldav/i18n/zh_TW.po b/addons/crm_caldav/i18n/zh_TW.po
new file mode 100644
index 00000000000..e8d0560b9d9
--- /dev/null
+++ b/addons/crm_caldav/i18n/zh_TW.po
@@ -0,0 +1,33 @@
+# 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-29 02:56+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@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-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "行事曆瀏覽"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "同步行事曆"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "會議"

From 6c58d3b296d66b553578a8deeabf7f6cdcb353ee Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Aug 2012 10:19:25 +0200
Subject: [PATCH 31/50] [REM] Removed debugger

bzr revid: fme@openerp.com-20120829081925-jstohijacc121chz
---
 addons/web_calendar/static/src/js/calendar.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 9e2bdbd397f..c3a9a25745e 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -313,7 +313,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
     do_create_event_with_formdialog: function(event_id, event_obj) {
         var self = this;
         $.when(! self.form_dialog.dialog_inited ? self.form_dialog.init_dialog() : true).then(function() {
-            debugger;
             if (!event_obj) {
                 event_obj = scheduler.getEvent(event_id);
             }

From 9f1633e4a25d7a9d461815ad4aa51d5dc1e95bc2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 29 Aug 2012 11:36:06 +0200
Subject: [PATCH 32/50] todo

bzr revid: al@openerp.com-20120829093606-5oenal17oyhlvxeb
---
 addons/pad/pad.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 40569fcd589..3431e196b59 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -8,6 +8,11 @@ from tools.translate import _
 class pad_common(osv.osv_memory):
     _name = 'pad.common'
     _pad_fields = []
+
+    def pad_content(self, cr, uid, url ,context=None):
+        content = urllib2.urlopen('%s/export/html'%url).read()
+        return content
+
     def pad_generate_url(self, cr, uid, context=None):
         pad_url_template =  self.pool.get('res.users').browse(cr,uid, uid, context).company_id.pad_url_template
         s = string.ascii_uppercase + string.digits
@@ -20,6 +25,13 @@ class pad_common(osv.osv_memory):
         url = pad_url_template % template_vars
         return url
 
+    # TODO
+    # add attribute on columns pad_content_field = 
+    # override default write to load the content at write and store it in the field
+    # reverse engineer protocol to be setHtml without using the api key
+    # override default get to generate urls
+    # override read to generate url and store the content if empty
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}

From b745a2038ae21c52a1fa727d0a60859ebd2ee533 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 29 Aug 2012 12:23:00 +0200
Subject: [PATCH 33/50] [IMP] view_form remove used callback on do_save

bzr revid: al@openerp.com-20120829102300-0a1m4f237wbmqzv4
---
 addons/web/static/src/js/view_form.js         | 40 +++++++++++--------
 .../web/static/src/js/view_list_editable.js   |  2 +-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b64f34f3aaf..cd6bba0d298 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -689,7 +689,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     },
     on_button_save: function() {
         var self = this;
-        return this.do_save().then(function(result) {            
+        return this.do_save().then(function(result) {
             self.to_view_mode();
         });
     },
@@ -759,10 +759,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
      * record or saving an existing one depending on whether the record
      * already has an id property.
      *
-     * @param {Function} [success] callback on save success
-     * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new record, should that record be inserted at the start of the dataset (by default, records are added at the end)
+     * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new
+     * record, should that record be inserted at the start of the dataset (by
+     * default, records are added at the end)
      */
-    do_save: function(success, prepend_on_create) {
+    do_save: function(prepend_on_create) {
         var self = this;
         return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() {
             try {
@@ -797,21 +798,21 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 self.set({'display_invalid_fields': false});
                 var save_deferral;
                 if (!self.datarecord.id) {
-                    // console.log("FormView(", self, ") : About to create", values);
+                    // Creation save
                     save_deferral = self.dataset.create(values).pipe(function(r) {
-                        return self.on_created(r, undefined, prepend_on_create);
+                        return self.on_created(r, prepend_on_create);
                     }, null);
                 } else if (_.isEmpty(values) && ! self.force_dirty) {
-                    // console.log("FormView(", self, ") : Nothing to save");
+                    // Not dirty, noop save
                     save_deferral = $.Deferred().resolve({}).promise();
                 } else {
                     self.force_dirty = false;
-                    // console.log("FormView(", self, ") : About to save", values);
+                    // Write save
                     save_deferral = self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) {
                         return self.on_saved(r);
                     }, null);
                 }
-                return save_deferral.then(success);
+                return save_deferral;
             }
             } catch (e) {
                 console.error(e);
@@ -830,14 +831,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         warnings.push('</ul>');
         this.do_warn("The following fields are invalid :", warnings.join(''));
     },
-    on_saved: function(r, success) {
+    /**
+     * Reload the form after saving
+     *
+     * @param {Object} r result of the write function.
+     */
+    on_saved: function(r) {
         if (!r.result) {
             // should not happen in the server, but may happen for internal purpose
             return $.Deferred().reject();
         } else {
             return $.when(this.reload()).pipe(function () {
-                return r; })
-                    .then(success);
+                return r;
+            });
         }
     },
     /**
@@ -850,10 +856,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
      * * Updates the pager and sidebar displays
      *
      * @param {Object} r
-     * @param {Function} success callback to execute after having updated the dataset
-     * @param {Boolean} [prepend_on_create=false] adds the newly created record at the beginning of the dataset instead of the end
+     * @param {Boolean} [prepend_on_create=false] adds the newly created record
+     * at the beginning of the dataset instead of the end
      */
-    on_created: function(r, success, prepend_on_create) {
+    on_created: function(r, prepend_on_create) {
         if (!r.result) {
             // should not happen in the server, but may happen for internal purpose
             return $.Deferred().reject();
@@ -872,8 +878,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             }
             //openerp.log("The record has been created with id #" + this.datarecord.id);
             return $.when(this.reload()).pipe(function () {
-                return _.extend(r, {created: true}); })
-                    .then(success);
+                return _.extend(r, {created: true});
+            });
         }
     },
     on_action: function (action) {
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 37209ae1c00..65f5620c1a9 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -716,7 +716,7 @@ openerp.web.list_editable = function (instance) {
         save: function () {
             var self = this;
             return this.form
-                .do_save(null, this.delegate.prepends_on_create())
+                .do_save(this.delegate.prepends_on_create())
                 .pipe(function (result) {
                     var created = result.created && !self.record.id;
                     if (created) {

From 848c16e6d075f22270fb53247f29e08f02c8bb53 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Aug 2012 13:47:13 +0200
Subject: [PATCH 34/50] [ADD] Added 'open' action to kanban card links

bzr revid: fme@openerp.com-20120829114713-kj9c0vsxtn504li3
---
 addons/web_kanban/static/src/js/kanban.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 7a3c782f44b..ffec52e8b97 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -121,7 +121,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             case 'button':
             case 'a':
                 var type = node.attrs.type || '';
-                if (_.indexOf('action,object,edit,delete'.split(','), type) !== -1) {
+                if (_.indexOf('action,object,edit,open,delete'.split(','), type) !== -1) {
                     _.each(node.attrs, function(v, k) {
                         if (_.indexOf('icon,type,name,args,string,context,states,kanban_states'.split(','), k) != -1) {
                             node.attrs['data-' + k] = v;
@@ -827,6 +827,9 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
     do_action_edit: function($action) {
         this.view.open_record(this.id, true);
     },
+    do_action_open: function($action) {
+        this.view.open_record(this.id);
+    },
     do_action_object: function ($action) {
         var button_attrs = $action.data();
         this.view.do_execute_action(button_attrs, this.view.dataset, this.id, this.do_reload);

From d78cd0a57dee7e38686bcadc5c6496ca963d557c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Aug 2012 13:47:53 +0200
Subject: [PATCH 35/50] [IMP] Use 'open' action in kanban views

bzr revid: fme@openerp.com-20120829114753-s0rhr2jcb7qlvvfp
---
 openerp/addons/base/module/module_view.xml   | 2 +-
 openerp/addons/base/res/res_partner_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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_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>

From 6e80e425d1626d46c0f48054a5beb339fa1cd557 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Aug 2012 13:48:47 +0200
Subject: [PATCH 36/50] [IMP] Use 'open' action in kanban views

bzr revid: fme@openerp.com-20120829114847-dzvqs8gaas03ma5b
---
 addons/event/event_view.xml                               | 4 ++--
 addons/hr/hr_view.xml                                     | 4 ++--
 addons/mail/mail_group_view.xml                           | 4 ++--
 addons/portal_hr_employees/hr_employee_view.xml           | 2 +-
 addons/portal_project_issue/portal_project_issue_view.xml | 2 +-
 addons/stock/product_view.xml                             | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 27829129c15..dce96e4c3cf 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -244,7 +244,7 @@
                     <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette">
-                        <a type="edit" class="oe_module_icon">
+                        <a type="open" class="oe_module_icon">
                            <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
                            <div class="oe_event_month_year">
                              <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
@@ -253,7 +253,7 @@
                            <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
                         </a>
                         <div class="oe_module_desc">
-                            <h4><a type="edit"><field name="name"/></a></h4>
+                            <h4><a type="open"><field name="name"/></a></h4>
                             <p>
                               <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
                               <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0dcc675e665..99d7af027e9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -130,11 +130,11 @@
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
                             <div class="oe_employee_image">
-                                <a type="edit"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
+                                <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
                                 <h4>
-                                    <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                    <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                 </h4>
                                 <ul>
                                     <li id="last_login">
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index a71ec972326..d21d32a3893 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -25,10 +25,10 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette">
                                 <div class="oe_group_image">
-                                    <a type="edit"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
+                                    <a type="open"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
                                 </div>
                                 <div class="oe_group_details">
-                                    <h4><a type="edit"><field name="name"/></a></h4>
+                                    <h4><a type="open"><field name="name"/></a></h4>
                                     <ul>
                                         <!-- <li><field name="message_follower_count"/> member(s)</li> -->
                                         <li>
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index f36e2a4d2d8..dc1b1bae56c 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -38,7 +38,7 @@
                                         </div>
                                         <div class="oe_employee_details">
                                             <h4>
-                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                                <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                             </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 14e944ab32e..5d0b4ce081e 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -18,7 +18,7 @@
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content">
                                     <div>
-                                        <h1><a type="edit"><field name="name"/></a></h1>
+                                        <h1><a type="open"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>
                                         <field name="version_id"/>
                                     </div>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index f224f70b43d..477c458da02 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -212,10 +212,10 @@
                         <t t-name="kanban-box">
                             <div class="oe_product_vignette">
                                 <div class="oe_product_img">
-                                <a type="edit"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
+                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
                                 </div>
                                 <div class="oe_product_desc">
-                                    <h4><a type="edit"><field name="name"></field></a></h4>
+                                    <h4><a type="open"><field name="name"></field></a></h4>
                                     <ul>
                                         <li t-if="record.code.raw_value">Code: <field name="code"/></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>

From 588f233f15ce47e6ce381ed137ff8eefaa9f5ffc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 29 Aug 2012 14:38:33 +0200
Subject: [PATCH 37/50] wip part1 (no setHTML) working

bzr revid: al@openerp.com-20120829123833-4b9kp33d9ne2gyom
---
 addons/pad/pad.py                  | 58 ++++++++++++++++++++----------
 addons/pad/res_company.py          |  9 ++---
 addons/pad/res_company.xml         |  3 +-
 addons/pad/static/src/js/pad.js    | 10 ++----
 addons/pad/static/src/xml/pad.xml  |  5 +--
 addons/pad_project/project_task.py |  3 +-
 6 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 3431e196b59..6f6b435cf3c 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -1,42 +1,62 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 import random
+import re
 import string
 import urllib2
 from tools.translate import _
 
 class pad_common(osv.osv_memory):
     _name = 'pad.common'
-    _pad_fields = []
-
-    def pad_content(self, cr, uid, url ,context=None):
-        content = urllib2.urlopen('%s/export/html'%url).read()
-        return content
 
     def pad_generate_url(self, cr, uid, context=None):
-        pad_url_template =  self.pool.get('res.users').browse(cr,uid, uid, context).company_id.pad_url_template
+        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.startswith('http'):
+            pad_server = 'http://' + pad_server
+        pad_server = pad_server.rstrip('/')
+        # generate a salt
         s = string.ascii_uppercase + string.digits
-        salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(8)])
-        template_vars = {
-            'db' : cr.dbname,
-            'model' : self._name,
-            'salt' : salt,
-        }
-        url = pad_url_template % template_vars
+        salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(10)])
+        # contruct the url
+        url = '%s/p/%s-%s-%s' % (pad_server, cr.dbname, self._name, salt)
         return url
 
+    def pad_get_content(self, cr, uid, url, context=None):
+        content = ''
+        if url:
+            page = urllib2.urlopen('%s/export/html'%url).read()
+            mo = re.search('<body>(.*)</body>',page)
+            if mo:
+                content = mo.group(1)
+        return content
+
     # TODO
-    # add attribute on columns pad_content_field = 
-    # override default write to load the content at write and store it in the field
     # reverse engineer protocol to be setHtml without using the api key
-    # override default get to generate urls
-    # override read to generate url and store the content if empty
+    # override read and copy to generate url and store the content if empty
+
+    def default_get(self, cr, uid, fields, context=None):
+        data = super(pad_common, self).default_get(cr, uid, fields, context)
+        for k in fields:
+            field = self._all_columns[k].column
+            if hasattr(field,'pad_content_field'):
+                data[k] = self.pad_generate_url(cr, uid, context=context)
+        return data
+
+    def write(self, cr, uid, ids, vals, context=None):
+        for k,v in vals.items():
+            field = self._all_columns[k].column
+            if hasattr(field,'pad_content_field'):
+                vals[field.pad_content_field] = self.pad_get_content(cr, uid, v, context=context)
+        return super(pad_common, self).write(cr, uid, ids, vals, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        update = [(field,self.pad_generate_url(cr, uid, context)) for field in self._pad_fields]
-        default.update(update)
+        for k,v in self._all_columns:
+            field = v.column
+            if hasattr(field,'pad_content_field'):
+                default[k] = self.pad_generate_url(cr, uid, context)
         return super(pad_common, self).copy(cr, uid, id, default, context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py
index 703e655219b..fcf8bc97e91 100644
--- a/addons/pad/res_company.py
+++ b/addons/pad/res_company.py
@@ -1,16 +1,11 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-DEFAULT_PAD_TEMPLATE = 'http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s'
-DEFAULT_PAD_TEMPLATE = ''
-
 class company_pad(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'pad_url_template': fields.char('Pad URL Template', size=128, required=True, help="Template used to generate pad URL."),
-    }
-    _defaults = {
-        'pad_url_template': DEFAULT_PAD_TEMPLATE,
+        'pad_server': fields.char('Pad Server', help="Etherpad lite server. Example: beta.primarypad.com"),
+        'pad_key': fields.char('Pad Api Key', help="Etherpad lite api key."),
     }
 
 
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 017561aaec3..5a9164db2f4 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -7,7 +7,8 @@
       <field name="arch" type="xml">
         <xpath expr="//group[@name='account_grp']" position="after">
             <group string="Pads">
-                <field name="pad_url_template" placeholder="e.g. http://beta.etherpad.org/p/%%(db)s-%%(model)s-%%(salt)s"/>
+                <field name="pad_server" placeholder="e.g. beta.primarypad.org"/>
+                <field name="pad_key"/>
             </group>
         </xpath>
       </field>
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index a295e860a51..511400bcede 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -16,14 +16,8 @@ instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
         var self = this;
         var _super = self._super;
         _super.apply(self,[val]);
-        if (val === false || val === "") {
-            self.field_manager.dataset.call('pad_generate_url').then(function(r) {
-                _super.apply(self,[r]);
-                self.render_value();
-            });
-        } else {
-            self.render_value();
-        }
+        this._dirty_flag = true;
+        self.render_value();
     },
     render_value: function() {
         console.log("display");
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index 58266a2594a..e84414dd4e8 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -12,9 +12,6 @@
 </t>
 <t t-name="FieldPad.unconfigured">
     Please configure your etherpad server.<br/>
-    OpenERP Entreprise customers may safely use pad.openerp.com as a server using the following template:<br/>
-    <blockquote>
-    http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s
-    </blockquote>
+    OpenERP Entreprise customers may safely use pad.openerp.com<br/>
 </t>
 </templates>
diff --git a/addons/pad_project/project_task.py b/addons/pad_project/project_task.py
index 513fc3fef5d..6ebebae97fd 100644
--- a/addons/pad_project/project_task.py
+++ b/addons/pad_project/project_task.py
@@ -5,7 +5,6 @@ from osv import fields, osv
 class task(osv.osv):
     _name = "project.task"
     _inherit = ["project.task",'pad.common']
-    _pad_fields = ['description_pad']
     _columns = {
-        'description_pad': fields.char('Description PAD', size=250)
+        'description_pad': fields.char('Description PAD', pad_content_field='description')
     }

From ba7aee832d999b940c1139218d6966db660510fe Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Aug 2012 17:37:56 +0200
Subject: [PATCH 38/50] [IMP] Support for classnames in m2o autocomplete

Also improved readability of code

bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy
---
 addons/web/static/src/css/base.css    |  7 +++++
 addons/web/static/src/css/base.sass   |  6 ++++
 addons/web/static/src/js/view_form.js | 42 +++++++++++++++++----------
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 02a5c155476..41a1bdf26fd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2399,6 +2399,13 @@
   float: right;
   padding-left: 2px;
 }
+.openerp.ui-autocomplete li.oe_m2o_dropdown_option a {
+  font-style: italic;
+  padding-left: 2em;
+}
+.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
+  margin-top: 10px;
+}
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d3a04be28b8..173dd551056 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1851,6 +1851,12 @@ $sheet-max-width: 860px
             line-height: 14px
             float: right
             padding-left: 2px
+    &.ui-autocomplete
+        li.oe_m2o_dropdown_option a
+            font-style: italic
+            padding-left: 2em
+        li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option
+            margin-top: 10px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index cd6bba0d298..935413a3083 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2563,7 +2563,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
     }
 });
 
-// jquery autocomplete tweak to allow html
+// jquery autocomplete tweak to allow html and classnames
 (function() {
     var proto = $.ui.autocomplete.prototype,
         initSource = proto._initSource;
@@ -2590,7 +2590,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
             return $( "<li></li>" )
                 .data( "item.autocomplete", item )
                 .append( $( "<a></a>" )[ this.options.html ? "html" : "text" ]( item.label ) )
-                .appendTo( ul );
+                .appendTo( ul )
+                .addClass(item.classname);
         }
     });
 })();
@@ -2630,25 +2631,36 @@ instance.web.form.CompletionFieldMixin = {
             // search more... if more results that max
             if (values.length > self.limit) {
                 values = values.slice(0, self.limit);
-                values.push({label: _t("<em>   Search More...</em>"), action: function() {
-                    dataset.name_search(search_val, self.build_domain(), 'ilike'
-                    , false, function(data) {
-                        self._search_create_popup("search", data);
-                    });
-                }});
+                values.push({
+                    label: _t("Search More..."),
+                    action: function() {
+                        dataset.name_search(search_val, self.build_domain(), 'ilike', false, function(data) {
+                            self._search_create_popup("search", data);
+                        });
+                    },
+                    classname: 'oe_m2o_dropdown_option'
+                });
             }
             // quick create
             var raw_result = _(data.result).map(function(x) {return x[1];});
             if (search_val.length > 0 && !_.include(raw_result, search_val)) {
-                values.push({label: _.str.sprintf(_t('<em>   Create "<strong>%s</strong>"</em>'),
-                        $('<span />').text(search_val).html()), action: function() {
-                    self._quick_create(search_val);
-                }});
+                values.push({
+                    label: _.str.sprintf(_t('Create "<strong>%s</strong>"'),
+                        $('<span />').text(search_val).html()),
+                    action: function() {
+                        self._quick_create(search_val);
+                    },
+                    classname: 'oe_m2o_dropdown_option'
+                });
             }
             // create...
-            values.push({label: _t("<em>   Create and Edit...</em>"), action: function() {
-                self._search_create_popup("form", undefined, self._create_context(search_val));
-            }});
+            values.push({
+                label: _t("Create and Edit..."),
+                action: function() {
+                    self._search_create_popup("form", undefined, self._create_context(search_val));
+                },
+                classname: 'oe_m2o_dropdown_option'
+            });
 
             return values;
         });

From 3053d26382676fb56e88e42dc5410cab3b9d9da2 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 29 Aug 2012 17:45:35 +0200
Subject: [PATCH 39/50] fixed project_timesheet with the new project xml

bzr revid: mit@openerp.com-20120829154535-z3qr72o9usnt9piv
---
 addons/project/project_view.xml                 |  4 ++--
 .../project_timesheet_view.xml                  | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6195ca909d2..4444d71d614 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -245,8 +245,8 @@
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
                                     <table>
-                                      <tr t-if="record.date.raw_value">
-                                        <th class="oe_kanban_project_fields oe_kanban_project_deadline">Deadline</th>
+                                      <tr class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
+                                        <th>Deadline</th>
                                         <td><field name="date"/></td>
                                       </tr>
                                       <tr class="oe_kanban_project_fields oe_kanban_project_progress">
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c47c411f6c9..e137c88c6a9 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -17,13 +17,16 @@
                     <a t-if="record.use_timesheets.raw_value"
                         name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
                 </xpath>
-                <xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
-                    <div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
-                        <div>Amount to invoice</div>
-                        <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
-                        <div>Time to Invoice</div>
-                        <div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
-                    </div>
+                <xpath expr="//tr[contains(@class, 'oe_kanban_project_deadline')]" position="before">
+
+                    <tr class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
+                        <th>Amount to invoice</th>
+                        <td><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></td>
+                    </tr>
+                    <tr class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
+                        <th>Time to Invoice</th>
+                        <td><field name="time_to_invoice"/> <field name="company_uom_id"/></td>
+                    </tr>
                 </xpath>
             </field>
         </record>

From d0261477f833a84201c526cf76ca432b864c4f50 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 29 Aug 2012 21:08:19 +0200
Subject: [PATCH 40/50] [IMP] CSS improvement

bzr revid: fp@tinyerp.com-20120829190819-gl2q4d0d0xsbh2l3
---
 addons/web/static/src/css/base.css  | 8 +++++++-
 addons/web/static/src/css/base.sass | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 41a1bdf26fd..c28c12bf224 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -69,6 +69,7 @@
     display: none !important;
   }
 }
+
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -84,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;
@@ -1949,6 +1950,11 @@
   margin: 0 auto;
   padding: 16px 0 48px;
 }
+.openerp .oe_form .oe_grey {
+  color: #aaaaaa;
+  max-width: 650px;
+  margin: 0 0 10px 0;
+}
 .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
   margin: 12px 0 8px 0;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 173dd551056..92150ad687b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1516,6 +1516,10 @@ $sheet-max-width: 860px
             max-width: $sheet-max-width
             margin: 0 auto
             padding: 16px 0 48px
+        .oe_grey
+            color: #aaa
+            max-width: 650px
+            margin: 0 0 10px 0
         div.oe_form_configuration
             div.oe_horizontal_separator 
                 margin: 12px 0 8px 0

From 254489e168e060f789f02d17453ce34fef7fb9cc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 29 Aug 2012 21:08:31 +0200
Subject: [PATCH 41/50] [IMP] analytic contracts

bzr revid: fp@tinyerp.com-20120829190831-f6n1ruzsca2bo8xc
---
 .../account_analytic_analysis/__openerp__.py  |  3 +
 .../account_analytic_analysis.py              |  4 +-
 .../account_analytic_analysis_view.xml        | 83 ++++++++++++-------
 .../static/src/css/Makefile                   |  3 +
 .../static/src/css/analytic.css               | 15 ++++
 .../static/src/css/analytic.sass              | 15 ++++
 addons/analytic/analytic.py                   |  6 +-
 addons/analytic/analytic_view.xml             | 34 ++++----
 .../analytic_contract_hr_expense_view.xml     | 19 +++--
 .../analytic_contract_project_view.xml        |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  6 +-
 addons/project/project_view.xml               |  6 +-
 addons/project_issue/project_issue_view.xml   |  6 +-
 13 files changed, 133 insertions(+), 69 deletions(-)
 create mode 100644 addons/account_analytic_analysis/static/src/css/Makefile
 create mode 100644 addons/account_analytic_analysis/static/src/css/analytic.css
 create mode 100644 addons/account_analytic_analysis/static/src/css/analytic.sass

diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 7a4e5d519bb..40b67289fb1 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -40,6 +40,9 @@ Adds menu to show relevant information to each manager.You can also view the rep
         'account_analytic_analysis_menu.xml',
         'account_analytic_analysis_cron.xml',
     ],
+    'css': [
+        'static/src/css/analytic.css'
+    ],
     'demo': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index c84b311f307..1b4da45c30f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -451,8 +451,8 @@ class account_analytic_account(osv.osv):
         'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
-        'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
-        'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
+        'fix_price_invoices' : fields.boolean('Fixed Price'),
+        'invoice_on_timesheets' : fields.boolean("On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
         'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index cd043749309..63a8e6c7add 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -22,30 +22,27 @@
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
-                        <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/> 
+                        <field name="quantity_max" class="oe_inline"/>
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
-                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
-                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                    </group>
                 </xpath>
-                <xpath expr='//group[@name="master"]' position='after'>
+                <xpath expr='//separator[@name="description"]' position='before'>
                     <separator name="toinvoice" string="Invoicing"/>
-                    <table width="100%%">
+                    <table class="oe_form_analytic_account">
                         <tr>
-                            <th></th>
-                            <th></th>
-                            <th><label string="Est.Tot"/></th>
-                            <th><label string="Invoiced"/></th>
-                            <th><label string="Remaining"/></th>
-                            <th><label string="To Invoice"/></th>
+                            <th class="oe_grey" width="160px"></th>
+                            <th class="oe_grey" width="25px"></th>
+                            <th class="oe_grey" width="100px"><label string="Expected"/></th>
+                            <th class="oe_grey" width="100px"><label string="Invoiced"/></th>
+                            <th class="oe_grey" width="100px"><label string="Remaining"/></th>
+                            <th class="oe_grey" width="100px"><label string="To Invoice"/></th>
+                            <th width="30px"></th>
                             <th></th>
                         </tr><tr>
-                            <td>
+                            <td class="oe_grey">
                                 <label for="fix_price_invoices"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
                                 <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
@@ -56,13 +53,22 @@
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td>
-                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
-                            <td>
-                                <label for="invoice_on_timesheets"/>
+                                <button name="open_sale_order_lines"
+                                    class="oe_link oe_e"
+                                    string="/" type="object"
+                                    context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"
+                                    attrs="{'invisible': [('fix_price_to_invoice','=',0)]}"/>
                             </td><td>
+                                <button name="%(action_sales_order)d" string="Sale Orders"
+                                    type="action"
+                                    class="oe_link"
+                                    context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
+                                    attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td>
+                        </tr><tr>
+                            <td class="oe_grey">
+                                <label for="invoice_on_timesheets"/>
+                            </td><td class="oe_grey">
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -73,25 +79,44 @@
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
+                                    type="action"
+                                    class="oe_link oe_e"
+                                    string="/"
+                                    attrs="{'invisible': [('ca_to_invoice','=',0.0)]}"/>
+
+                            </td><td>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
+                                    string="Timesheets" type="action"
+                                    class="oe_link"
+                                    attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"
+                                    context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                             </td>
                         </tr><tr name='total'>
-                            <th>
+                            <th class="oe_grey">
                                 <label string="Total"/>
-                            </th><td>
-                            </td><td>
+                            </th><td class="oe_grey">
+                            </td><td class="oe_grey">
                                 <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="invoiced_total" class="oe_inline"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="remaining_total" class="oe_inline"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
                         </tr>
                     </table>
+                    <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <field name="pricelist_id"
+                            class="oe_inline"
+                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice"
+                            class="oe_inline"
+                            widget="selection"
+                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                    </group>
                  </xpath>
             </field>
         </record>
diff --git a/addons/account_analytic_analysis/static/src/css/Makefile b/addons/account_analytic_analysis/static/src/css/Makefile
new file mode 100644
index 00000000000..21462c06dcc
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/Makefile
@@ -0,0 +1,3 @@
+analytic.css: analytic.sass
+	sass -t expanded analytic.sass analytic.css
+
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.css b/addons/account_analytic_analysis/static/src/css/analytic.css
new file mode 100644
index 00000000000..c6513cc6321
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/analytic.css
@@ -0,0 +1,15 @@
+@charset "utf-8";
+.openerp .oe_form table.oe_form_analytic_account tr {
+  height: 28px;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td, .openerp .oe_form table.oe_form_analytic_account tr th {
+  vertical-align: middle;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td .oe_form_field_float, .openerp .oe_form table.oe_form_analytic_account tr th .oe_form_field_float {
+  float: right;
+  width: auto !important;
+}
+.openerp .oe_form table.oe_form_analytic_account .oe_grey {
+  background-color: #eeeeee;
+  color: #404040;
+}
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.sass b/addons/account_analytic_analysis/static/src/css/analytic.sass
new file mode 100644
index 00000000000..1db81fb61b9
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/analytic.sass
@@ -0,0 +1,15 @@
+@charset "utf-8"
+
+.openerp .oe_form
+    table.oe_form_analytic_account
+        tr
+            height: 28px
+            td,th
+                vertical-align: middle
+                .oe_form_field_float
+                    float: right
+                    width: auto !important
+        .oe_grey
+            background-color: #eeeeee
+            color: #404040
+        
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 3231b1e6d95..7eeb9266e47 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -153,9 +153,9 @@ class account_analytic_account(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Account Name', size=128, required=True),
+        'name': fields.char('Account/Contract Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
-        'code': fields.char('Code/Reference', size=24, select=True),
+        'code': fields.char('Reference', size=24, select=True),
         'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, 
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
@@ -171,7 +171,7 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
+        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract.'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 16100e73fff..c1e59cf3ba3 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -10,33 +10,35 @@
                     <sheet string="Analytic Account">
                         <label for="name" class="oe_edit_only"/>
                         <h1>
-                            <field name="name"/>
+                            <field name="name" class="oe_inline"/>
                         </h1>
+                        <div name="project"/>
                         <group>
                             <group>
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
-                                <field name="type"/>
-                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                                <field name="manager_id"/>
+                                <field name="code"/>
                             </group>
                             <group>
-                                <field name="code"/>
-                                <field name="manager_id"/>
+                                <field name="type"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>
                         <notebook>
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
-                                <group name="master">
-                                    <group string="Validity" name="contract">
-                                        <label for="date_start" string="Duration"/>
-                                        <div name="duration">
-                                            <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
-                                        </div>
-                                    </group>
-                                    <group name="project">
-                                        <separator string="Project Management" name="project_sep" invisible="1"/>
-                                    </group>
+                                <group string="Renewal" name="contract">
+                                    <p colspan="2" class="oe_grey oe_edit_only">
+                                        Once the end date of the contract is
+                                        passed or the maximum number of service
+                                        units is reached, the account manager
+                                        is warned by email to renew the contract.
+                                    </p>
+                                    <label for="date" string="End Date"/>
+                                    <div name="duration">
+                                        <field name="date" class="oe_inline"/>
+                                    </div>
                                 </group>
                                 <separator string="Terms and Conditions" name="description"/>
                                 <field name="description"/>
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 2869eaed86d..8d0f470df86 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -5,12 +5,13 @@
             <field name="name">account.analytic.account.form.expense.inherit</field>
             <field name="model">account.analytic.account</field>
             <field eval="60" name="priority"/>
+            <field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
                     <tr>
-                        <td>
+                        <td class="oe_grey">
                             <label for="charge_expenses"/>
-                        </td><td>
+                        </td><td class="oe_grey">
                             <field name="charge_expenses"/>
                         </td><td>
                             <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
@@ -21,10 +22,16 @@
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <group>
-                                <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                                <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                            </group>
+                            <button
+                                name="hr_to_invoice_expense"
+                                class="oe_link oe_e"
+                                string="/" type="object"
+                                attrs="{'invisible': [('expense_to_invoice','=',0)]}"/>
+                        </td><td>
+                            <button
+                                name="open_hr_expense"
+                                class="oe_link"
+                                string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td>
                     </tr>
                 </xpath>
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 84f01e19643..ad897efdfe3 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -118,7 +118,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="priority">50</field>
             <field name="arch" type="xml">
-                <xpath expr='//field[@name="remaining_hours"]' position='after'>
+                <xpath expr='//field[@name="quantity_max"]' position='after'>
                     <field name="company_uom_id" readonly="1" class="oe_inline"/>
                 </xpath>
             </field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d364d605b5f..6ece274fea1 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -83,11 +83,9 @@
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <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_timesheets"/>
+                    <label for="use_timesheets"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4444d71d614..1eae4018d25 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -688,11 +688,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 colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_tasks"/>
+                    <label for="use_tasks"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b37cf40014e..203432ab19d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -393,11 +393,9 @@
             <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_issues"/>
+                    <label for="use_issues"/>
                 </xpath>
             </field>
         </record>

From 6e943465be4c6df2a356b93e7be8a1da4eb8d74f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 29 Aug 2012 21:12:43 +0200
Subject: [PATCH 42/50] imp_css

bzr revid: fp@tinyerp.com-20120829191243-zmgsqb8twjcwzx02
---
 addons/web/static/src/css/base.css  | 5 +----
 addons/web/static/src/css/base.sass | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c28c12bf224..06a37a54727 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1955,9 +1955,6 @@
   max-width: 650px;
   margin: 0 0 10px 0;
 }
-.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
-  margin: 12px 0 8px 0;
-}
 .openerp .oe_form div.oe_form_configuration p {
   color: #aaaaaa;
   max-width: 650px;
@@ -2191,7 +2188,7 @@
 .openerp .oe_horizontal_separator {
   font-weight: bold;
   font-size: 20px;
-  margin: 8px 0px 8px 0px;
+  margin: 15px 0px 10px 0px;
   color: #7c7bad;
 }
 .openerp .oe_horizontal_separator:empty {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 92150ad687b..c238ef6ee07 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1521,8 +1521,6 @@ $sheet-max-width: 860px
             max-width: 650px
             margin: 0 0 10px 0
         div.oe_form_configuration
-            div.oe_horizontal_separator 
-                margin: 12px 0 8px 0
             p
                 color: #aaa
                 max-width: 650px
@@ -1681,7 +1679,7 @@ $sheet-max-width: 860px
     .oe_horizontal_separator
         font-weight: bold
         font-size: 20px
-        margin: 8px 0px 8px 0px
+        margin: 15px 0px 10px 0px
         color: $section-title-color
     .oe_horizontal_separator:empty
         height: 5px

From b065d54d96ecd60e7dddb3baefdc69136cac3df6 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 30 Aug 2012 05:12:21 +0000
Subject: [PATCH 43/50] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120830051221-904da3tt7dpfmhlx
---
 addons/account_payment/i18n/zh_TW.po   |   28 +-
 addons/anonymization/i18n/zh_TW.po     |    2 +-
 addons/crm/i18n/zh_TW.po               | 1124 +++++++++++++-----------
 addons/crm_caldav/i18n/zh_TW.po        |    2 +-
 addons/crm_claim/i18n/zh_TW.po         |  299 ++++---
 addons/crm_profiling/i18n/zh_TW.po     |   36 +-
 addons/crm_todo/i18n/zh_TW.po          |   95 ++
 addons/decimal_precision/i18n/zh_TW.po |    8 +-
 addons/document_ftp/i18n/zh_TW.po      |  116 +++
 addons/event/i18n/zh_TW.po             |   10 +-
 addons/event_project/i18n/zh_TW.po     |   24 +-
 addons/import_sugarcrm/i18n/de.po      |  429 +++++++++
 12 files changed, 1440 insertions(+), 733 deletions(-)
 create mode 100644 addons/crm_todo/i18n/zh_TW.po
 create mode 100644 addons/document_ftp/i18n/zh_TW.po
 create mode 100644 addons/import_sugarcrm/i18n/de.po

diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 3bd4cdf9a27..ebdc6e63f7c 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-29 15:27+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:20+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
@@ -24,7 +24,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr "伙伴貨幣"
+msgstr "業務夥伴貨幣"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -40,7 +40,7 @@ msgstr "選取要應用之付款模式。"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -84,7 +84,7 @@ msgstr "首選日期"
 #. module: account_payment
 #: model:res.groups,name:account_payment.group_account_payment
 msgid "Accounting / Payments"
-msgstr ""
+msgstr "會計/付款"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -111,7 +111,7 @@ msgstr "到期日"
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "會計分錄明細"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -222,7 +222,7 @@ msgstr ""
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -307,7 +307,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "選擇要付款的發票"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -329,12 +329,12 @@ msgstr "通訊類型"
 #: field:payment.mode,partner_id:0
 #: report:payment.order:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "銀行對帳單明細"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -399,7 +399,7 @@ msgstr "付款類型"
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr "以伙伴貨幣計算之付款總額"
+msgstr "以業務夥伴貨幣計算之付款總額"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -441,7 +441,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: account_payment
 #: field:account.payment.populate.statement,lines:0
@@ -504,7 +504,7 @@ msgstr "匯入付款明細"
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr "要付總額"
+msgstr "應付總額"
 
 #. module: account_payment
 #: field:payment.line,amount:0
diff --git a/addons/anonymization/i18n/zh_TW.po b/addons/anonymization/i18n/zh_TW.po
index 250810cc11e..c0ed7441c80 100644
--- a/addons/anonymization/i18n/zh_TW.po
+++ b/addons/anonymization/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index 68bb94a2ba2..fe6c76a3ce7 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.po
@@ -7,19 +7,19 @@ 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: 2011-09-27 07:26+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 02:54+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:06+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "潛在客戶數"
+msgstr "潛在客戶"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
@@ -35,22 +35,22 @@ msgstr "需要服務"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "每月"
+msgstr "月度"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "個案階段"
+msgstr "業務階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr "可見性"
+msgstr "可視等級"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -60,17 +60,17 @@ msgstr "顯示為"
 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "月份日期"
+msgstr "每月的指定日期"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Today"
-msgstr "今日"
+msgstr "今天"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "選擇機會"
+msgstr "選擇商機"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
@@ -81,18 +81,18 @@ msgstr " "
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "關閉延遲時間"
+msgstr "延遲關閉"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr "上階段"
+msgstr "前一階段"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"
-msgstr "無法添加記事！"
+msgstr "無法添加備註!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -102,7 +102,7 @@ msgstr "階段名稱"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM 潛在客戶分析"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -113,34 +113,34 @@ msgstr "日"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr "業務團隊代號不能重覆！"
+msgstr "銷售團隊編碼必須唯一！"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:553
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "潛在客戶「%s」已轉為機會。"
+msgstr "潛在客戶'%s'已轉化為商機"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr "業務機會「%s」已關閉。"
+msgstr "潛在客戶 '%s' 已關閉."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "預計成交日期"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "每年"
+msgstr "年度"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "報告日期"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -150,29 +150,29 @@ msgstr "規則名稱"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr "推廣"
+msgstr "行銷活動"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr "搜尋機會"
+msgstr "搜尋商機"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "預計成交月份"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "分配的機會"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -190,41 +190,41 @@ msgstr ""
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: crm
 #: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr "組織者"
+msgstr "召集人"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr "安排其他致電"
+msgstr "安排其它電訪"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:216
 #: model:crm.case.categ,name:crm.categ_meet3 view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "不參加"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "反覆終止"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr "「%s」機會已標為丟失。"
+msgstr "商機 '%s' 已失."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -234,26 +234,27 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"潛在客戶分析允許你檢查CRM的相關訊息，檢查耽擱的處理，送出及回覆的郵件數量。你能整理出對不同群體的潛在客戶分析去獲得更準確的細粒度分析。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新的電子郵件"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "準則"
+msgstr "條件"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr ""
+msgstr "已排除的答案 :"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -270,13 +271,13 @@ msgstr "潛在客戶分析"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "公開"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr "推廣活動"
+msgstr "行銷活動"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,state:0 view:crm.lead.report:0
@@ -284,7 +285,7 @@ msgstr "推廣活動"
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -296,30 +297,30 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: crm
 #: help:crm.lead,optout:0
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
-msgstr ""
+msgstr "如果勾選不參加，代表此聯絡人拒絕收到郵件或不參加行銷活動。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "展望伙伴"
+msgstr "潛在業務夥伴"
 
 #. module: crm
 #: 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
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -327,7 +328,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr "連結至既有伙伴"
+msgstr "連結到現有的業務夥伴"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
@@ -335,58 +336,58 @@ msgstr "連結至既有伙伴"
 #: field:crm.phonecall,partner_contact:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯絡方式"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr "委託"
+msgstr "委派"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "案子歷史紀錄的正規表示式"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "這潛在客戶'%s'已經開啟"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr "商機會談"
+msgstr "商機會議"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0 help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "到期天數"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "當偵測到真正專案/機會"
+msgstr "當發現一個明確的專案/商機"
 
 #. module: crm
 #: view:res.partner:0 field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "潛在客戶及機會"
+msgstr "潛在客戶與商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr "通訊"
+msgstr "溝通"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr "星期二"
+msgstr "週二"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -396,7 +397,7 @@ msgstr "更新日期"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "團隊主管"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -409,7 +410,7 @@ msgstr "選擇動作"
 msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
-msgstr ""
+msgstr "此預設百分比描述業務在此階段的平均成功概率"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -424,17 +425,17 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "商機/客戶"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#機會"
+msgstr "商機數"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "隱私"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -446,50 +447,52 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"階段能讓業務人員簡單地追蹤某個商機在銷售循環中的位置。要高效管理您的銷售管道，定義下一步跳轉的條件很重要。例如：要設置商機為「已驗證」，需先輸入「預期收入"
+"」和「預計結束日期」。你可以看一下「自動修改成功率」欄位的幫助。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "機會分析"
+msgstr "商機分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "事件地點"
+msgstr "地點"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "循環性規則"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "與機會的正常或電話會談"
+msgstr "商機的正常會議或電話會議"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "郵件閘道"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "第一次與新的潛在客戶接觸"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 msgid "Create Opportunity"
-msgstr "建立機會"
+msgstr "建立商機"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
@@ -500,24 +503,24 @@ msgstr "提升"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "待辦事項"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "未運作"
+msgstr "未執行"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -527,51 +530,51 @@ 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
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "包括的答案 :"
 
 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "這些人將收到電子郵件。"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr "滿意度調查"
+msgstr "滿意度計算"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "案例分類"
+msgstr "業務分類"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
 msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
-msgstr ""
+msgstr "預設的開始滿意度以'最大間隔'計算. 如果業務夥伴沒有事件這是預設的開始滿意度"
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "聯絡人姓名"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -581,52 +584,52 @@ msgstr "結束日期"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "附表/撥打電話"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "錯誤:郵件沒有正確的格式"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "剖面選項"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "致電數"
+msgstr "電訪數"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr ""
+msgstr "該業務夥伴分類將加到計算符合業務夥伴的業務夥伴細分規則中"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+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
 msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
-msgstr ""
+msgstr "'回覆到'電子郵件地址填入該業務的團隊在系統裡設定的發送所有郵件的地址"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "建立月份"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -637,29 +640,29 @@ msgstr "工作時間"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "伙伴區間行"
+msgstr "業務夥伴細分明細"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr "詳情"
+msgstr "詳細資訊"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "定義一個規則或時間重複模式以排除循環性規則"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "潛在客戶表單"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -670,41 +673,43 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"銷售團隊共享會議日程表，並且和其它應用程序完整整合，比如員工的節假日、商機。你也可以通過caldav介面把會議日程與你的行動裝置進行同步。\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "業務人員"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr "可能收益"
+msgstr "可能收入"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "建立月份"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "區間名稱"
+msgstr "細分的名稱"
 
 #. module: crm
 #: field:crm.case.stage,probability:0 field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "概率 (%)"
+msgstr "概率(%)"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "公司貨幣"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "產生潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_view_form_installer
@@ -715,6 +720,8 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"用銷售團隊來劃分你的銷售部門，並把使用者分配到銷售團隊。你也可以給每個團隊定義銷售階段。例如，你用顧問式銷售技巧追蹤你的商機，你可以給銷售團隊分配這樣幾個"
+"階段：切入、已驗證、確定決策人、提案、談判、成交/丟單。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -722,12 +729,12 @@ msgstr ""
 #: field:crm.meeting,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr "機會"
+msgstr "商機"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "潛在客戶/上月商機"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -742,12 +749,12 @@ msgstr "停止處理"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "搜尋致電"
+msgstr "搜尋電訪"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
@@ -757,17 +764,17 @@ msgstr "繼續"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "每個週期的天數"
 
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "每日"
+msgstr "按天"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr "將團隊設為"
+msgstr "設定團隊"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
@@ -777,7 +784,7 @@ msgstr "事件類型"
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr "选择性排除"
+msgstr "唯一的"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:832
@@ -785,18 +792,18 @@ msgstr "选择性排除"
 msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
-msgstr ""
+msgstr "你不能刪除潛在客戶 '%s'；只有草稿狀態的潛在客戶才能刪除。你最好不要刪除，而是取消它。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "發自: %s:%s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "報告年份"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -807,49 +814,49 @@ msgstr "建立日期"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "參考2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr "業務採購"
+msgstr "銷售採購"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "用於計算開放天數"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr "安排會議"
+msgstr "會議計劃"
 
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必備條件"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
-msgstr ""
+msgstr "這屬性定義循環日程的日期/時間異常列表。"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr "轉變為機會 "
+msgstr "轉換為商機 "
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "循環性會議"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "未分配的電訪"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -859,18 +866,18 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "機會"
+msgstr "商機列表"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "伙伴分類"
+msgstr "業務夥伴分類"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr "添加記事"
+msgstr "添加備註"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
@@ -880,24 +887,24 @@ msgstr "供應商"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr "標為勝出"
+msgstr "標記為成交"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr "採購總額"
+msgstr "採購金額"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr "標為失敗"
+msgstr "標記為已丟單"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -910,62 +917,62 @@ 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
 msgid "Days to Open"
-msgstr ""
+msgstr "開啟天數"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "將時間顯示為"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Create Partner"
-msgstr "建立伙伴"
+msgstr "建立業務夥伴"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "手機"
+msgstr "行動裝置"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr "下階段"
+msgstr "下一階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的會議"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "今日電訪記錄"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "統計控制台"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "參考"
 
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "參加"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
@@ -977,61 +984,61 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "會議"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "下個動作"
+msgstr "下一動作"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr "重覆直至"
+msgstr "重複直到"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "最後期限"
 
 #. module: crm
 #: help:crm.meeting,active:0
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
-msgstr ""
+msgstr "如果啟用欄位設為真，他將允許你隱藏事件的警告訊息而不需將其刪除。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "改變顏色"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0 view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "負責人"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "僅顯示商機"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "上一個"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "建立潛在客戶"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1041,22 +1048,22 @@ msgstr "統計"
 #. module: crm
 #: view:crm.meeting:0
 msgid "From"
-msgstr "自"
+msgstr "來自"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "轉成商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "顯示銷售團隊"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "下一個"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1066,17 +1073,17 @@ msgstr "階段："
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr "勝出"
+msgstr "成交"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超過截止日期"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr "業務部"
+msgstr "銷售部"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1092,12 +1099,12 @@ msgstr "類型"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr "計算區間"
+msgstr "計算細分"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr "自動變更概率"
+msgstr "自動修改概率"
 
 #. module: crm
 #: field:crm.lead,create_date:0 field:crm.meeting,create_date:0
@@ -1109,32 +1116,32 @@ msgstr "建立日期"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商機"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "需要網站設計"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "電訪年份"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "循環ID"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "主題"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "二"
+msgstr "週二"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
@@ -1145,42 +1152,42 @@ msgstr "階段"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "歷史資訊"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "向業務夥伴發送郵件"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "通話詳情"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr "標為"
+msgstr "標記為"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "記錄通話"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "讓事件在該時間間隔自動重複"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr "條件案例欄位"
+msgstr "業務狀態欄位"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "在待處理狀態的電訪"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1203,119 +1210,119 @@ msgstr "預期收益"
 msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
-msgstr ""
+msgstr "在系統中建立指定的電訪分類以方便定義電訪追蹤類型"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "已處理最大伙伴ID"
+msgstr "處理的最大業務夥伴ID"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "設定為這個階段，會自動改變商機的成功概率"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr "致電分析"
+msgstr "電訪分析"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "開啟日期"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+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
 msgid "Opportunity Name"
-msgstr "機會名稱"
+msgstr "商機名稱"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "預期結束日期"
 
 #. module: crm
 #: help:crm.case.section,active:0
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "如果啟用欄位設為真，它將允許你隱藏銷售團隊而不需要刪除它。"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr "街道2"
+msgstr "街道 2"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
 msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
-msgstr ""
+msgstr "如果你勾選了這裡，這個階段會作為每個銷售團隊的預設階段。對已有的銷售團隊無效。"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "五"
+msgstr "週五"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "停止重覆"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr "提示"
+msgstr "提醒"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
-msgstr ""
+msgstr "勾選此項, 如果你要使用此標籤上的細分規則. 如果不選下面的條件將被忽略"
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+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
@@ -1323,7 +1330,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "建立業務夥伴"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1341,32 +1348,36 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"新建的電訪是「待辦」狀態。\n"
+"正在撥打的電訪是「開啟」狀態。\n"
+"打完了的電話是「已撥」狀態。\n"
+"還沒打的電話是「未撥」狀態。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "週一"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "結束日期"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:296
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "這業務'%s'已結束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "業務夥伴的商機"
 
 #. module: crm
 #: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
@@ -1378,65 +1389,65 @@ msgstr "日期"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件..."
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "已關閉的通話記錄"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "搜尋"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "各分類機會"
+msgstr "商機分類"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "銷售市場部"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "通話日期"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
-msgstr ""
+msgstr "發送郵件的時候，預設的郵件地址來自銷售團隊。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "在本月為循環的會議選擇日期"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr "區間說明"
+msgstr "細分說明"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr "安排會議"
+msgstr "安排一個會議"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "合併商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "定義銷售團隊"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1444,32 +1455,32 @@ msgid ""
 "Create specific partner categories which you can assign to your partners to "
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
-msgstr ""
+msgstr "建立指定的業務夥伴類型，細分規則可以根據你設定的規則去指定業務夥伴的分類，以便你可以更好管理和他們的互動。"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "編碼"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr "下級團隊"
+msgstr "子團隊"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "待處理通話記錄"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "電話銷售"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr "參照"
+msgstr "參考"
 
 #. module: crm
 #: code:addons/crm/crm.py:441 view:crm.lead:0
@@ -1484,91 +1495,91 @@ msgstr "取消"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "待處理狀態的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr "合併兩個機會"
+msgstr "合併兩個商機"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外規則"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "勾選此項, 如果你想要此規則發送郵件給業務夥伴"
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "潛在客戶/商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr "致電分類"
+msgstr "電訪分類"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "開啟的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "商機分類"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
 msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
-msgstr ""
+msgstr "當由潛在客戶轉成商機時，要建立的未來業務夥伴名稱。"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "錯誤！你不能建立循環引用的的銷售團隊"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "記錄電訪"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "不能連結到商業夥伴"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "搜尋會議"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr "業務總額"
+msgstr "銷售金額"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "為重複的會議選擇日期"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -1584,6 +1595,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"商機分析給你隨時訪問商機的資訊如：預期收入、計劃成本、錯過的最後時限或者每個商機的互動次數。這個報表主要給銷售經理定期審查這團隊裡的業務人員。"
 
 #. module: crm
 #: field:crm.case.categ,name:0 field:crm.lead,name:0
@@ -1594,7 +1606,7 @@ msgstr "名稱"
 #. module: crm
 #: field:crm.meeting,alarm_id:0 field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "警告"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1602,17 +1614,17 @@ msgid ""
 "Add specific stages to leads and opportunities allowing your sales to better "
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
-msgstr ""
+msgstr "為你的銷售的潛在客戶和商機增加特定的階段以便更好組織你的銷售管道。階段使你更輕鬆追蹤指定的潛在客戶或在銷售週期中的商機。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "商機轉換"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的業務"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
@@ -1622,12 +1634,12 @@ msgstr "生日"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "這"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "建立時間"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -1639,12 +1651,12 @@ msgstr "高"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "把潛在客戶轉成商業夥伴"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "會議/業務夥伴"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1657,12 +1669,12 @@ msgid ""
 "With Meeting Invitations you can create and manage the meeting invitations "
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
-msgstr "您可在此建立或管理發送至同事或伙伴之會議邀約。您不單可邀請 OpenERP 用戶，還可邀請客戶等外人。"
+msgstr "與會邀請你可以建立和管理會議邀請發送給你的同事、業務夥伴。你不僅能邀請系統的使用者還可以邀請外部人士如客戶。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "星期六"
+msgstr "週六"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -1672,96 +1684,96 @@ msgstr "第五"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "已完成的潛在客戶/商機"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "延遲關閉"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr "三"
+msgstr "週三"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "潛在經銷商"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "當在團隊內上報的時候，業務人員的名字會被替換為團隊主管"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr "計劃收益"
+msgstr "計劃收入"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "可選聯絡業務夥伴，通常在潛在客戶轉換後"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "邀約詳情"
+msgstr "邀請詳情"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr "上級團隊"
+msgstr "母團隊"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr "下個動作日期"
+msgstr "下一動作日期"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "正運作"
+msgstr "運行中"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr "郵政編碼"
+msgstr "郵遞區號"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "這業務'%s'已開啟"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
-msgstr ""
+msgstr "來電"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "通話月份"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "自由"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1771,7 +1783,7 @@ msgstr "允許刪除"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr "一"
+msgstr "週一"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -1783,13 +1795,13 @@ msgstr "最高"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "建立年份"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
 #: view:crm.opportunity2phonecall:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1799,57 +1811,57 @@ msgstr "值"
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "類型用於區分潛在客戶和商機"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "各分類機會"
+msgstr "商機按分類分組"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr "客戶名"
+msgstr "客戶名稱"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "電訪轉成商機"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆到"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "這個銷售團隊的選擇階段"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "各階段機會"
+msgstr "商機的階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "循環選擇"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "潛在客戶/客戶"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "潛在客戶正轉成商業夥伴"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "轉換為商機"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1857,19 +1869,19 @@ 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
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "已撥"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "退回至草案"
+msgstr "重置為草稿"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1881,65 +1893,65 @@ msgstr "額外資訊"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr "合併機會"
+msgstr "合併商機"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr "郵件推廣 2"
+msgstr "郵件行銷 2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "郵件行銷 1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "建立"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:849
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "修改階段為'%s'"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,priority:0 view:crm.lead.report:0
 #: field:crm.lead.report,priority:0 field:crm.phonecall,priority:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr "優先次序"
+msgstr "優先級(0=緊急)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "使用這銷售採購規則"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "潛在客戶轉換為業務夥伴或商機"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "地點"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "批量轉換潛在客戶為商機業務夥伴"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1949,25 +1961,25 @@ msgstr "回覆"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr "安排正常或電話會談"
+msgstr "安排正常會議或電話會議"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
 msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
-msgstr ""
+msgstr "建立不同的會議分類以便更好組織和把會議分類"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr "區間行"
+msgstr "細分明細"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -1977,34 +1989,34 @@ msgstr "計劃日期"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav 服務的URL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr "預期收益"
+msgstr "預期收入"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr "聯絡人名稱"
+msgstr "聯絡人姓名"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "前7天發現的潛在客戶"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "你確定你基於這電訪建立的業務夥伴？"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2015,34 +2027,36 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"定義銷售團隊組織你不同的業務人員或者銷售部門成立一個獨立的團隊。每個團隊工作在自己的商機『銷售單，如每個使用者能設置預設的團隊的客戶偏好。商機和銷售訂單將"
+"根據他的團隊自動篩選。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "僅顯示潛在客戶"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "重覆x次"
+msgstr "重複 x 次"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "潛在客戶轉成業務夥伴"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr "區間"
+msgstr "Segmentation"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2052,13 +2066,13 @@ msgstr "團隊"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "潛在客戶/新建的商機"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "未撥"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2068,19 +2082,19 @@ msgstr "概率"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "待處理商機"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "請在列表中選擇多個商機"
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2088,7 +2102,7 @@ msgstr "月"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2103,6 +2117,9 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"潛在客戶用來追蹤你和對您產品或服務感興趣的潛在客戶或現有業務夥伴的最初接觸。潛在客戶一般來說是銷售循環的第一步。當確認了以後，潛在客戶需要轉化為商機，此時"
+"應建立業務伙伴以便進一步追蹤相關的活動。你可以匯入一個潛在客戶的資料庫，追蹤一下你的名片或把你的網站留言板與OpenERP的潛在客戶集成起來。潛在客戶可以"
+"與郵件閘道連接起來：新的郵件可以建立潛在客戶，後續郵件可以成為與潛在客戶溝通的歷史記錄。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2110,53 +2127,53 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "建立新的業務夥伴"
 
 #. module: crm
 #: 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
 msgid "Start Date"
-msgstr ""
+msgstr "開啟日期"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "排定的電訪"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "拒絕"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "使用者電子郵件"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "如果訂閱已選擇，此聯絡人已同意接收郵件。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "重置為未確認"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "選擇的公司不屬於此使用者允許訪問的公司。"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -2171,17 +2188,17 @@ msgstr "低"
 #: selection:crm.lead.report,state:0 field:crm.meeting,date_closed:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr "關閉"
+msgstr "已關閉"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr "計劃收益總計"
+msgstr "計劃收入合計"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "開啟商機"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2204,7 +2221,7 @@ msgstr "客戶會議"
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整副本"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2212,22 +2229,22 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall view:res.partner:0
 msgid "Phone Calls"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "階段搜尋"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "起案的天數"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "副本數量"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2240,23 +2257,23 @@ msgstr "電話"
 #: field:crm.lead,active:0 field:crm.meeting,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr "活躍"
+msgstr "啟用"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:856
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr "機會階段已由「%s」變為「%s」。"
+msgstr "這商機的階段』%s'已改為'%s'。"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "強制的表示式"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -2271,13 +2288,13 @@ msgstr "不確定"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "用於對階段排序"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "這商機 \"%s\" 已開啟"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2290,39 +2307,39 @@ msgstr "動作"
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr "減少 (0>1)"
+msgstr "下降因子(0.0>1.0)"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "預期結束日期"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "提交給上級"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr "每週"
+msgstr "按周"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr "機會分析"
+msgstr "商機分析"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+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
@@ -2330,12 +2347,12 @@ msgstr ""
 msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
-msgstr ""
+msgstr "不能上報，你已經在您銷售團隊類別中的最高級了。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
@@ -2345,7 +2362,7 @@ msgstr "完成"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "重複間隔（日/周/年）"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2357,7 +2374,7 @@ msgstr "最大間隔"
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "開啟"
 
 #. module: crm
 #: field:crm.lead,city:0
@@ -2367,47 +2384,47 @@ msgstr "城市"
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr "忙線"
+msgstr "忙碌"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "建立日期"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr "重覆間隔："
+msgstr "重複間隔"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "循環"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "上個月的通話"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr "我的開放機會"
+msgstr "我開啟的商機"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "最大的溝通日誌"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr "邀請"
+msgstr "邀請他人"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
@@ -2425,6 +2442,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2441,70 +2462,70 @@ msgstr "第三"
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr ""
+msgstr "這計算是基於在過去 X 期間發生的所有事件。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "未分配的商機"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "搜尋潛在客戶"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "延遲開啟"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "循環週期"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "週日"
+msgstr "工作日"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "參考"
 
 #. module: crm
 #: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: help:crm.lead,type_id:0
 msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
-msgstr ""
+msgstr "這個聯絡人從哪個活動中來（研討會、行銷活動還是群發郵件）。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr "出席者資訊"
+msgstr "參與者資訊"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "區間測試"
+msgstr "細分測試"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "使用者賬戶"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2514,29 +2535,29 @@ msgstr "繼續處理"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "今年建立的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "電訪業務夥伴"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr "派予"
+msgstr "分配到"
 
 #. module: crm
 #: field:crm.add.note,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "設定新狀態為"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr "最後動作"
+msgstr "最近動作"
 
 #. module: crm
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
@@ -2547,32 +2568,32 @@ msgstr "持續時間"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "顯示國家"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "選擇業務人員"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr "業務儀錶版"
+msgstr "銷售控制台"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "業務量"
 
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "業務所屬銷售團隊"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "星期日"
+msgstr "週日"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2582,13 +2603,13 @@ msgstr "第四"
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr "不變"
+msgstr "未更改"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2598,12 +2619,12 @@ msgstr "傳真"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "本月新建的潛在客戶/商機"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "指派"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
@@ -2615,7 +2636,7 @@ msgstr "公司"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "星期五"
+msgstr "週五"
 
 #. module: crm
 #: field:crm.meeting,allday:0
@@ -2625,23 +2646,23 @@ msgstr "整天"
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "強制的/ 可選的"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+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
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr "會議邀約"
+msgstr "會議邀請"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2653,72 +2674,72 @@ msgstr "待辦"
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr "物件名稱"
+msgstr "對象名"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr "聯絡人電郵地址"
+msgstr "這聯絡人的郵件地址"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "推薦人"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "添加內部備註"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "這潛在客戶的階段從 '%s' 改為 '%s'"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "最後"
 
 #. module: crm
 #: field:crm.lead,message_ids:0 field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr "訊息"
+msgstr "消息"
 
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "聯絡方式（電子郵件，面談，電話等）"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "Error!"
-msgstr "錯誤！"
+msgstr "錯誤!"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "電訪摘要"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 #: selection:crm.lead.report,state:0 selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr "記事內容"
+msgstr "備註內容"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr "各階段我的計劃收益"
+msgstr "我的階段計劃營收"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2735,11 +2756,15 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"對於商機你可以管理和與你的銷售管道建立的特定客戶或者跟進潛在銷售相關的銷售單保持聯絡，資訊如：預期收入，商機的階段，預計結束日期，大量的溝通日誌，通過郵件"
+"閘道商機能和郵件相連：新的郵件可能能建立新的商機，他們能自動獲得和客戶交流的日誌。\n"
+"\n"
+"你和你的團隊可以為會議和從電訪來的商機做計劃，把它們轉換成報價，管理相關文檔，追蹤所有相關客戶的活動等。。"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "顏色索引"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2753,14 +2778,14 @@ msgid ""
 "classify and analyse your leads and opportunities. Such categories could for "
 "instance reflect your product structure or the different types of sales you "
 "do."
-msgstr ""
+msgstr "建立具體合適你公司行銷活動的類型以便更好地分類和分析潛在客戶和商機。例如這類型能反映你的產品結構或對不同類型的銷售該怎麼做。"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
-msgstr ""
+msgstr "如果業務夥伴在一段時間都沒有買賣，使用此因子來減少滿意度。這是一個乘法。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2769,22 +2794,22 @@ msgid ""
 "on their phone calls. You can group or filter the information according to "
 "several criteria and drill down the information, by adding more groups in "
 "the report."
-msgstr ""
+msgstr "在這報表中，你能分析你的銷售團隊在電訪上的業績。你能在報表新增更多的群組以根據數個條件來分類或篩選資訊並深入分析資訊。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "電訪摘要"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "今天的潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2795,86 +2820,88 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"排定的電訪列出所有你的團隊需要打的電話。業務人員可以在表單中記錄電訪的資訊。這些資訊會保存在業務夥伴表單用於追蹤你和客戶的聯絡過程。你可以用CSV文件匯入"
+"一個需要團隊打電話的列表。"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr "操作員"
+msgstr "運算符"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "電訪到電訪"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "安排/記錄 電訪"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "按使用者和階段查看預期收入"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr "確認"
+msgstr "確定"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "日"
+msgstr "週日"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "選擇性的表示式"
 
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "日"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "按階段分組的預期收入"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
 #: view:crm.lead:0 selection:crm.lead,state:0 view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "建立"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,email_from:0 field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: crm
 #: view:crm.case.channel:0 view:crm.lead:0 field:crm.lead,channel_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr "通路"
+msgstr "管道"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2884,34 +2911,36 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"檢查是否限制此分類的業務夥伴符合細分規則。\n"
+"如勾選此項，將從業務夥伴移除不符合細分規則的分類。"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "例外的日期/ 時間"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "從“開始”日期+時間自動計算截止日期"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "省/州"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "從潛在客戶建立商機"
 
 #. module: crm
 #: 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 "客戶關係管理控制台"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -2921,22 +2950,22 @@ msgstr "需要資訊"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr "展望機會"
+msgstr "探查商機"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr "將分類設為"
+msgstr "設置分類為"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "收信人"
 
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr "四"
+msgstr "週四"
 
 #. module: crm
 #: view:crm.add.note:0 view:crm.merge.opportunity:0
@@ -2953,23 +2982,23 @@ msgstr "每天"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "檢查銷售階段"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Qualification"
-msgstr ""
+msgstr "資格"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "業務夥伴郵箱"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "商業夥伴已建立."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2979,24 +3008,24 @@ msgstr "第一"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "預期結束月數"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "溝通日誌的條件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "呼叫日期"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3009,6 +3038,10 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"在一個期間兩個週期間這細分的業務夥伴銷售或採購的平均天數。\n"
+"它主要用來檢查業務夥伴有沒有業務或者多長時間有。\n"
+"所以因此我們假定他的滿意度下降因此向其它供應商採購。\n"
+"對經常的業務使用這功能。"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
@@ -3018,53 +3051,53 @@ msgstr "時區"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr "六"
+msgstr "週六"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "業務員"
+msgstr "業務人員"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "預期結束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "商機轉成電訪"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "允許刪除不是草稿的業務"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr "重覆"
+msgstr "重複"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "預期結束年數"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr "伙伴名稱"
+msgstr "業務夥伴名稱"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr "開放"
+msgstr "已開啟"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
@@ -3074,22 +3107,22 @@ msgstr "團隊成員"
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
 msgid "Contacts"
-msgstr "聯絡人"
+msgstr "聯絡人列表"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "對電腦有興趣"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr "邀約詳情"
+msgstr "邀請內容"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr "預設 (0=無)"
+msgstr "預設(0=無)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3097,13 +3130,13 @@ 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: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "通話日誌"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3116,17 +3149,17 @@ msgstr "成功概率"
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr "各業務團隊案例"
+msgstr "該銷售團隊的業務"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr "出席者"
+msgstr "與會者"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3139,35 +3172,35 @@ msgstr "會議"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr "案例分類"
+msgstr "業務分類"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "7 Days"
-msgstr "七日"
+msgstr "7天"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr "各階段及用戶計劃收益"
+msgstr "按銷售階段及使用者的計劃營收"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "溝通&日誌"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "一般"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "關閉或取消狀態的潛在客戶不能轉為商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3178,64 +3211,64 @@ msgstr "會議分類"
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "你可能要確認這個業務夥伴是否已不存在"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "延遲開啟"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: crm
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "這業務'%s'已取消"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr "各階段機會"
+msgstr "按階段的商機"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr "合約"
+msgstr "合同"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr "Twitter 廣告"
+msgstr "Twitter地址"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "商機 '%s'  成交"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "適用於所有團隊"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3246,60 +3279,60 @@ msgstr "錯誤"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr "計劃收益"
+msgstr "計劃收入"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "需要諮詢"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "錯誤! 你不能建立循環引用的剖面。"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "預期結束年數"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯絡方式"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "循環日期"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "兩個使用者不能使用相同的登入名稱！"
 
 #. module: crm
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: crm
 #: 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
 msgid "Categorization"
-msgstr "分類化"
+msgstr "歸類"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "記錄通話日誌"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3309,47 +3342,47 @@ msgstr "動作規則"
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "循環"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr "星期四"
+msgstr "週四"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "發現日期"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "私有的"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "全體員工可見"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "職務"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "添加"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
@@ -3361,60 +3394,60 @@ 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
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "對週邊商品感興趣"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "新建商機"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "公司未配置郵箱"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "電子郵件"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "街道"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr "各用戶及團隊機會"
+msgstr "使用者和團隊的商機"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "重設為待辦"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "工時"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr "致電"
+msgstr "電訪列表"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
@@ -3433,7 +3466,7 @@ msgstr "最低"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3446,23 +3479,23 @@ msgstr "二月"
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "丟單"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "編輯"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3471,12 +3504,12 @@ msgstr "國家或地區"
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "轉換成商機"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr "星期三"
+msgstr "週三"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -3486,28 +3519,30 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"這個工具可以讓你迅速記錄接到的電話。每次你接到的電話都會出現在客戶的表單上用於記錄你和業務夥伴的每次通話。在電訪表單上，你可以安排另一次通話，或會面，或新"
+"建一個商機。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr "推廣名稱"
+msgstr "行銷活動名稱"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "剖面"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "按使用者及分類的電訪"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3515,13 +3550,13 @@ msgid ""
 "Track from where is coming your leads and opportunities by creating specific "
 "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 ""
+msgstr "管道用於記錄你的銷售潛在客戶或商機的來源，並利用系統建立的文件來記錄。例如：網站、電話、經銷商等"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing Opportunity"
-msgstr "與現有機會合併"
+msgstr "合併現有的商機"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3531,27 +3566,27 @@ msgstr "選項"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr "協商"
+msgstr "談判"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "結束中"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+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
 msgid "Accept"
-msgstr "接受"
+msgstr "同意"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3561,12 +3596,12 @@ msgstr "控制變量"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "第二"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "建議"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
@@ -3578,17 +3613,17 @@ msgstr "結束日期"
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+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
 msgid "Newsletter"
-msgstr ""
+msgstr "電子報"
 
 #~ msgid "Planned Costs"
 #~ msgstr "计划成本"
@@ -3782,3 +3817,18 @@ msgstr ""
 
 #~ msgid "Current Activity"
 #~ msgstr "當前動態"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "已指派商機給"
+
+#~ msgid "Schedule/Log a call"
+#~ msgstr "安排/紀錄一個電話拜訪"
+
+#~ msgid "End of recurrency"
+#~ msgstr "循環結束"
+
+#~ msgid "Schedule call"
+#~ msgstr "安排電訪"
+
+#~ msgid "Referred By"
+#~ msgstr "介紹人"
diff --git a/addons/crm_caldav/i18n/zh_TW.po b/addons/crm_caldav/i18n/zh_TW.po
index e8d0560b9d9..43731a6717d 100644
--- a/addons/crm_caldav/i18n/zh_TW.po
+++ b/addons/crm_caldav/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
index 2c6c9d776dc..d09ec398c20 100644
--- a/addons/crm_claim/i18n/zh_TW.po
+++ b/addons/crm_claim/i18n/zh_TW.po
@@ -8,67 +8,67 @@ 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-24 03:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"PO-Revision-Date: 2012-08-30 03:01+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-28 06:37+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# 業務量"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr ""
+msgstr "責任人"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "下一動作日期"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "延遲關閉"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "解決方案"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "視察者的電子郵件"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr ""
+msgstr "#索賠"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -76,99 +76,99 @@ msgid ""
 "You can create claim stages to categorize the status of every claim entered "
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
-msgstr ""
+msgstr "你能建立索賠階段的分類在系統輸入每個索賠的狀態度。階段定義索賠解決方案的所有需求的步驟。"
 
 #. module: crm_claim
 #: code:addons/crm_claim/crm_claim.py:132
 #, python-format
 msgid "The claim '%s' has been opened."
-msgstr ""
+msgstr "索賠'%s' 已被打開。"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Date Closed"
-msgstr ""
+msgstr "結束日期"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "加入內部備註"
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
 msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
-msgstr ""
+msgstr "銷售團隊屬於的業務，定義負責人和郵件地址的郵件閘道。"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Description"
-msgstr ""
+msgstr "索陪說明"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "訊息"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "實際索賠"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "預防措施"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "關聯"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Date of claim"
-msgstr ""
+msgstr "索賠日期"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "All pending Claims"
-msgstr ""
+msgstr "所有未決索賠"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "#郵件"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "重設為草稿"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date_deadline:0
 #: field:crm.claim.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止日期"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -177,116 +177,116 @@ msgstr ""
 #: field:crm.claim.report,partner_id:0
 #: model:ir.model,name:crm_claim.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "業務夥伴"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
-msgstr ""
+msgstr "索賠月份"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr ""
+msgstr "預防措施的動作"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "劃分"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "根本原因"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr ""
+msgstr "問題責任"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "優先級"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr ""
+msgstr "發送新的電子郵件"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "電子郵件"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "最低"
 
 #. module: crm_claim
 #: field:crm.claim,action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "下一動作"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "不修正"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "索賠主題"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
 msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
-msgstr ""
+msgstr "為系統內所有的索賠處理指定一個排序標準"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "索賠階段"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "分類"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -294,108 +294,108 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "階段"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History Information"
-msgstr ""
+msgstr "日誌資訊"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "聯繫人"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
-msgstr ""
+msgstr "索賠分析"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "到期天數"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "客戶關係管理索賠報表"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "作為索賠接受"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "糾正"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "動作類型"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "更新日期"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Year of claim"
-msgstr ""
+msgstr "索賠年份"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "業務員"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "索賠金額"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsible User"
-msgstr ""
+msgstr "負責使用者"
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -403,30 +403,30 @@ 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: crm_claim
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "已結束"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "回覆"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -434,99 +434,99 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "待處理"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication & History"
-msgstr ""
+msgstr "溝通&日誌"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "普通"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整副本"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: crm_claim
 #: view:res.partner:0
 msgid "Partners Claim"
-msgstr ""
+msgstr "客戶抱怨"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "電話"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: crm_claim
 #: field:crm.claim,active:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "關閉"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "搜尋"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr ""
+msgstr "索賠日期"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "這些人將收到電子郵件。"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "索賠分類"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -537,40 +537,40 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 #: field:res.partner,claims_ids:0
 msgid "Claims"
-msgstr ""
+msgstr "索賠"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "糾正的動作"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "索賠政策"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "日誌"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_config_claim
 msgid "Claim"
-msgstr ""
+msgstr "索賠"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "最高"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "業務夥伴聯繫方式"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -578,109 +578,109 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "索賠者"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "結束"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "開啟"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "新抱怨"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: selection:crm.claim,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "負責人"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current year"
-msgstr ""
+msgstr "本年新建的抱怨"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Unassigned Claims"
-msgstr ""
+msgstr "未分配的抱怨"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current month"
-msgstr ""
+msgstr "本月新建的抱怨"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超過截止日期"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "根本原因"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "索賠/動作說明"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "搜尋索賠"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "銷售團隊"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "決定採取的行動"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -690,31 +690,33 @@ msgid ""
 "history for a claim (emails sent, intervention type and so on). Claims may "
 "automatically be linked to an email address using the mail gateway module."
 msgstr ""
+"記錄和追蹤你客戶的索賠，索賠可以連結到一個或很多銷售訂單中。你可以發送帶附件的郵件和保留一個索賠的所有日誌（郵件發送，介入類型等）。索賠可以自動連結到電子"
+"郵件使用的閘道。"
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "電子郵件"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Actions Done"
-msgstr ""
+msgstr "動作完成"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in last month"
-msgstr ""
+msgstr "上個月新建的抱怨"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Actions Defined"
-msgstr ""
+msgstr "動作定義"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "跟進"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -727,67 +729,82 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My company"
-msgstr ""
+msgstr "我的公司"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的業務"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤，您不能建立循環引用的會員用戶"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "動作"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "高"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
 msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
-msgstr ""
+msgstr "建立索賠的類型以更好管理和分類你的索賠。如：索賠可以是預防措施、糾正措施。"
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+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_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index 38c30a4c90f..51632d83b0b 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/i18n/zh_TW.po
@@ -7,19 +7,19 @@ 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-05-10 18:26+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-08-29 08:56+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:25+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 msgid "Questions List"
-msgstr "問題表"
+msgstr "問題列表"
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -28,7 +28,7 @@ msgid ""
 "in the sales cycle by helping them to ask the right questions. The "
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
-msgstr ""
+msgstr "你能建立特定主題的問卷調查去指導你的團隊在銷售週期向客戶詢問合適的問題。這細分工具能根據不同問題的答案自動劃分業務夥伴到不同的類型。"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -47,12 +47,12 @@ msgstr "開啟問卷"
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "子客戶特徵"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "伙伴分割"
+msgstr "業務夥伴分類"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -64,17 +64,17 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire_line
 msgid "open.questionnaire.line"
-msgstr ""
+msgstr "open.questionnaire.line"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴分類"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr ""
+msgstr "紀錄運行效能(Profiling)"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -97,7 +97,7 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire
 msgid "open.questionnaire"
-msgstr ""
+msgstr "open.questionnaire"
 
 #. module: crm_profiling
 #: field:open.questionnaire,questionnaire_id:0
@@ -112,12 +112,12 @@ msgstr "使用問卷"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消（_C）"
 
 #. module: crm_profiling
 #: field:open.questionnaire,question_ans_ids:0
 msgid "Question / Answers"
-msgstr ""
+msgstr "問/答"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -133,22 +133,22 @@ msgid ""
 "Check                             this box if you want to use this tab as "
 "part of the                              segmentation rule. If not checked, "
 "the criteria beneath will be ignored"
-msgstr ""
+msgstr "勾選這選項，如果你想使用這標籤作為細分規則的一部分。如果勾選，這規則將被忽略"
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "錯誤! 你不能建立相關的簡介。"
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "使用這客戶特徵的規則"
 
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤! 您不能建立相關的會員用戶"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -172,7 +172,7 @@ msgstr "問題"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "上級客戶簡介"
 
 #. module: crm_profiling
 #: view:open.questionnaire:0
diff --git a/addons/crm_todo/i18n/zh_TW.po b/addons/crm_todo/i18n/zh_TW.po
new file mode 100644
index 00000000000..e092528ac19
--- /dev/null
+++ b/addons/crm_todo/i18n/zh_TW.po
@@ -0,0 +1,95 @@
+# 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-29 09:15+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@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-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "時間區間"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "取消任務"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "錯誤！任務結束日期必須大於任務開始日期"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "下一步"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "我的任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "錯誤！不能創建循環引用的任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "刪除"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "潛在客戶/機會"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "要設置為完成狀態"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "前一頁"
diff --git a/addons/decimal_precision/i18n/zh_TW.po b/addons/decimal_precision/i18n/zh_TW.po
index df549f8858b..511eb20fafb 100644
--- a/addons/decimal_precision/i18n/zh_TW.po
+++ b/addons/decimal_precision/i18n/zh_TW.po
@@ -8,13 +8,13 @@ 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: 2011-09-27 08:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-29 07:43+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
@@ -46,7 +46,7 @@ msgstr "小數精確度"
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
 
 #~ msgid "Decimal Precision Configuration"
 #~ msgstr "小數精確度設定"
diff --git a/addons/document_ftp/i18n/zh_TW.po b/addons/document_ftp/i18n/zh_TW.po
new file mode 100644
index 00000000000..90a9e531a96
--- /dev/null
+++ b/addons/document_ftp/i18n/zh_TW.po
@@ -0,0 +1,116 @@
+# 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-29 09:46+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@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-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "自動目錄配置"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"說明OpenERP的服務器上的網絡地址應該為最終用戶訪問。這取決於您的網絡拓撲和配置，而且只會影響顯示給用戶的鏈接。的格式為HOST：PORT和預設的主機"
+"（localhost）的訪問從服務器本身只適合.."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "瀏覽檔案"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "圖像"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "地址"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP 伺服器"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Server Configuration"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "瀏覽(_B)"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr "服務器地址或IP地址和端口，用戶應該連接到DMS訪問"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "供享的儲存庫"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "設置FTP 伺服器"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "標題"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "瀏覽FTP文件"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "知識應用配置"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "文件瀏覽"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "瀏覽文件"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index b353b5b0e3a..55264e50f48 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 07:58+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-08-30 03:33+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:02+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
@@ -189,7 +189,7 @@ msgstr "郵件"
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -331,7 +331,7 @@ msgstr ""
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index bffc12fa553..e32df5eb306 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 03:32+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:27+0000\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
@@ -29,7 +29,7 @@ msgstr "結束日期"
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr ""
+msgstr "確認"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -37,13 +37,13 @@ msgid ""
 "This is Template Project. Project of event is a duplicate of this Template. "
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
-msgstr ""
+msgstr "這是模板專案。專案的事件是重複的，這個模板。點擊打造追朔規劃“後，新專案將被複製此模板的專案。"
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "追溯計畫"
 
 #. module: event_project
 #: constraint:event.event:0
@@ -63,23 +63,23 @@ msgstr "專案範本"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "所有的工作任務"
 
 #. module: event_project
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event_project.act_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "任務"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！您不能創建遞歸的事件"
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr ""
+msgstr "專案任務"
 
 #. module: event_project
 #: view:event.project:0
@@ -94,7 +94,7 @@ msgstr "開始日期"
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "創建追溯計畫"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
@@ -104,7 +104,7 @@ msgstr "活動"
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks Management"
-msgstr ""
+msgstr "任務管理"
 
 #~ msgid ""
 #~ "Organization and management of events.\n"
diff --git a/addons/import_sugarcrm/i18n/de.po b/addons/import_sugarcrm/i18n/de.po
new file mode 100644
index 00000000000..e47dc95b8dd
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/de.po
@@ -0,0 +1,429 @@
+# German 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-29 07:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr "Fehler!"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+"Nutzen Sie die SugarSoap API URL (siehe Tooltip) und eine SugarCRM-Anmeldung "
+"mit Vollzugriff."
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr "(Bald erwartet)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "Dokumente"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "Importieren Sie Ihre Daten aus SugarCRM:"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+"Wählen Sie die zu importierenden Daten aus. Drücken Sie \"Import\", um Daten "
+"manuell zu holen oder \"Wiederkehrende Importe Terminieren\", um Daten "
+"automatisch und wiederholt einzuholen."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr "Kontakte"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr "Name der Instanz"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "Projekt Aufgaben"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr "Über Abschluss des Imports zu informieren:"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+"Haken Sie dieses Feld an, um SugarCRM-Benutzer als OpenERP-Benutzer zu "
+"importieren. Hinweis: In OpenERP bestehende Benutzer gleichen Namens werden "
+"gelöscht und durch die SugarCRM-Information ersetzt."
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+"Installieren Sie bitte SOAP für Python - ZSI-2.0-rc3.tar.gz - python-zci"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr "_Terminierung wiederkehrender Importe"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+"Vergessen Sie nicht die über den Erfolg des Imports zu banachrichtende EMail-"
+"Adresse."
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+"Haken Sie dieses Feld an, um SugarCRM-Anrufe in OpenERP-Anrufe zu "
+"importieren."
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+"Wenn Sie wiederkehrende oder vereinzelte Importe durchführen, werden bereits "
+"in OpenERP vorliegende Daten aktualsiert."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr "Angstellter"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "Dokument"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+"Haken Sie dieses Feld an, um Dokumente aus SugarCRM in OpenERP zu importieren"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr "Daten von SugarCRM importieren"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr "Kundenbeziehungsverwaltung"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+"Daten werden importiert; der Prozess läuft im Hintergrund. Bei Abschluss "
+"wird eine Benachrichtigung per EMail verschickt, sofern diese angegeben "
+"wurde."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr "Anrufe"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr "Verwaltung von mehrfachen Instanzen"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr "_OK"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+"Haken Sie dieses Feld an, um Leads aus SugarCRM nach OpenERP zu importieren."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr "Nachrichten und Notizen"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+"URL des Web-Dienstes bei dem Daten geholt werden sollen. Beispiel: "
+"\"http://example.com/sugarcrm/soap.php\", oder kopieren Sie die Adresse "
+"Ihrer SugarCRM-Anwendung (z. B. "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index)"
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr "Aus SugarCRM importieren"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr "_Import"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr "Vorgänge"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+"Haken Sie dieses Feld an, um Termine von SugarCRM nach OpenERP zu importieren"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is Finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""

From baf572ae1ccbac3e5542a54c5680ee74003f4ddf Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 30 Aug 2012 09:20:24 +0200
Subject: [PATCH 44/50] [FIX] Fixed resize after sending.

bzr revid: vta@openerp.com-20120830072024-004ingk1ourozupn
---
 addons/web/static/src/js/view_form.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6abc3c470d6..0b0366a9ee4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2324,6 +2324,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
     template: 'FieldText',
     initialize_content: function() {
         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)});
@@ -2345,9 +2346,8 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
     render_value: function() {
         var show_value = instance.web.format_value(this.get('value'), this, '');
         this.$textarea.val(show_value);
-        if (show_value) {
-            this.$textarea.autosize();
-        }
+        this.$textarea.autosize();
+        this.$textarea.css('height', parseInt(this.default_height)+"px");
     },
     is_syntax_valid: function() {
         if (!this.get("effective_readonly")) {

From 8b0f2cfd71549b4fb64fdeebe41d1b9b4f23f5ed Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 09:49:03 +0200
Subject: [PATCH 45/50] [IMP] cleaning project/contracts and removing unused
 code

bzr revid: fp@tinyerp.com-20120830074903-m8yiovofd2891p7i
---
 .../account_analytic_analysis_view.xml        |   1 +
 .../__init__.py                               |  24 ----
 .../__openerp__.py                            |  41 ------
 .../analytic_contract_expense_project.py      |  37 -----
 ...analytic_contract_expense_project_view.xml |  33 -----
 addons/analytic_contract_project/__init__.py  |  24 ----
 .../analytic_contract_project/__openerp__.py  |  38 ------
 .../analytic_contract_project.py              |  84 ------------
 .../analytic_contract_project_view.xml        | 127 ------------------
 addons/project/project.py                     |   2 +-
 addons/project/project_view.xml               |  49 +++----
 addons/project_issue/project_issue.py         |   2 +-
 addons/project_issue/project_issue_view.xml   |  13 +-
 addons/project_timesheet/__openerp__.py       |   2 +-
 addons/project_timesheet/project_timesheet.py |  52 ++++---
 .../project_timesheet_view.xml                |  34 ++---
 16 files changed, 75 insertions(+), 488 deletions(-)
 delete mode 100644 addons/analytic_contract_expense_project/__init__.py
 delete mode 100644 addons/analytic_contract_expense_project/__openerp__.py
 delete mode 100644 addons/analytic_contract_expense_project/analytic_contract_expense_project.py
 delete mode 100644 addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
 delete mode 100644 addons/analytic_contract_project/__init__.py
 delete mode 100644 addons/analytic_contract_project/__openerp__.py
 delete mode 100644 addons/analytic_contract_project/analytic_contract_project.py
 delete mode 100644 addons/analytic_contract_project/analytic_contract_project_view.xml

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 63a8e6c7add..8f051b33bf9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,6 +23,7 @@
                     <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/analytic_contract_expense_project/__init__.py b/addons/analytic_contract_expense_project/__init__.py
deleted file mode 100644
index 05c84916922..00000000000
--- a/addons/analytic_contract_expense_project/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import analytic_contract_expense_project
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
deleted file mode 100644
index 8996e9f7565..00000000000
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Projects Management: hr_expense link',
-    'version': '1.1',
-    'category': 'Hidden',
-    'description': """
-This module is for modifying project view to show some data related to the hr_expense module.
-=============================================================================================
-""",
-    'author': 'OpenERP S.A.',
-    'website': 'http://www.openerp.com/',
-    'depends': ['analytic_contract_hr_expense','project'],
-    'data': ['analytic_contract_expense_project_view.xml'],
-    'demo': [],
-    'css' : [],
-    'installable': True,
-    'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
deleted file mode 100644
index efbb8b75a9e..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
+++ /dev/null
@@ -1,37 +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
-
-class project_project(osv.osv):
-    _inherit = "project.project"
-
-    def open_hr_expense(self, cr, uid, ids, context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
-
-    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
-
-project_project()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
deleted file mode 100644
index f461ed224b8..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="project_form_expense_form" model="ir.ui.view">
-            <field name="name">project.project.form.expense.inherit</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
-            <field eval="20" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//tr[@name="total"]' position='before'>
-                    <tr>
-                        <td>
-                            <label for="charge_expenses"/>
-                        </td><td>
-                            <field name="charge_expenses"/>
-                        </td><td>
-                            <field class="oe_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                            <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td>
-                    </tr>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/analytic_contract_project/__init__.py b/addons/analytic_contract_project/__init__.py
deleted file mode 100644
index dd60ac32096..00000000000
--- a/addons/analytic_contract_project/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import analytic_contract_project
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
deleted file mode 100644
index 9c0be102760..00000000000
--- a/addons/analytic_contract_project/__openerp__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name' : 'Contract on Project',
-    'version': '1.1',
-    'author' : 'OpenERP SA',
-    'category': 'Hidden',
-    'website' : 'http://www.openerp.com',
-    'depends' : ['project', 'account_analytic_analysis'],
-    'description': """
-Add "Contract Data" in project view.
-====================================
-    """,
-    'data': ['analytic_contract_project_view.xml'],
-    'demo': [],
-    'installable': True,
-    'auto_install': True,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
deleted file mode 100644
index 1ffab1246c9..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-class project_project(osv.osv):
-    _inherit = 'project.project'
-
-    _defaults = {
-        'use_timesheets': True,
-    }
-
-    def open_sale_order_lines(self,cr,uid,ids,context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context)
-
-    def open_timesheets_to_invoice(self,cr,uid,ids,context=None):
-        if context is None:
-            context = {}
-        analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id
-        context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1})
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Timesheet Lines to Invoice'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': context,
-            'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')],
-            'res_model': 'account.analytic.line',
-            'nodestroy': True,
-        }
-
-    def open_timesheets(self, cr, uid, ids, context=None):
-        """ open Timesheets view """
-        project = self.browse(cr, uid, ids[0], context)
-        try:
-            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
-        except ValueError:
-            journal_id = False
-        view_context = {
-            'search_default_account_id': [project.analytic_account_id.id],
-            'default_account_id': project.analytic_account_id.id,
-            'default_journal_id': journal_id,
-        }
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Bill Tasks Works'),
-            'res_model': 'account.analytic.line',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': view_context,
-            'nodestroy': True,
-        }
-project_project()
-
-class task(osv.osv):
-    _inherit = "project.task"
-    
-    def create(self, cr, uid, vals, context=None):
-        task_id = super(task, self).create(cr, uid, vals, context=context)
-        task_browse = self.browse(cr, uid, task_id, context=context)
-        if task_browse.project_id.analytic_account_id:
-            self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
-        return task_id
-task()
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
deleted file mode 100644
index ad897efdfe3..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="project_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">project.project.form.inherit</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//page[@name="team"]' position='after'>
-                    <page string="Contract Data">
-                        <group>
-                            <group string="Validity">
-                                <label for="date_start" string="Duration"/>
-                                <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> 
-                                    <label attrs="{'invisible':[('date','=',False)]}" class="oe_inline" string=" - "/>
-                                    <field name="date" class="oe_inline"/>
-                                </div>
-                                <label for="quantity_max"/>
-                                <div>
-                                    <field name="quantity_max" class="oe_inline"/>
-                                    <field name="company_uom_id" readonly="1" class="oe_inline"/> / Remaining: 
-                                    <field name="remaining_hours" class="oe_inline"/> 
-                                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
-                                </div>
-                            </group>
-                            <group string="Invoice Options">
-                                <field name="manager_id" />
-                                <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                            </group>
-                        </group>
-                    <separator name="toinvoice" string="Invoicing"/>
-                    <table width="100%%">
-                        <tr>
-                            <th></th>
-                            <th></th>
-                            <th><label string="Est.Tot"/></th>
-                            <th><label string="Invoiced"/></th>
-                            <th><label string="Remaining"/></th>
-                            <th><label string="To Invoice"/></th>
-                            <th></th>
-                        </tr><tr>
-                            <td>
-                                <label for="fix_price_invoices"/>
-                            </td><td>
-                                <field name="fix_price_invoices" class="oe_inline"/>
-                            </td><td>
-                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(account_analytic_analysis.action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id], 'default_project_id': analytic_account_id, 'search_default_project_id': analytic_account_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': analytic_account_id,'search_default_uninvoiced': 1,'search_default_project_id': analytic_account_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
-                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
-                            <td>
-                                <label for="invoice_on_timesheets"/>
-                            </td><td>
-                                <field name="invoice_on_timesheets"/>
-                            </td><td>
-                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': analytic_account_id,'search_default_account_id': analytic_account_id}"/>
-                                <button name="open_timesheets_to_invoice" string="Timesheets to Invoice" type="object" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td>
-                        </tr><tr name="total">
-                            <th>
-                                <label string="Total"/>
-                            </th><td>
-                            </td><td>
-                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field name="invoiced_total" class="oe_inline"/>
-                            </td><td>
-                                <field name="remaining_total" class="oe_inline"/>
-                            </td><td>
-                                <field name="toinvoice_total" class="oe_inline"/>
-                            </td><td>
-                            </td>
-                        </tr>
-                    </table>
-                    <separator string="Terms and Conditions" name="description"/>
-                    <field name="description"/>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="project_invoice_form" model="ir.ui.view">
-            <field name="name">Inherit project form : Invoicing Data</field>
-            <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_timesheets"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
-                    </tr>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="contract_inherited_form" model="ir.ui.view">
-            <field name="name">Inherit contract form : adding UoM</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
-            <field name="priority">50</field>
-            <field name="arch" type="xml">
-                <xpath expr='//field[@name="quantity_max"]' position='after'>
-                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/project/project.py b/addons/project/project.py
index ab1c3c47dfe..21684c81418 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1265,7 +1265,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+        'use_tasks': fields.boolean('Tasks',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1eae4018d25..9fe8d6a3193 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -76,33 +76,29 @@
                 </header>
                 <sheet string="Project">
                     <field name="analytic_account_id" invisible="1" required="0"/>
-                    <label for="name" class="oe_edit_only" string="Project Name"/>
-                    <h1>
-                        <field name="name" string="Project Name"/>
-                    </h1>
-                    <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" invisible="1" required="0"/>
-                        <label for="alias_name" class="oe_edit_only "/>
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" string="Project Name"/>
+                        <h1>
+                            <field name="name" string="Project Name"/>
+                        </h1>
+                        <div name="options_active">
+                            <field name="use_tasks" class="oe_inline"/>
+                            <label for="use_tasks"/>
+                        </div>
+                    </div>
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button name="%(act_project_project_2_project_task_all)d" string="Tasks"
+                            type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                        <button name="%(base.action_attachment)d" string="Documents" type="action"/>
                     </div>
                     <group>
                         <group>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
-                            <field name="privacy_visibility"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
                         <group>
-                            <table>
-                                <tr name="use_tasks_row">
-                                    <td><group><field name="use_tasks"/></group></td>
-                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
-                                </tr>
-                                <tr name="use_attachment_row">
-                                    <td/>
-                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/></td>
-                                </tr>
-                            </table>
+                            <field name="privacy_visibility"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
                     </group>
                     <notebook>
@@ -126,6 +122,13 @@
                             </field>
                         </page>
                         <page string="Other Info">
+                            <group string="Email Interface" colspan="2">
+                                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_id" invisible="1" required="0"/>
+                                    <label for="alias_name" class="oe_edit_only "/>
+                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                                </div>
+                            </group>
                             <group>
                                 <group string="Administration">
                                     <field name="planned_hours" widget="float_time"/>
@@ -133,11 +136,11 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                                     <field name="currency_id" groups="base.group_multi_company" required="1"/>
-                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
                                 </group>
                             </group>
                         </page>
@@ -312,7 +315,7 @@
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
             <field name="help" type="html">
-                <p class="oe_form_nocontent_create">
+                <p class="oe_view_nocontent_create">
                   Click to start a new project.
                 </p>
                 <p>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 4fb75c0333c..c2ff76d05a6 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -569,7 +569,7 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
 
     _columns = {
-        'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
+        'use_issues' : fields.boolean('Issues', help="Check this field if this project manages issues"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 203432ab19d..75bf50b23a4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -355,11 +355,12 @@
             <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_issues"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//div[@name="options_active"]' position='inside'>
+                    <field name="use_issues" class="oe_inline"/>
+                    <label for="use_issues"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/>
                 </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
@@ -382,7 +383,7 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_issues.raw_value"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
-                        Issues(<field name="issue_count"/>)</a>
+                        <field name="issue_count"/> Issues</a>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 8770aa53429..805556c1a96 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -48,7 +48,7 @@ with the effect of creating, editing and deleting either ways.
         'test/work_timesheet.yml',
     ],
     'installable': True,
-    'auto_install': False,
+    'auto_install': True,
     'certificate': '0075123647453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index e4374f096fd..1e50848201c 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -28,33 +28,6 @@ from tools.translate import _
 
 class project_project(osv.osv):
     _inherit = 'project.project'
-
-    def _to_invoice(self, cr, uid, ids, field_name, arg, context=None):
-        account_analytic_line = self.pool.get("account.analytic.line")
-        res = {}
-        for project in self.browse(cr,uid,ids,context=context):
-            line_ids = account_analytic_line.search(cr, uid, [('account_id', '=', project.analytic_account_id.id), ('to_invoice','=',1), ('invoice_id','=',False)])
-            lines = account_analytic_line.browse(cr, uid, line_ids, context)
-            res[project.id] = {
-                'amount_to_invoice': sum(line.amount for line in lines),
-                'time_to_invoice': sum(line.unit_amount for line in lines),
-            }
-        return res
-
-    def _timesheet_count(self, cr, uid, ids, field_name, arg, context=None):
-        account_analytic_line = self.pool.get('account.analytic.line')
-        res = {}
-        for project in self.browse(cr, uid, ids, context):
-            line_ids = account_analytic_line.search(cr, uid, [('account_id', '=', project.analytic_account_id.id)])
-            res[project.id] = len(line_ids)
-        return res
-
-    _columns = {
-        'amount_to_invoice': fields.function(_to_invoice, string="Amount to Invoice", multi="sums"),
-        'time_to_invoice': fields.function(_to_invoice, string="Time to Invoice", multi="sums"),
-        'timesheet_count': fields.function(_timesheet_count, type='integer', string="Issue"),
-    }
-
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
         if part and res and ('value' in res):
@@ -66,6 +39,31 @@ class project_project(osv.osv):
                 res['value'].update({'to_invoice': factor_id})
         return res
 
+    _defaults = {
+        'use_timesheets': True,
+    }
+
+    def open_timesheets(self, cr, uid, ids, context=None):
+        """ open Timesheets view """
+        project = self.browse(cr, uid, ids[0], context)
+        try:
+            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
+        except ValueError:
+            journal_id = False
+        view_context = {
+            'search_default_account_id': [project.analytic_account_id.id],
+            'default_account_id': project.analytic_account_id.id,
+            'default_journal_id': journal_id,
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Bill Tasks Works'),
+            'res_model': 'account.analytic.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': view_context,
+            'nodestroy': True,
+        }
 project_project()
 
 class project_work(osv.osv):
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index e137c88c6a9..66104ee0d8c 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -9,36 +9,29 @@
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
                     <field name="use_timesheets"/>
-                    <field name="timesheet_count"/>
+                    <field name="hours_quantity"/>
                     <field name="currency_id"/>
                     <field name="partner_id"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_timesheets.raw_value"
-                        name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
-                </xpath>
-                <xpath expr="//tr[contains(@class, 'oe_kanban_project_deadline')]" position="before">
-
-                    <tr class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
-                        <th>Amount to invoice</th>
-                        <td><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></td>
-                    </tr>
-                    <tr class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
-                        <th>Time to Invoice</th>
-                        <td><field name="time_to_invoice"/> <field name="company_uom_id"/></td>
-                    </tr>
+                        name="open_timesheets" type="object"><field name="hours_quantity"/> Timesheets</a>
                 </xpath>
             </field>
         </record>
 
-        <record id="project_invoice_form_cutomer" model="ir.ui.view">
-            <field name="name">Inherit project form : Customer</field>
+        <record id="project_invoice_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Invoicing Data</field>
             <field name="model">project.project</field>
-            <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
+            <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Contact"  attrs="{'required':[('to_invoice','!=',False)]}"/>
-                </field>
+                <xpath expr='//div[@name="options_active"]' position='inside'>
+                    <field name="use_timesheets" class="oe_inline"/>
+                    <label for="use_timesheets"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position="inside">
+                    <button name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
+                </xpath>
             </field>
         </record>
 
@@ -48,7 +41,6 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Project(s) Manager"]' position='after'>
-                    <separator/>
                     <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
@@ -98,7 +90,7 @@
                 Click to add a work to invoice.
               </p><p>
                 You will find here all works made on tasks that you can
-                invoice.   
+                invoice.
               </p>
             </field>
         </record>

From 1c7213ab419c2017f15f0e2e28d76486b587da9f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 09:51:18 +0200
Subject: [PATCH 46/50] imp

bzr revid: fp@tinyerp.com-20120830075118-39gdhfw1zhnc6lqk
---
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 21684c81418..904e19671cb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -210,7 +210,7 @@ class project(osv.osv):
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9fe8d6a3193..f864e207141 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -98,7 +98,7 @@
                         </group>
                         <group>
                             <field name="privacy_visibility"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <field name="analytic_account_id" readonly="1" required="0"/>
                         </group>
                     </group>
                     <notebook>

From 3b693e5ce2dc59df0b84e76c831e97b621cff224 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 30 Aug 2012 11:23:21 +0200
Subject: [PATCH 47/50] [IMP] useability mrp

bzr revid: fp@tinyerp.com-20120830092321-0sp1e61sosrwtiu7
---
 addons/mrp/mrp_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9cb3d8dbfa2..99c8befbb6c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -362,6 +362,10 @@
                         </group>
                         <group>
                             <field name="type"/>
+                            <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
+                                When processing a sale order for this product, the delivery order
+                                will contain the raw materials, instead of the finished product.
+                            </p>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos" >
@@ -678,11 +682,11 @@
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group groups="stock.group_locations">
+                            <group>
                                 <group>
                                     <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
                                 </group>
-                                <group>
+                                <group groups="stock.group_locations">
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>

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 48/50] [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 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 49/50] [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 50/50] [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();